Merge pull request #1521 from andyzhangx/fix-zone-check-empty-location

fix: zone format check when cloud config is empty

pkg/azureutils/azure_disk_utils.go

@@ -409,6 +409,10 @@ func IsAzureStackCloud(cloud string, disableAzureStackCloud bool) bool {
 
 // IsValidAvailabilityZone returns true if the zone is in format of <region>-<zone-id>.
 func IsValidAvailabilityZone(zone, region string) bool {
+	if region == "" {
+		index := strings.Index(zone, "-")
+		return index > 0 && index < len(zone)-1
+	}
 	return strings.HasPrefix(zone, fmt.Sprintf("%s-", region))
 }
 

pkg/azureutils/azure_disk_utils_test.go

@@ -908,20 +908,24 @@ func TestIsARMResourceID(t *testing.T) {
 }
 
 func TestIsAvailabilityZone(t *testing.T) {
-	region := "eastus"
 	tests := []struct {
 		desc     string
 		zone     string
+		region   string
 		expected bool
 	}{
-		{"empty string should return false", "", false},
-		{"wrong farmat should return false", "123", false},
-		{"wrong location should return false", "chinanorth-1", false},
-		{"correct zone should return true", "eastus-1", true},
+		{"empty string should return false", "", "eastus", false},
+		{"wrong farmat should return false", "123", "eastus", false},
+		{"wrong location should return false", "chinanorth-1", "eastus", false},
+		{"correct zone should return true", "eastus-1", "eastus", true},
+		{"empty location should return true", "eastus-1", "", true},
+		{"empty location with fault domain should return false", "1", "", false},
+		{"empty location with wrong format should return false", "-1", "", false},
+		{"empty location with wrong format should return false", "eastus-", "", false},
 	}
 
 	for _, test := range tests {
-		actual := IsValidAvailabilityZone(test.zone, region)
+		actual := IsValidAvailabilityZone(test.zone, test.region)
 		if actual != test.expected {
 			t.Errorf("test [%q] get unexpected result: %v != %v", test.desc, actual, test.expected)
 		}