@@ -15,6 +15,7 @@ package utils
1515
1616import (
1717 "fmt"
18+ "io/ioutil"
1819 "os"
1920 "reflect"
2021 "strconv"
@@ -114,6 +115,73 @@ func TestConvertToTaskDefinition(t *testing.T) {
114115 assert .Equal (t , taskRoleArn , aws .StringValue (taskDefinition .TaskRoleArn ), "Expected taskRoleArn to match" )
115116}
116117
118+ func TestConvertToTaskDefinitionWithECSParams (t * testing.T ) {
119+ ecsParamsString := `version: 1
120+ task_definition:
121+ ecs_network_mode: host
122+ task_role_arn: arn:aws:iam::123456789012:role/my_role`
123+
124+ content := []byte (ecsParamsString )
125+
126+ tmpfile , err := ioutil .TempFile ("" , "ecs-params" )
127+ assert .NoError (t , err , "Could not create ecs fields tempfile" )
128+
129+ defer os .Remove (tmpfile .Name ())
130+
131+ _ , err = tmpfile .Write (content )
132+ assert .NoError (t , err , "Could not write data to ecs fields tempfile" )
133+
134+ err = tmpfile .Close ()
135+ assert .NoError (t , err , "Could not close tempfile" )
136+
137+ ecsParamsFileName := tmpfile .Name ()
138+
139+ taskDefinition , err := convertToTaskDefWithEcsParamsInTest (t , "name" , & config.ServiceConfig {}, "" , ecsParamsFileName )
140+
141+ if assert .NoError (t , err ) {
142+ assert .Equal (t , "host" , aws .StringValue (taskDefinition .NetworkMode ), "Expected network mode to match" )
143+ assert .Equal (t , "arn:aws:iam::123456789012:role/my_role" , aws .StringValue (taskDefinition .TaskRoleArn ), "Expected task role ARN to match" )
144+ }
145+ }
146+
147+ func TestConvertToTaskDefinitionWithECSParamsAndTaskRoleArnFlag (t * testing.T ) {
148+ ecsParamsString := `version: 1
149+ task_definition:
150+ ecs_network_mode: host
151+ task_role_arn: arn:aws:iam::123456789012:role/tweedledee`
152+
153+ content := []byte (ecsParamsString )
154+
155+ tmpfile , err := ioutil .TempFile ("" , "ecs-params" )
156+ assert .NoError (t , err , "Could not create ecs fields tempfile" )
157+
158+ defer os .Remove (tmpfile .Name ())
159+
160+ _ , err = tmpfile .Write (content )
161+ assert .NoError (t , err , "Could not write data to ecs fields tempfile" )
162+
163+ err = tmpfile .Close ()
164+ assert .NoError (t , err , "Could not close tempfile" )
165+
166+ ecsParamsFileName := tmpfile .Name ()
167+ taskRoleArn := "arn:aws:iam::123456789012:role/tweedledum"
168+
169+ taskDefinition , err := convertToTaskDefWithEcsParamsInTest (t , "name" , & config.ServiceConfig {}, taskRoleArn , ecsParamsFileName )
170+
171+ if assert .NoError (t , err ) {
172+ assert .Equal (t , "host" , aws .StringValue (taskDefinition .NetworkMode ), "Expected network mode to match" )
173+ assert .Equal (t , "arn:aws:iam::123456789012:role/tweedledum" , aws .StringValue (taskDefinition .TaskRoleArn ), "Expected task role arn to match" )
174+ }
175+ }
176+
177+ func TestConvertToTaskDefinitionWithECSParamsWithNoSuchFileError (t * testing.T ) {
178+ ecsParamsFileName := "ecs-params.yml"
179+ taskRoleArn := "arn:aws:iam::123456789012:role/tweedledum"
180+
181+ _ , err := convertToTaskDefWithEcsParamsInTest (t , "name" , & config.ServiceConfig {}, taskRoleArn , ecsParamsFileName )
182+ assert .Error (t , err )
183+ }
184+
117185func TestConvertToTaskDefinitionWithDnsSearch (t * testing.T ) {
118186 dnsSearchDomains := []string {"search.example.com" }
119187
@@ -531,13 +599,39 @@ func convertToTaskDefinitionInTest(t *testing.T, name string, serviceConfig *con
531599 EnvironmentLookup : envLookup ,
532600 ResourceLookup : resourceLookup ,
533601 }
534- taskDefinition , err := ConvertToTaskDefinition (taskDefName , context , serviceConfigs , taskRoleArn )
602+ taskDefinition , err := ConvertToTaskDefinition (taskDefName , context , serviceConfigs , taskRoleArn , "" )
535603 if err != nil {
536604 t .Errorf ("Expected to convert [%v] serviceConfigs without errors. But got [%v]" , serviceConfig , err )
537605 }
538606 return taskDefinition
539607}
540608
609+ func convertToTaskDefWithEcsParamsInTest (t * testing.T , name string , serviceConfig * config.ServiceConfig , taskRoleArn string , ecsParamsFileName string ) (* ecs.TaskDefinition , error ) {
610+ serviceConfigs := config .NewServiceConfigs ()
611+ serviceConfigs .Add (name , serviceConfig )
612+
613+ taskDefName := "ProjectName"
614+ envLookup , err := GetDefaultEnvironmentLookup ()
615+ if err != nil {
616+ t .Fatal ("Unexpected error setting up environment lookup" )
617+ }
618+ resourceLookup , err := GetDefaultResourceLookup ()
619+ if err != nil {
620+ t .Fatal ("Unexpected error setting up resource lookup" )
621+ }
622+ context := & project.Context {
623+ Project : & project.Project {},
624+ EnvironmentLookup : envLookup ,
625+ ResourceLookup : resourceLookup ,
626+ }
627+ taskDefinition , err := ConvertToTaskDefinition (taskDefName , context , serviceConfigs , taskRoleArn , ecsParamsFileName )
628+ if err != nil {
629+ return nil , err
630+ }
631+
632+ return taskDefinition , nil
633+ }
634+
541635func TestIsZeroForEmptyConfig (t * testing.T ) {
542636 serviceConfig := & config.ServiceConfig {}
543637
@@ -640,7 +734,7 @@ func TestMemReservationHigherThanMemLimit(t *testing.T) {
640734 EnvironmentLookup : envLookup ,
641735 ResourceLookup : resourceLookup ,
642736 }
643- _ , err = ConvertToTaskDefinition (taskDefName , context , serviceConfigs , "" )
737+ _ , err = ConvertToTaskDefinition (taskDefName , context , serviceConfigs , "" , "" )
644738 assert .EqualError (t , err , "mem_limit should not be less than mem_reservation" )
645739}
646740
0 commit comments