@@ -1092,7 +1092,7 @@ func (p *Provider) generateTaskDefinition2(app, service string, opts structs.Pro
1092
1092
}
1093
1093
1094
1094
aps := stackParameters (as )
1095
- // aos := stackOutputs(as)
1095
+ aos := stackOutputs (as )
1096
1096
1097
1097
senv := s .EnvironmentDefaults ()
1098
1098
@@ -1209,15 +1209,21 @@ func (p *Provider) generateTaskDefinition2(app, service string, opts structs.Pro
1209
1209
nestedStackName := describeStackOutput .Stacks [0 ].StackName
1210
1210
1211
1211
ts , err := p .stackResource (* nestedStackName , "DedicatedRole" )
1212
- if err != nil {
1212
+ if err != nil && ! strings . Contains ( err . Error (), "resource not found" ) {
1213
1213
return nil , err
1214
1214
}
1215
1215
1216
+ var taskRoleArn * string
1217
+ if ts != nil {
1218
+ taskRoleArn = aws .String (fmt .Sprintf ("convox/%s" , * ts .PhysicalResourceId ))
1219
+ } else {
1220
+ taskRoleArn = aws .String (aos ["ServiceRole" ])
1221
+ }
1222
+
1216
1223
req := & ecs.RegisterTaskDefinitionInput {
1217
1224
ContainerDefinitions : []* ecs.ContainerDefinition {cd },
1218
1225
Family : aws .String (fmt .Sprintf ("%s-%s-%s" , p .Rack , app , service )),
1219
- // TaskRoleArn: aws.String(aos["ServiceRole"]),
1220
- TaskRoleArn : aws .String (* ts .PhysicalResourceId ),
1226
+ TaskRoleArn : taskRoleArn ,
1221
1227
Volumes : vs ,
1222
1228
}
1223
1229
0 commit comments