Merge pull request #824 from surminus/fix-task-role-bug

Fix ECS task role name bug (issue #790)

builtin/aws/ecs/platform.go

@@ -242,9 +242,11 @@ func (p *Platform) Deploy(
  return err
  }
 
- taskRole, err = p.SetupTaskRole(ctx, s, log, sess, src)
- if err != nil {
- return err
+ if p.config.TaskRoleName != "" {
+ taskRole, err = p.SetupTaskRole(ctx, s, log, sess, src)
+ if err != nil {
+ return err
+ }
  }
 
  logGroup, err = p.SetupLogs(ctx, s, log, sess)
@@ -741,11 +743,10 @@ func (p *Platform) Launch(
 
  containerDefinitions := append([]*ecs.ContainerDefinition{&def}, additionalContainers...)
 
- taskOut, err := ecsSvc.RegisterTaskDefinition(&ecs.RegisterTaskDefinitionInput{
+ registerTaskDefinitionInput := ecs.RegisterTaskDefinitionInput{
  ContainerDefinitions: containerDefinitions,
 
  ExecutionRoleArn: aws.String(executionRoleArn),
- TaskRoleArn: aws.String(taskRoleArn),
  Cpu: cpus,
  Memory: aws.String(mems),
  Family: aws.String(family),
@@ -759,7 +760,13 @@ func (p *Platform) Launch(
  Value: aws.String(app.App),
  },
  },
- })
+ }
+
+ if taskRoleArn != "" {
+ registerTaskDefinitionInput.SetTaskRoleArn(taskRoleArn)
+ }
+
+ taskOut, err := ecsSvc.RegisterTaskDefinition(&registerTaskDefinitionInput)
 
  if err != nil {
  return nil, err