Skip to content

Commit bb5631e

Browse files
committed
updating task and stack fetch
1 parent f18ed3e commit bb5631e

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

provider/aws/processes.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ func (p *Provider) generateTaskDefinition2(app, service string, opts structs.Pro
10921092
}
10931093

10941094
aps := stackParameters(as)
1095-
// aos := stackOutputs(as)
1095+
aos := stackOutputs(as)
10961096

10971097
senv := s.EnvironmentDefaults()
10981098

@@ -1209,15 +1209,21 @@ func (p *Provider) generateTaskDefinition2(app, service string, opts structs.Pro
12091209
nestedStackName := describeStackOutput.Stacks[0].StackName
12101210

12111211
ts, err := p.stackResource(*nestedStackName, "DedicatedRole")
1212-
if err != nil {
1212+
if err != nil && !strings.Contains(err.Error(), "resource not found") {
12131213
return nil, err
12141214
}
12151215

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+
12161223
req := &ecs.RegisterTaskDefinitionInput{
12171224
ContainerDefinitions: []*ecs.ContainerDefinition{cd},
12181225
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,
12211227
Volumes: vs,
12221228
}
12231229

0 commit comments

Comments
 (0)