Add support for environment variables in ecs-params.yml - Issue aws#530

seanson · PettitWesley · commit 83ea3f04ccf7 · 2018-06-04T13:59:08.000-07:00
This adds support and a test for environment variables in ecs-params.yml.
It is a basic set of support for variables in the `$VAR` and `${VAR} format.
diff --git a/ecs-cli/modules/cli/compose/project/project_test.go b/ecs-cli/modules/cli/compose/project/project_test.go
@@ -155,6 +155,40 @@ run_params:
 	err = tmpfile.Close()
 	assert.NoError(t, err, "Could not close tempfile")
 }
+func TestParseECSParamsWithEnvironment(t *testing.T) {
+	ecsParamsString := `version: 1
+task_definition:
+  task_size:
+    mem_limit: ${MEM_LIMIT}
+    cpu_limit: $CPU_LIMIT`
+
+	os.Setenv("MEM_LIMIT", "1000")
+	os.Setenv("CPU_LIMIT", "200")
+
+	content := []byte(ecsParamsString)
+
+	tmpfile, err := ioutil.TempFile("", "ecs-params")
+	assert.NoError(t, err, "Could not create ecs fields tempfile")
+
+	ecsParamsFileName := tmpfile.Name()
+	defer os.Remove(ecsParamsFileName)
+
+	project := setupTestProjectWithEcsParams(t, ecsParamsFileName)
+
+	_, err = tmpfile.Write(content)
+	assert.NoError(t, err, "Could not write data to ecs fields tempfile")
+
+	err = project.parseECSParams()
+	if assert.NoError(t, err) {
+		ecsParams := project.ecsContext.ECSParams
+		ts := ecsParams.TaskDefinition.TaskSize
+		assert.Equal(t, "200", ts.Cpu, "Expected CPU to match")
+		assert.Equal(t, "1000", ts.Memory, "Expected CPU to match")
+	}
+
+	err = tmpfile.Close()
+	assert.NoError(t, err, "Could not close tempfile")
+}
 
 func TestParseECSParams_NoFile(t *testing.T) {
 	project := setupTestProject(t)
diff --git a/ecs-cli/modules/utils/compose/ecs_params_reader.go b/ecs-cli/modules/utils/compose/ecs_params_reader.go
@@ -115,7 +115,7 @@ func ReadECSParams(filename string) (*ECSParams, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "Error reading file '%v'", filename)
 	}
-
+	ecsParamsData = []byte(os.ExpandEnv(string(ecsParamsData)))
 	ecsParams := &ECSParams{}
 
 	if err = yaml.Unmarshal([]byte(ecsParamsData), &ecsParams); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func ReadECSParams(filename string) (*ECSParams, error) {`
`115`	`115`	`if err != nil {`
`116`	`116`	`return nil, errors.Wrapf(err, "Error reading file '%v'", filename)`
`117`	`117`	`}`
`118`		`-`
	`118`	`+ ecsParamsData = []byte(os.ExpandEnv(string(ecsParamsData)))`
`119`	`119`	`ecsParams := &ECSParams{}`
`120`	`120`
`121`	`121`	`if err = yaml.Unmarshal([]byte(ecsParamsData), &ecsParams); err != nil {`