Skip to content

Commit a124312

Browse files
Revert "convox run supports policies added to service (#3743)"
This reverts commit d0c8f9a.
1 parent d0c8f9a commit a124312

File tree

1 file changed

+3
-32
lines changed

1 file changed

+3
-32
lines changed

provider/aws/processes.go

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
"github.com/aws/aws-sdk-go/aws"
1515
"github.com/aws/aws-sdk-go/aws/awserr"
16-
"github.com/aws/aws-sdk-go/service/cloudformation"
1716
"github.com/aws/aws-sdk-go/service/dynamodb"
1817
"github.com/aws/aws-sdk-go/service/ec2"
1918
"github.com/aws/aws-sdk-go/service/ecs"
@@ -1124,10 +1123,10 @@ func (p *Provider) generateTaskDefinition2(app, service string, opts structs.Pro
11241123
return nil, err
11251124
}
11261125

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"}
11281127
ResourceName := strings.Replace(strings.ToUpper(r), "-", "_", -1)
11291128

1130-
for k, v := range ResourceEnvVariables {
1129+
for k,v := range ResourceEnvVariables{
11311130
senv[fmt.Sprintf("%s_%s", ResourceName, k)] = stackOutputs(rs)[v]
11321131
}
11331132
}
@@ -1192,38 +1191,10 @@ func (p *Provider) generateTaskDefinition2(app, service string, opts structs.Pro
11921191
}
11931192
}
11941193

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-
12231194
req := &ecs.RegisterTaskDefinitionInput{
12241195
ContainerDefinitions: []*ecs.ContainerDefinition{cd},
12251196
Family: aws.String(fmt.Sprintf("%s-%s-%s", p.Rack, app, service)),
1226-
TaskRoleArn: taskRoleArn,
1197+
TaskRoleArn: aws.String(aos["ServiceRole"]),
12271198
Volumes: vs,
12281199
}
12291200

0 commit comments

Comments
 (0)