@@ -13,7 +13,6 @@ import (
13
13
14
14
"github.com/aws/aws-sdk-go/aws"
15
15
"github.com/aws/aws-sdk-go/aws/awserr"
16
- "github.com/aws/aws-sdk-go/service/cloudformation"
17
16
"github.com/aws/aws-sdk-go/service/dynamodb"
18
17
"github.com/aws/aws-sdk-go/service/ec2"
19
18
"github.com/aws/aws-sdk-go/service/ecs"
@@ -1124,10 +1123,10 @@ func (p *Provider) generateTaskDefinition2(app, service string, opts structs.Pro
1124
1123
return nil , err
1125
1124
}
1126
1125
1127
- ResourceEnvVariables := map [string ]string {"URL" : "Url" , "NAME" : "Name" , "HOST" : "Host" , "PASS" : "Pass" , "PORT" : "Port" , "USER" : "User" }
1126
+ ResourceEnvVariables := map [string ]string {"URL" :"Url" ,"NAME" :"Name" ,"HOST" :"Host" ,"PASS" :"Pass" ,"PORT" :"Port" ,"USER" :"User" }
1128
1127
ResourceName := strings .Replace (strings .ToUpper (r ), "-" , "_" , - 1 )
1129
1128
1130
- for k , v := range ResourceEnvVariables {
1129
+ for k ,v := range ResourceEnvVariables {
1131
1130
senv [fmt .Sprintf ("%s_%s" , ResourceName , k )] = stackOutputs (rs )[v ]
1132
1131
}
1133
1132
}
@@ -1192,38 +1191,10 @@ func (p *Provider) generateTaskDefinition2(app, service string, opts structs.Pro
1192
1191
}
1193
1192
}
1194
1193
1195
- td , err := p .stackResource (fmt .Sprintf ("%s-%s" , p .Rack , app ), "ServiceWeb" )
1196
- if err != nil {
1197
- return nil , err
1198
- }
1199
-
1200
- nestedStackID := td .PhysicalResourceId
1201
-
1202
- describeStackOutput , err := p .cloudformation ().DescribeStacks (& cloudformation.DescribeStacksInput {
1203
- StackName : nestedStackID ,
1204
- })
1205
- if err != nil {
1206
- return nil , err
1207
- }
1208
-
1209
- nestedStackName := describeStackOutput .Stacks [0 ].StackName
1210
-
1211
- ts , err := p .stackResource (* nestedStackName , "DedicatedRole" )
1212
- if err != nil && ! strings .Contains (err .Error (), "resource not found" ) {
1213
- return nil , err
1214
- }
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
-
1223
1194
req := & ecs.RegisterTaskDefinitionInput {
1224
1195
ContainerDefinitions : []* ecs.ContainerDefinition {cd },
1225
1196
Family : aws .String (fmt .Sprintf ("%s-%s-%s" , p .Rack , app , service )),
1226
- TaskRoleArn : taskRoleArn ,
1197
+ TaskRoleArn : aws . String ( aos [ "ServiceRole" ]) ,
1227
1198
Volumes : vs ,
1228
1199
}
1229
1200
0 commit comments