normalizeazureregion added in scale, upgrade, and deploy (#2764)

* normalizeazureregion added in scale, upgrade, and deploy

* fixing linting errors

* go formatting files

* defining normalizeazurelocation

* getting rid of duplicate code

* refactoring helper function

* importing helpers in upgrade

* Added unit test for normalize azure region

* fixing linting errors

* fixing linting errors

* fixed linting errors

* fixed printf statement

* fixed printf to %s

cmd/deploy.go

@@ -19,6 +19,7 @@ import (
 	"github.com/Azure/acs-engine/pkg/acsengine/transform"
 	"github.com/Azure/acs-engine/pkg/api"
 	"github.com/Azure/acs-engine/pkg/armhelpers"
+	"github.com/Azure/acs-engine/pkg/helpers"
 	"github.com/Azure/acs-engine/pkg/i18n"
 )
 
@@ -116,6 +117,8 @@ func (dc *deployCmd) validate(cmd *cobra.Command, args []string) error {
 	if dc.location == "" {
 		return fmt.Errorf(fmt.Sprintf("--location must be specified"))
 	}
+	dc.location = helpers.NormalizeAzureRegion(dc.location)
+
 	// skip validating the model fields for now
 	dc.containerService, dc.apiVersion, err = apiloader.LoadContainerServiceFromFile(dc.apimodelPath, false, false, nil)
 	if err != nil {

cmd/scale.go

@@ -16,6 +16,7 @@ import (
 	"github.com/Azure/acs-engine/pkg/api"
 	"github.com/Azure/acs-engine/pkg/armhelpers"
 	"github.com/Azure/acs-engine/pkg/armhelpers/utils"
+	"github.com/Azure/acs-engine/pkg/helpers"
 	"github.com/Azure/acs-engine/pkg/i18n"
 	"github.com/Azure/acs-engine/pkg/operations"
 	"github.com/leonelquinteros/gotext"
@@ -99,6 +100,8 @@ func (sc *scaleCmd) validate(cmd *cobra.Command, args []string) {
 	if sc.location == "" {
 		cmd.Usage()
 		log.Fatal("--location must be specified")
+	} else {
+		sc.location = helpers.NormalizeAzureRegion(sc.location)
 	}
 
 	if sc.newDesiredAgentCount == 0 {

cmd/upgrade.go

@@ -11,6 +11,7 @@ import (
 	"github.com/Azure/acs-engine/pkg/acsengine"
 	"github.com/Azure/acs-engine/pkg/api"
 	"github.com/Azure/acs-engine/pkg/armhelpers"
+	"github.com/Azure/acs-engine/pkg/helpers"
 	"github.com/Azure/acs-engine/pkg/i18n"
 	"github.com/Azure/acs-engine/pkg/operations/kubernetesupgrade"
 	"github.com/leonelquinteros/gotext"
@@ -87,6 +88,8 @@ func (uc *upgradeCmd) validate(cmd *cobra.Command, args []string) {
 	if uc.location == "" {
 		cmd.Usage()
 		log.Fatal("--location must be specified")
+	} else {
+		uc.location = helpers.NormalizeAzureRegion(uc.location)
 	}
 
 	if uc.timeoutInMinutes != -1 {

pkg/api/convertertoagentpoolonlyapi.go

@@ -38,7 +38,7 @@ const (
 func ConvertV20170831AgentPoolOnly(v20170831 *v20170831.ManagedCluster) *ContainerService {
 	c := &ContainerService{}
 	c.ID = v20170831.ID
-	c.Location = NormalizeAzureRegion(v20170831.Location)
+	c.Location = helpers.NormalizeAzureRegion(v20170831.Location)
 	c.Name = v20170831.Name
 	if v20170831.Plan != nil {
 		c.Plan = convertv20170831AgentPoolOnlyResourcePurchasePlan(v20170831.Plan)
@@ -56,7 +56,7 @@ func ConvertV20170831AgentPoolOnly(v20170831 *v20170831.ManagedCluster) *Contain
 func ConvertV20180331AgentPoolOnly(v20180331 *v20180331.ManagedCluster) *ContainerService {
 	c := &ContainerService{}
 	c.ID = v20180331.ID
-	c.Location = NormalizeAzureRegion(v20180331.Location)
+	c.Location = helpers.NormalizeAzureRegion(v20180331.Location)
 	c.Name = v20180331.Name
 	if v20180331.Plan != nil {
 		c.Plan = convertv20180331AgentPoolOnlyResourcePurchasePlan(v20180331.Plan)
@@ -113,7 +113,7 @@ func convertV20170831AgentPoolOnlyProperties(obj *v20170831.Properties) *Propert
 func ConvertVLabsAgentPoolOnly(vlabs *vlabs.ManagedCluster) *ContainerService {
 	c := &ContainerService{}
 	c.ID = vlabs.ID
-	c.Location = NormalizeAzureRegion(vlabs.Location)
+	c.Location = helpers.NormalizeAzureRegion(vlabs.Location)
 	c.Name = vlabs.Name
 	if vlabs.Plan != nil {
 		c.Plan = &ResourcePurchasePlan{}

pkg/api/convertertoapi.go

@@ -1,14 +1,13 @@
 package api
 
 import (
-	"strings"
-
 	"github.com/Azure/acs-engine/pkg/api/common"
 	"github.com/Azure/acs-engine/pkg/api/v20160330"
 	"github.com/Azure/acs-engine/pkg/api/v20160930"
 	"github.com/Azure/acs-engine/pkg/api/v20170131"
 	"github.com/Azure/acs-engine/pkg/api/v20170701"
 	"github.com/Azure/acs-engine/pkg/api/vlabs"
+	"github.com/Azure/acs-engine/pkg/helpers"
 )
 
 ///////////////////////////////////////////////////////////
@@ -19,16 +18,11 @@ import (
 // for converting.
 ///////////////////////////////////////////////////////////
 
-// NormalizeAzureRegion returns a normalized Azure region with whilte spaces removed and converted to lower case
-func NormalizeAzureRegion(name string) string {
-	return strings.ToLower(strings.Replace(name, " ", "", -1))
-}
-
 // ConvertV20160930ContainerService converts a v20160930 ContainerService to an unversioned ContainerService
 func ConvertV20160930ContainerService(v20160930 *v20160930.ContainerService) *ContainerService {
 	c := &ContainerService{}
 	c.ID = v20160930.ID
-	c.Location = NormalizeAzureRegion(v20160930.Location)
+	c.Location = helpers.NormalizeAzureRegion(v20160930.Location)
 	c.Name = v20160930.Name
 	if v20160930.Plan != nil {
 		c.Plan = &ResourcePurchasePlan{}
@@ -48,7 +42,7 @@ func ConvertV20160930ContainerService(v20160930 *v20160930.ContainerService) *Co
 func ConvertV20160330ContainerService(v20160330 *v20160330.ContainerService) *ContainerService {
 	c := &ContainerService{}
 	c.ID = v20160330.ID
-	c.Location = NormalizeAzureRegion(v20160330.Location)
+	c.Location = helpers.NormalizeAzureRegion(v20160330.Location)
 	c.Name = v20160330.Name
 	if v20160330.Plan != nil {
 		c.Plan = &ResourcePurchasePlan{}
@@ -68,7 +62,7 @@ func ConvertV20160330ContainerService(v20160330 *v20160330.ContainerService) *Co
 func ConvertV20170131ContainerService(v20170131 *v20170131.ContainerService) *ContainerService {
 	c := &ContainerService{}
 	c.ID = v20170131.ID
-	c.Location = NormalizeAzureRegion(v20170131.Location)
+	c.Location = helpers.NormalizeAzureRegion(v20170131.Location)
 	c.Name = v20170131.Name
 	if v20170131.Plan != nil {
 		c.Plan = &ResourcePurchasePlan{}
@@ -88,7 +82,7 @@ func ConvertV20170131ContainerService(v20170131 *v20170131.ContainerService) *Co
 func ConvertV20170701ContainerService(v20170701 *v20170701.ContainerService) *ContainerService {
 	c := &ContainerService{}
 	c.ID = v20170701.ID
-	c.Location = NormalizeAzureRegion(v20170701.Location)
+	c.Location = helpers.NormalizeAzureRegion(v20170701.Location)
 	c.Name = v20170701.Name
 	if v20170701.Plan != nil {
 		c.Plan = &ResourcePurchasePlan{}
@@ -108,7 +102,7 @@ func ConvertV20170701ContainerService(v20170701 *v20170701.ContainerService) *Co
 func ConvertVLabsContainerService(vlabs *vlabs.ContainerService) *ContainerService {
 	c := &ContainerService{}
 	c.ID = vlabs.ID
-	c.Location = NormalizeAzureRegion(vlabs.Location)
+	c.Location = helpers.NormalizeAzureRegion(vlabs.Location)
 	c.Name = vlabs.Name
 	if vlabs.Plan != nil {
 		c.Plan = &ResourcePurchasePlan{}

pkg/helpers/helpers.go

@@ -6,6 +6,7 @@ import (
 	"crypto/rsa"
 	"encoding/json"
 	"io"
+	"strings"
 
 	"github.com/Azure/acs-engine/pkg/i18n"
 	"golang.org/x/crypto/ssh"
@@ -16,6 +17,11 @@ const (
 	SSHKeySize = 4096
 )
 
+// NormalizeAzureRegion returns a normalized Azure region with white spaces removed and converted to lower case
+func NormalizeAzureRegion(name string) string {
+	return strings.ToLower(strings.Replace(name, " ", "", -1))
+}
+
 // JSONMarshalIndent marshals formatted JSON w/ optional SetEscapeHTML
 func JSONMarshalIndent(content interface{}, prefix, indent string, escape bool) ([]byte, error) {
 	b, err := JSONMarshal(content, escape)

pkg/helpers/helpers_test.go

@@ -9,3 +9,34 @@ func TestPointerToBool(t *testing.T) {
 		t.Fatalf("expected PointerToBool(true) to return *true, instead returned %#v", ret)
 	}
 }
+
+func TestIsRegionNormalized(t *testing.T) {
+	cases := []struct {
+		input          string
+		expectedResult string
+	}{
+		{
+			input:          "westus",
+			expectedResult: "westus",
+		},
+		{
+			input:          "West US",
+			expectedResult: "westus",
+		},
+		{
+			input:          "Eastern Africa",
+			expectedResult: "easternafrica",
+		},
+		{
+			input:          "",
+			expectedResult: "",
+		},
+	}
+
+	for _, c := range cases {
+		result := NormalizeAzureRegion(c.input)
+		if c.expectedResult != result {
+			t.Fatalf("NormalizeAzureRegion returned unexpected result: expected %s but got %s", c.expectedResult, result)
+		}
+	}
+}