From cf128ccfa98212b13d8b49a87c9300290963d55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Erbrech?= <stephane.erbrech@gmail.com>
Date: Fri, 9 Feb 2018 20:34:22 +0100
Subject: [PATCH] fix --auto-suffix when dnsPrefix is defined in apimodel json
 file (#2239)

---
 cmd/deploy.go      | 14 ++++++-------
 cmd/deploy_test.go | 50 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/cmd/deploy.go b/cmd/deploy.go
index 03339497d8..1176e0c8c2 100644
--- a/cmd/deploy.go
+++ b/cmd/deploy.go
@@ -154,15 +154,13 @@ func autofillApimodel(dc *deployCmd) {
 		if dc.dnsPrefix == "" {
 			log.Fatalf("apimodel: missing masterProfile.dnsPrefix and --dns-prefix was not specified")
 		}
+		log.Warnf("apimodel: missing masterProfile.dnsPrefix will use %q", dc.dnsPrefix)
+		dc.containerService.Properties.MasterProfile.DNSPrefix = dc.dnsPrefix
+	}
 
-		dnsPrefix := dc.dnsPrefix
-		if dc.autoSuffix {
-			suffix := strconv.FormatInt(time.Now().Unix(), 16)
-			dnsPrefix = dnsPrefix + "-" + suffix
-		}
-
-		log.Warnf("apimodel: missing masterProfile.dnsPrefix will use %q", dnsPrefix)
-		dc.containerService.Properties.MasterProfile.DNSPrefix = dnsPrefix
+	if dc.autoSuffix {
+		suffix := strconv.FormatInt(time.Now().Unix(), 16)
+		dc.containerService.Properties.MasterProfile.DNSPrefix += "-" + suffix
 	}
 
 	if dc.outputDirectory == "" {
diff --git a/cmd/deploy_test.go b/cmd/deploy_test.go
index a2ca102bb7..9bdda15780 100644
--- a/cmd/deploy_test.go
+++ b/cmd/deploy_test.go
@@ -26,9 +26,27 @@ const ExampleAPIModel = `{
 }
 `
 
+const ExampleAPIModelWithDNSPrefix = `{
+	"apiVersion": "vlabs",
+	"properties": {
+		  "orchestratorProfile": { "orchestratorType": "Kubernetes", "kubernetesConfig": { "useManagedIdentity": %s, "etcdVersion" : "2.3.8" } },
+	  "masterProfile": { "count": 1, "dnsPrefix": "mytestcluster", "vmSize": "Standard_D2_v2" },
+	  "agentPoolProfiles": [ { "name": "linuxpool1", "count": 2, "vmSize": "Standard_D2_v2", "availabilityProfile": "AvailabilitySet" } ],
+	  "windowsProfile": { "adminUsername": "azureuser", "adminPassword": "replacepassword1234$" },
+	  "linuxProfile": { "adminUsername": "azureuser", "ssh": { "publicKeys": [ { "keyData": "" } ] }
+	  },
+	  "servicePrincipalProfile": { "clientId": "%s", "secret": "%s" }
+	}
+  }
+  `
+
 func getExampleAPIModel(useManagedIdentity bool, clientID, clientSecret string) string {
+	return getAPIModel(ExampleAPIModel, useManagedIdentity, clientID, clientSecret)
+}
+
+func getAPIModel(baseAPIModel string, useManagedIdentity bool, clientID, clientSecret string) string {
 	return fmt.Sprintf(
-		ExampleAPIModel,
+		baseAPIModel,
 		strconv.FormatBool(useManagedIdentity),
 		clientID,
 		clientSecret)
@@ -46,6 +64,36 @@ func TestAutofillApimodelAllowsPrespecifiedCreds(t *testing.T) {
 	testAutodeployCredentialHandling(t, false, "clientID", "clientSecret")
 }
 
+func TestAutoSufixWithDnsPrefixInApiModel(t *testing.T) {
+	apiloader := &api.Apiloader{
+		Translator: nil,
+	}
+
+	apimodel := getAPIModel(ExampleAPIModelWithDNSPrefix, false, "clientID", "clientSecret")
+	cs, ver, err := apiloader.DeserializeContainerService([]byte(apimodel), false, false, nil)
+	if err != nil {
+		t.Fatalf("unexpected error deserializing the example apimodel: %s", err)
+	}
+	deployCmd := &deployCmd{
+		apimodelPath:     "./this/is/unused.json",
+		outputDirectory:  "_test_output",
+		location:         "westus",
+		autoSuffix:       true,
+		containerService: cs,
+		apiVersion:       ver,
+
+		client: &armhelpers.MockACSEngineClient{},
+	}
+	autofillApimodel(deployCmd)
+
+	defer os.RemoveAll(deployCmd.outputDirectory)
+
+	if deployCmd.containerService.Properties.MasterProfile.DNSPrefix == "mytestcluster" {
+		t.Fatalf("expected %s-{timestampsuffix} but got %s", "mytestcluster", deployCmd.containerService.Properties.MasterProfile.DNSPrefix)
+	}
+
+}
+
 func testAutodeployCredentialHandling(t *testing.T, useManagedIdentity bool, clientID, clientSecret string) {
 	apiloader := &api.Apiloader{
 		Translator: nil,