Add location filter to FetchAvailableDiskTypes.

Author: ulladz

cluster-autoscaler/cloudprovider/gce/autoscaling_gce_client.go

@@ -130,7 +130,7 @@ type AutoscalingGceClient interface {
 	FetchMigsWithName(zone string, filter *regexp.Regexp) ([]string, error)
 	FetchZones(region string) ([]string, error)
 	FetchAvailableCpuPlatforms() (map[string][]string, error)
-	FetchAvailableDiskTypes() (map[string][]string, error)
+	FetchAvailableDiskTypes(region string) (map[string][]string, error)
 	FetchReservations() ([]*gce.Reservation, error)
 	FetchReservationsInProject(projectId string) ([]*gce.Reservation, error)
 	FetchListManagedInstancesResults(migRef GceRef) (string, error)
@@ -753,14 +753,19 @@ func (client *autoscalingGceClientV1) FetchAvailableCpuPlatforms() (map[string][
 	return availableCpuPlatforms, nil
 }
 
-func (client *autoscalingGceClientV1) FetchAvailableDiskTypes() (map[string][]string, error) {
+// FetchAvailableDiskTypes returns a map of zone to available disk types filtered by region.
+func (client *autoscalingGceClientV1) FetchAvailableDiskTypes(region string) (map[string][]string, error) {
 	availableDiskTypes := make(map[string][]string)
 
-	req := client.gceService.DiskTypes.AggregatedList(client.projectId)
+	// We use a filter to retrieve disk types available within a specific region.
+	// This filter leverages the GCE naming convention where zone names are prefixed with their region (e.g., "us-central1-a" is in the "us-central1" region).
+	// By using the provided region, the filter effectively selects all matching zones within that region.
+	// For example, if region is "us-central1", the filter will match all zones in that region (e.g., "us-central1-a", "us-central1-b").
+	filter := fmt.Sprintf("zone eq .+%s.*", region)
+	req := client.gceService.DiskTypes.AggregatedList(client.projectId).Filter(filter).ReturnPartialSuccess(true)
 	if err := req.Pages(context.TODO(), func(page *gce.DiskTypeAggregatedList) error {
 		for _, diskTypesScopedList := range page.Items {
 			for _, diskType := range diskTypesScopedList.DiskTypes {
-				// skip data for regions
 				if diskType.Zone == "" {
 					continue
 				}

cluster-autoscaler/cloudprovider/gce/autoscaling_gce_client_test.go

@@ -647,7 +647,6 @@ func TestFetchMigInstancesInstanceUrlHandling(t *testing.T) {
 		})
 	}
 }
-
 func TestFetchAvailableDiskTypes(t *testing.T) {
 	server := test_util.NewHttpServerMock()
 	defer server.Close()
@@ -657,14 +656,14 @@ func TestFetchAvailableDiskTypes(t *testing.T) {
 	getDiskTypesAggregatedListOKResponse, _ := os.ReadFile("fixtures/diskTypes_aggregatedList.json")
 	server.On("handle", "/projects/project-id/aggregated/diskTypes").Return(string(getDiskTypesAggregatedListOKResponse)).Times(1)
 
-	t.Run("correctly parse a response", func(t *testing.T) {
+	t.Run("correctly parse a filtered response", func(t *testing.T) {
 		want := map[string][]string{
 			// "us-central1" region should be skipped
 			"us-central1-a": {"local-ssd", "pd-balanced", "pd-ssd", "pd-standard"},
 			"us-central1-b": {"hyperdisk-balanced", "hyperdisk-extreme", "hyperdisk-throughput", "local-ssd", "pd-balanced", "pd-extreme", "pd-ssd", "pd-standard"},
 		}
 
-		got, err := g.FetchAvailableDiskTypes()
+		got, err := g.FetchAvailableDiskTypes("us-central1")
 
 		assert.NoError(t, err)
 		if diff := cmp.Diff(want, got, cmpopts.EquateErrors()); diff != "" {
@@ -860,7 +859,7 @@ func TestAutoscalingClientTimeouts(t *testing.T) {
 		},
 		"FetchAvailableDiskTypes_HttpClientTimeout": {
 			clientFunc: func(client *autoscalingGceClientV1) error {
-				_, err := client.FetchAvailableDiskTypes()
+				_, err := client.FetchAvailableDiskTypes("")
 				return err
 			},
 			httpTimeout: instantTimeout,

cluster-autoscaler/cloudprovider/gce/mig_info_provider_test.go

@@ -172,7 +172,7 @@ func (client *mockAutoscalingGceClient) FetchAvailableCpuPlatforms() (map[string
 	return nil, nil
 }
 
-func (client *mockAutoscalingGceClient) FetchAvailableDiskTypes() (map[string][]string, error) {
+func (client *mockAutoscalingGceClient) FetchAvailableDiskTypes(_ string) (map[string][]string, error) {
 	return nil, nil
 }