Merge pull request #8042 from johejo/allow_location_global

allow "global" for enhanced location validation
hashicorp · Aug 7, 2020 · 56a2e98 · 56a2e98
2 parents 18797c8 + e55d032
commit 56a2e98
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/azurerm/internal/location/validation.go b/azurerm/internal/location/validation.go
@@ -46,6 +46,11 @@ func enhancedValidation(i interface{}, k string) ([]string, []error) {
 		}
 
 		if !found {
+			// Some resources use a location named "global".
+			if normalizedUserInput == "global" {
+				return nil, nil
+			}
+
 			locations := strings.Join(*supportedLocations, ",")
 			return nil, []error{
 				fmt.Errorf("%q was not found in the list of supported Azure Locations: %q", normalizedUserInput, locations),

diff --git a/azurerm/internal/location/validation_test.go b/azurerm/internal/location/validation_test.go
@@ -31,6 +31,10 @@ func TestEnhancedValidationDisabled(t *testing.T) {
 			input: "West Europe",
 			valid: true,
 		},
+		{
+			input: "global",
+			valid: true,
+		},
 	}
 	enhancedEnabled = false
 	defer func() {
@@ -73,6 +77,10 @@ func TestEnhancedValidationEnabledButIsOffline(t *testing.T) {
 			input: "West Europe",
 			valid: true,
 		},
+		{
+			input: "global",
+			valid: true,
+		},
 	}
 	enhancedEnabled = true
 	supportedLocations = nil
@@ -143,6 +151,11 @@ func TestEnhancedValidationEnabled(t *testing.T) {
 			input:              "West Europe",
 			valid:              false,
 		},
+		{
+			availableLocations: publicLocations,
+			input:              "global",
+			valid:              true,
+		},
 	}
 	enhancedEnabled = true
 	defer func() {