Add credentials_parameter to task definition

allisaurus · allisaurus · commit 681a0367a38e · 2018-08-02T12:32:09.000-07:00
diff --git a/ecs-cli/modules/utils/compose/convert_task_definition.go b/ecs-cli/modules/utils/compose/convert_task_definition.go
@@ -175,8 +175,16 @@ func convertToContainerDef(inputCfg *adapter.ContainerConfig, ecsContainerDef *C
 		mem = resolveIntResourceOverride(inputCfg.Name, mem, ecsMemInMB, "MemoryLimit")
 
 		ecsMemResInMB := adapter.ConvertToMemoryInMB(int64(ecsContainerDef.MemoryReservation))
+
 		memRes = resolveIntResourceOverride(inputCfg.Name, memRes, ecsMemResInMB, "MemoryReservation")
 
+		credParam := ecsContainerDef.RepositoryCredentials.CredentialsParameter
+
+		if credParam != "" {
+			outputContDef.RepositoryCredentials = &ecs.RepositoryCredentials{}
+			outputContDef.RepositoryCredentials.SetCredentialsParameter(credParam)
+		}
+
 		var err error
 		healthCheck, err = resolveHealthCheck(inputCfg.Name, healthCheck, ecsContainerDef.HealthCheck)
 		if err != nil {
diff --git a/ecs-cli/modules/utils/compose/convert_task_definition_test.go b/ecs-cli/modules/utils/compose/convert_task_definition_test.go
@@ -436,6 +436,8 @@ task_definition:
   services:
     mysql:
       essential: false
+      repository_credentials:
+        credentials_parameter: arn:aws:secretsmanager:1234567890:secret:test-secret
   task_size:
     mem_limit: 5Gb
     cpu_limit: 256`
@@ -471,7 +473,7 @@ task_definition:
 		assert.Equal(t, "256", aws.StringValue(taskDefinition.Cpu), "Expected CPU to match")
 		assert.Equal(t, "5Gb", aws.StringValue(taskDefinition.Memory), "Expected CPU to match")
 		assert.True(t, aws.BoolValue(wordpress.Essential), "Expected container with name: '%v' to be true", *wordpress.Name)
-
+		assert.Equal(t, "arn:aws:secretsmanager:1234567890:secret:test-secret", aws.StringValue(mysql.RepositoryCredentials.CredentialsParameter), "Expected CredentialsParameter to match")
 	}
 }
 
diff --git a/ecs-cli/modules/utils/compose/ecs_params_reader.go b/ecs-cli/modules/utils/compose/ecs_params_reader.go
@@ -27,7 +27,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/ecs"
 	libYaml "github.com/docker/libcompose/yaml"
 	"github.com/pkg/errors"
-	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 )
 
@@ -74,7 +73,7 @@ type HealthCheck struct {
 
 // RepositoryCredentials holds CredentialParameters for a ContainerDef
 type RepositoryCredentials struct {
-	CredentialsParameter string `yaml:"credentials_param"`
+	CredentialsParameter string `yaml:"credentials_parameter"`
 }
 
 // TaskSize holds Cpu and Memory values needed for Fargate tasks
@@ -209,8 +208,6 @@ func ReadECSParams(filename string) (*ECSParams, error) {
 		return nil, errors.Wrapf(err, "Error unmarshalling yaml data from ECS params file: %v", filename)
 	}
 
-	log.Infof("ECS params: %+v", ecsParams) // remove me!
-
 	return ecsParams, nil
 }
 
diff --git a/ecs-cli/modules/utils/compose/ecs_params_reader_test.go b/ecs-cli/modules/utils/compose/ecs_params_reader_test.go
@@ -85,7 +85,7 @@ task_definition:
     wordpress:
       essential: true
       repository_credentials:
-        credentials_param: arn:aws:secretsmanager:1234567890:secret:test-RT4iv`
+        credentials_parameter: arn:aws:secretsmanager:1234567890:secret:test-RT4iv`
 
 	content := []byte(ecsParamsString)
 
@@ -119,7 +119,7 @@ task_definition:
 		assert.Equal(t, yaml.MemStringorInt(524288000), mysql.Memory)
 		assert.Equal(t, yaml.MemStringorInt(524288000), mysql.MemoryReservation)
 		assert.True(t, wordpress.Essential, "Expected container to be essential")
-		assert.Equal(t, wordpress.RepositoryCredentials.CredentialsParameter, "arn:aws:secretsmanager:1234567890:secret:test-RT4iv")
+		assert.Equal(t, "arn:aws:secretsmanager:1234567890:secret:test-RT4iv", wordpress.RepositoryCredentials.CredentialsParameter, "Expected CredentialsParameter to match")
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ import (`
`27`	`27`	`"github.com/aws/aws-sdk-go/service/ecs"`
`28`	`28`	`libYaml "github.com/docker/libcompose/yaml"`
`29`	`29`	`"github.com/pkg/errors"`
`30`		`- log "github.com/sirupsen/logrus"`
`31`	`30`	`"gopkg.in/yaml.v2"`
`32`	`31`	`)`
`33`	`32`
`@@ -74,7 +73,7 @@ type HealthCheck struct {`
`74`	`73`
`75`	`74`	`// RepositoryCredentials holds CredentialParameters for a ContainerDef`
`76`	`75`	`type RepositoryCredentials struct {`
`77`		- CredentialsParameter string `yaml:"credentials_param"`
	`76`	+ CredentialsParameter string `yaml:"credentials_parameter"`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`// TaskSize holds Cpu and Memory values needed for Fargate tasks`
`@@ -209,8 +208,6 @@ func ReadECSParams(filename string) (*ECSParams, error) {`
`209`	`208`	`return nil, errors.Wrapf(err, "Error unmarshalling yaml data from ECS params file: %v", filename)`
`210`	`209`	`}`
`211`	`210`
`212`		`- log.Infof("ECS params: %+v", ecsParams) // remove me!`
`213`		`-`
`214`	`211`	`return ecsParams, nil`
`215`	`212`	`}`
`216`	`213`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ task_definition:`
`85`	`85`	`wordpress:`
`86`	`86`	`essential: true`
`87`	`87`	`repository_credentials:`
`88`		- credentials_param: arn:aws:secretsmanager:1234567890:secret:test-RT4iv`
	`88`	+ credentials_parameter: arn:aws:secretsmanager:1234567890:secret:test-RT4iv`
`89`	`89`
`90`	`90`	`content := []byte(ecsParamsString)`
`91`	`91`
`@@ -119,7 +119,7 @@ task_definition:`
`119`	`119`	`assert.Equal(t, yaml.MemStringorInt(524288000), mysql.Memory)`
`120`	`120`	`assert.Equal(t, yaml.MemStringorInt(524288000), mysql.MemoryReservation)`
`121`	`121`	`assert.True(t, wordpress.Essential, "Expected container to be essential")`
`122`		`- assert.Equal(t, wordpress.RepositoryCredentials.CredentialsParameter, "arn:aws:secretsmanager:1234567890:secret:test-RT4iv")`
	`122`	`+ assert.Equal(t, "arn:aws:secretsmanager:1234567890:secret:test-RT4iv", wordpress.RepositoryCredentials.CredentialsParameter, "Expected CredentialsParameter to match")`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`