Merge branch 'main' of github.com:brevdev/cloud into dishankj-max/BREV-2357

Author: dishankj-max

Makefile

@@ -27,7 +27,7 @@ GOINSTALL=$(GOCMD) install
 GOSEC=gosec
 
 # Third party tools
-ARTIFACT_GOLINT=github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
+ARTIFACT_GOLINT=github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.0
 ARTIFACT_GOSEC=github.com/securego/gosec/v2/cmd/gosec@v2.22.8
 ARTIFACT_GOFUMPT=mvdan.cc/gofumpt@v0.9.2
 

v1/providers/nebius/instance.go

@@ -706,22 +706,38 @@ func (c *NebiusClient) ListInstances(ctx context.Context, args v1.ListInstancesA
 	// Collect instances from all projects
 	allNebiusInstances := make([]*compute.Instance, 0)
 	for projectID := range projectToRegion {
-		response, err := c.sdk.Services().Compute().V1().Instance().List(ctx, &compute.ListInstancesRequest{
-			ParentId: projectID,
-		})
-		if err != nil {
-			c.logger.Error(ctx, fmt.Errorf("failed to list instances in project %s: %w", projectID, err),
-				v1.LogField("projectID", projectID))
-			// Continue to next project instead of failing completely
-			continue
-		}
+		var pageToken string
+		for {
+			response, err := c.sdk.Services().Compute().V1().Instance().List(ctx, &compute.ListInstancesRequest{
+				ParentId:  projectID,
+				PageSize:  100,
+				PageToken: pageToken,
+			})
+			if err != nil {
+				c.logger.Error(ctx, fmt.Errorf("failed to list instances in project %s: %w", projectID, err),
+					v1.LogField("projectID", projectID))
+				// Continue to next project instead of failing completely
+				break
+			}
 
-		if response != nil && response.Items != nil {
-			c.logger.Info(ctx, "found instances in project",
-				v1.LogField("projectID", projectID),
-				v1.LogField("region", projectToRegion[projectID]),
-				v1.LogField("count", len(response.Items)))
-			allNebiusInstances = append(allNebiusInstances, response.Items...)
+			// If the response is nil, we've reached the end of the list
+			if response == nil {
+				break
+			}
+
+			if len(response.Items) > 0 {
+				c.logger.Info(ctx, "found instances in project",
+					v1.LogField("projectID", projectID),
+					v1.LogField("region", projectToRegion[projectID]),
+					v1.LogField("count", len(response.Items)),
+					v1.LogField("page", pageToken))
+				allNebiusInstances = append(allNebiusInstances, response.Items...)
+			}
+
+			pageToken = response.GetNextPageToken()
+			if pageToken == "" {
+				break
+			}
 		}
 	}
 

v1/providers/nebius/integration_test.go

@@ -332,16 +332,22 @@ func TestIntegration_InstanceLifecycle(t *testing.T) {
 		t.Log("WARNING: No public IP available, skipping SSH connectivity test")
 	}
 
-	// Step 3: List instances (currently not implemented)
+	// Step 3: List instances and verify the created instance is present
 	t.Log("Listing instances...")
 	instances, err := client.ListInstances(ctx, v1.ListInstancesArgs{})
-	// This is expected to fail with current implementation
-	if err != nil {
-		t.Logf("ListInstances failed as expected: %v", err)
-		assert.Contains(t, err.Error(), "implementation pending")
-	} else {
-		t.Logf("Found %d instances", len(instances))
+	require.NoError(t, err, "ListInstances should succeed")
+	t.Logf("Found %d instances", len(instances))
+
+	// Verify the instance we just created is in the list
+	var foundCreatedInstance bool
+	for _, inst := range instances {
+		if inst.CloudID == instanceCloudID {
+			foundCreatedInstance = true
+			t.Logf("✓ Found created instance %s in list", instanceCloudID)
+			break
+		}
 	}
+	assert.True(t, foundCreatedInstance, "Created instance should be found in ListInstances result")
 
 	// Step 4: Stop instance
 	t.Logf("Stopping instance: %s", instanceCloudID)

v1/providers/shadeform/gen/shadeform/api/openapi.yaml

@@ -1739,6 +1739,7 @@ components:
       - fpt
       - hydra
       - amaya
+      - verda
       example: hyperstack
       type: string
     Region:

v1/providers/shadeform/gen/shadeform/docs/Cloud.md

@@ -55,6 +55,8 @@
 
 * `AMAYA` (value: `"amaya"`)
 
+* `VERDA` (value: `"verda"`)
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

v1/providers/shadeform/gen/shadeform/model_cloud.go

@@ -253,7 +253,11 @@ func (c *ShadeformClient) ListInstances(ctx context.Context, _ v1.ListInstancesA
 	for _, instance := range resp.Instances {
 		singleInstance, err := c.convertShadeformInstanceToV1Instance(instance)
 		if err != nil {
-			return nil, errors.WrapAndTrace(err)
+			c.logger.Warn(ctx, "skipping instance without refID tag",
+				v1.LogField("instanceID", instance.Id),
+				v1.LogField("instanceName", instance.Name),
+				v1.LogField("error", err.Error()))
+			continue
 		}
 		instances = append(instances, *singleInstance)
 	}
@@ -357,13 +361,13 @@ func (c *ShadeformClient) convertShadeformInstanceToV1Instance(shadeformInstance
 
 	refID, found := tags[refIDTagName]
 	if !found {
-		return nil, errors.WrapAndTrace(errors.New("could not find refID tag"))
+		return nil, fmt.Errorf("instance missing refID tag: instanceID=%s, instanceName=%s", shadeformInstance.Id, shadeformInstance.Name)
 	}
 	delete(tags, refIDTagName)
 
 	cloudCredRefID, found := tags[cloudCredRefIDTagName]
 	if !found {
-		return nil, errors.WrapAndTrace(errors.New("could not find cloudCredRefID tag"))
+		return nil, fmt.Errorf("instance missing cloudCredRefID tag: instanceID=%s, instanceName=%s", shadeformInstance.Id, shadeformInstance.Name)
 	}
 	delete(tags, cloudCredRefIDTagName)
 

v1/providers/shadeform/instance.go

@@ -26,7 +26,7 @@ func TestValidationFunctions(t *testing.T) {
 
 	config := validation.ProviderConfig{
 		Credential: NewShadeformCredential("validation-test", apiKey),
-		StableIDs:  []v1.InstanceTypeID{"datacrunch_B200_helsinki-finland-5", "massedcompute_L40_desmoines-usa-1"},
+		StableIDs:  []v1.InstanceTypeID{"verda_B200_helsinki-finland-5", "massedcompute_L40_desmoines-usa-1"},
 	}
 
 	validation.RunValidationSuite(t, config)