Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(aws-ecs): remove temporary workaround for long arn support #3072

Merged
merged 4 commits into from
Jul 3, 2019
Merged

fix(aws-ecs): remove temporary workaround for long arn support #3072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80d49a8
Remove temporary workaround for long arn support
piradeepk Jun 25, 2019
1f8e097
Add deprecated annotation
piradeepk Jun 28, 2019
87527ca
Revert "Add deprecated annotation"
piradeepk Jul 1, 2019
58a27be
Merge branch 'master' into longArn
piradeepk Jul 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions packages/@aws-cdk/aws-ecs/lib/base/base-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ec2 = require('@aws-cdk/aws-ec2');
import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2');
import iam = require('@aws-cdk/aws-iam');
import cloudmap = require('@aws-cdk/aws-servicediscovery');
import { Construct, Duration, Fn, IResolvable, IResource, Lazy, Resource, Stack } from '@aws-cdk/core';
import { Construct, Duration, IResolvable, IResource, Lazy, Resource, Stack } from '@aws-cdk/core';
import { NetworkMode, TaskDefinition } from '../base/task-definition';
import { ICluster } from '../cluster';
import { CfnService } from '../ecs.generated';
Expand Down Expand Up @@ -73,21 +73,6 @@ export interface BaseServiceProps {
* @default - AWS Cloud Map service discovery is not enabled.
*/
readonly cloudMapOptions?: CloudMapOptions;

/**
* Whether the new long ARN format has been enabled on ECS services.
* NOTE: This assumes customer has opted into the new format for the IAM role used for the service, and is a
* workaround for a current bug in Cloudformation in which the service name is not correctly returned when long ARN is
* enabled.
*
* Old ARN format: arn:aws:ecs:region:aws_account_id:service/service-name
* New ARN format: arn:aws:ecs:region:aws_account_id:service/cluster-name/service-name
*
* See: https://docs.aws.amazon.com/AmazonECS/latest/userguide/ecs-resource-ids.html
*
* @default false
*/
readonly longArnEnabled?: boolean;
piradeepk marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down Expand Up @@ -157,19 +142,12 @@ export abstract class BaseService extends Resource
...additionalProps
});

// This is a workaround for CFN bug that returns the cluster name instead of the service name when long ARN formats
// are enabled for the principal in a given region.
const longArnEnabled = props.longArnEnabled !== undefined ? props.longArnEnabled : false;
const serviceName = longArnEnabled
? Fn.select(2, Fn.split('/', this.resource.ref))
: this.resource.attrName;

this.serviceArn = this.getResourceArnAttribute(this.resource.ref, {
service: 'ecs',
resource: 'service',
resourceName: `${props.cluster.clusterName}/${this.physicalName}`,
});
this.serviceName = this.getResourceNameAttribute(serviceName);
this.serviceName = this.getResourceNameAttribute(this.resource.attrName);

this.cluster = props.cluster;

Expand Down
16 changes: 4 additions & 12 deletions packages/@aws-cdk/aws-ecs/test/fargate/test.fargate-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,7 @@ export = {

const service = new ecs.FargateService(stack, 'Service', {
cluster,
taskDefinition,
longArnEnabled: true
taskDefinition
});

const lb = new elbv2.ApplicationLoadBalancer(stack, "lb", { vpc });
Expand Down Expand Up @@ -305,16 +304,9 @@ export = {
},
"/",
{
"Fn::Select": [
2,
{
"Fn::Split": [
"/",
{
Ref: "ServiceD69D759B"
}
]
}
"Fn::GetAtt": [
"ServiceD69D759B",
"Name"
]
}
]
Expand Down