Use utils.ECSCLIResourcePrefix, fix secret string generation

allisaurus · allisaurus · commit 9648c638c5b4 · 2018-10-25T11:36:43.000-07:00
diff --git a/ecs-cli/Gopkg.lock b/ecs-cli/Gopkg.lock
diff --git a/ecs-cli/modules/cli/regcreds/regcreds_app.go b/ecs-cli/modules/cli/regcreds/regcreds_app.go
@@ -19,6 +19,7 @@ import (
 	secretsClient "github.com/aws/amazon-ecs-cli/ecs-cli/modules/clients/aws/secretsmanager"
 	"github.com/aws/amazon-ecs-cli/ecs-cli/modules/commands/flags"
 	"github.com/aws/amazon-ecs-cli/ecs-cli/modules/config"
+	"github.com/aws/amazon-ecs-cli/ecs-cli/modules/utils"
 	"github.com/aws/amazon-ecs-cli/ecs-cli/modules/utils/regcreds"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/secretsmanager"
@@ -27,12 +28,6 @@ import (
 	"github.com/urfave/cli"
 )
 
-const (
-	// EcsCliResourcePrefix is prepended to the names of resources created through the ecs-cli
-	// TODO: move to more generic package for use in other parts of the ecs-cli
-	EcsCliResourcePrefix = "amazon-ecs-cli-setup-"
-)
-
 // CredsOutputEntry contains the credential ARN and associated container names
 // TODO: use & move to output_reader once implemented?
 type CredsOutputEntry struct {
@@ -192,11 +187,11 @@ func getNewCommandConfig(c *cli.Context) *config.CommandConfig {
 }
 
 func generateSecretName(regName string) *string {
-	return aws.String(EcsCliResourcePrefix + regName)
+	return aws.String(utils.ECSCLIResourcePrefix + regName)
 }
 
 func generateSecretString(username, password string) *string {
-	return aws.String(`{"username":"` + username + `"},{"password":"` + password + `"}`)
+	return aws.String(`{"username":"` + username + `","password":"` + password + `"}`)
 }
 
 func generateSecretDescription(regName string) *string {
diff --git a/ecs-cli/modules/cli/regcreds/regcreds_app_test.go b/ecs-cli/modules/cli/regcreds/regcreds_app_test.go
@@ -14,6 +14,8 @@
 package regcreds
 
 import (
+	"encoding/json"
+	"fmt"
 	"testing"
 
 	"github.com/aws/amazon-ecs-cli/ecs-cli/modules/clients/aws/secretsmanager/mock"
@@ -245,6 +247,36 @@ func TestValidateCredsInput_ErrorOnDuplicateContainers(t *testing.T) {
 	assert.Error(t, err, "Expected creds with duplicate containers to return error")
 }
 
+func TestGenerateSecretString(t *testing.T) {
+	type ECSRegistrySecret struct {
+		Username string `json:"username"`
+		Password string `json:"password"`
+	}
+
+	testCases := []struct {
+		inputUsername  string
+		inputPassword  string
+		expectedSecret ECSRegistrySecret
+	}{
+		{"user1", "l33tp4$$w0rd", ECSRegistrySecret{"user1", "l33tp4$$w0rd"}},
+		{"someUserNameThatIsVeryLong0987654321", "*3G7nMl6W*Pi#*erjm", ECSRegistrySecret{"someUserNameThatIsVeryLong0987654321", "*3G7nMl6W*Pi#*erjm"}},
+		{"myemail@example.com", "some-dashed-psswrd-64", ECSRegistrySecret{"myemail@example.com", "some-dashed-psswrd-64"}},
+	}
+	for _, test := range testCases {
+		t.Run(fmt.Sprintf("Parse registry secret %s", test.inputUsername), func(t *testing.T) {
+
+			actualSecretString := generateSecretString(test.inputUsername, test.inputPassword)
+			assert.NotEmpty(t, *actualSecretString)
+
+			regSecret := &ECSRegistrySecret{}
+			err := json.Unmarshal([]byte(*actualSecretString), regSecret)
+			assert.NoError(t, err, "Unexpected error when unmarshalling registry secret")
+			assert.Equal(t, test.expectedSecret.Username, regSecret.Username, "Expected username to match")
+			assert.Equal(t, test.expectedSecret.Password, regSecret.Password, "Expected password to match")
+		})
+	}
+}
+
 func getTestCredsEntry(secretARN, username, password, kmsKey string, containers []string) readers.RegistryCredEntry {
 	return readers.RegistryCredEntry{
 		SecretManagerARN: secretARN,
