Add azureusgovernment to environment list, fix Makefile (Azure#695)

* Add azureusgovernment to environment list, fix Makefile * add support for AZURECLOUD Co-authored-by: Joel Hendrix <[email protected]>
tareksha · Apr 21, 2022 · 7525a9b · 7525a9b
1 parent f9a841b
commit 7525a9b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/GNUmakefile b/GNUmakefile
diff --git a/Makefile b/Makefile
@@ -0,0 +1,17 @@
+DIR?=./autorest/
+
+default: build
+
+build: fmt
+	cd $(DIR); go install
+
+test:
+	cd $(DIR); go test -v
+
+vet:
+	cd $(DIR); go vet
+
+fmt:
+	gofmt -w $(DIR)
+
+.PHONY: build test vet fmt
diff --git a/autorest/azure/environments.go b/autorest/azure/environments.go
@@ -34,8 +34,10 @@ const (
 var environments = map[string]Environment{
 	"AZURECHINACLOUD":        ChinaCloud,
 	"AZUREGERMANCLOUD":       GermanCloud,
+	"AZURECLOUD":             PublicCloud,
 	"AZUREPUBLICCLOUD":       PublicCloud,
-	"AZUREUSGOVERNMENTCLOUD": USGovernmentCloud,
+	"AZUREUSGOVERNMENT":      USGovernmentCloud,
+	"AZUREUSGOVERNMENTCLOUD": USGovernmentCloud, //TODO: deprecate
 }
 
 // ResourceIdentifier contains a set of Azure resource IDs.

diff --git a/autorest/azure/environments_test.go b/autorest/azure/environments_test.go
@@ -176,6 +176,11 @@ func TestEnvironmentFromName(t *testing.T) {
 		t.Errorf("Expected to get GermanCloud for %q", name)
 	}
 
+	name = "AzureCloud"
+	if env, _ := EnvironmentFromName(name); env != PublicCloud {
+		t.Errorf("Expected to get PublicCloud for %q", name)
+	}
+
 	name = "azurepubliccloud"
 	if env, _ := EnvironmentFromName(name); env != PublicCloud {
 		t.Errorf("Expected to get PublicCloud for %q", name)
@@ -196,6 +201,16 @@ func TestEnvironmentFromName(t *testing.T) {
 		t.Errorf("Expected to get USGovernmentCloud for %q", name)
 	}
 
+	name = "azureusgovernment"
+	if env, _ := EnvironmentFromName(name); env != USGovernmentCloud {
+		t.Errorf("Expected to get USGovernmentCloud for %q", name)
+	}
+
+	name = "AzureUSGovernment"
+	if env, _ := EnvironmentFromName(name); env != USGovernmentCloud {
+		t.Errorf("Expected to get USGovernmentCloud for %q", name)
+	}
+
 	name = "thisisnotarealcloudenv"
 	if _, err := EnvironmentFromName(name); err == nil {
 		t.Errorf("Expected to get an error for %q", name)