WIP

Author: dm3ch

go.mod

@@ -6,6 +6,8 @@ require (
 	cloud.google.com/go/compute v1.23.3
 	github.com/awslabs/operatorpkg v0.0.0-20241205163410-0fff9f28d115
 	github.com/mitchellh/hashstructure/v2 v2.0.2
+	github.com/onsi/ginkgo/v2 v2.22.2
+	github.com/onsi/gomega v1.36.2
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/samber/lo v1.49.1
 	go.uber.org/multierr v1.11.0
@@ -31,13 +33,15 @@ require (
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
@@ -70,6 +74,7 @@ require (
 	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
+	golang.org/x/tools v0.28.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect

go.sum

@@ -150,52 +150,19 @@ func (p *DefaultProvider) getInstanceTypes(ctx context.Context) ([]*computepb.Ma
 	it := p.machineTypesClient.AggregatedList(ctx, req)
 
 	var vmTypes []*computepb.MachineType
-	iterationCount := 0
-	lastTypeCount := 0
+	for {
+		resp, err := it.Next()
+		if errors.Is(err, iterator.Done) {
+			break
+		}
 
-	// Process the first page
-	resp, err := it.Next()
-	if err != nil && !errors.Is(err, iterator.Done) {
-		return nil, err
-	}
+		if err != nil {
+			return nil, err
+		}
 
-	// If we got a response, process it
-	if !errors.Is(err, iterator.Done) && resp.Value != nil && resp.Value.MachineTypes != nil {
 		vmTypes = append(vmTypes, resp.Value.MachineTypes...)
-		lastTypeCount = len(vmTypes)
-	}
-
-	// Process remaining pages
-	for {
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		default:
-			iterationCount++
-			resp, err := it.Next()
-			if errors.Is(err, iterator.Done) {
-				goto done
-			}
-
-			if err != nil {
-				return nil, err
-			}
-
-			if resp.Value == nil || resp.Value.MachineTypes == nil {
-				continue
-			}
-
-			vmTypes = append(vmTypes, resp.Value.MachineTypes...)
-			if len(vmTypes) > lastTypeCount {
-				lastTypeCount = len(vmTypes)
-			} else {
-				// If we're not getting new types, we might be in a loop
-				goto done
-			}
-		}
 	}
 
-done:
 	p.cache.SetDefault(InstanceTypesCacheKey, vmTypes)
 	return vmTypes, nil
 }