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(ecs): fromServiceArnWithCluster not accepting value from SSM Parameter string #30902

Merged
merged 2 commits into from
Jul 23, 2024
Merged

fix(ecs): fromServiceArnWithCluster not accepting value from SSM Parameter string #30902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aff806
fix(ecs): fromServiceArnWithCluster not accepting value from SSM Para…
xazhao Jul 19, 2024
2b2d36f
Merge branch 'main' into fix_ecs_token
gracelu0 Jul 23, 2024
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
24 changes: 15 additions & 9 deletions packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import {
ArnFormat,
FeatureFlags,
Token,
Arn,
Fn,
} from '../../../core';
import * as cxapi from '../../../cx-api';
import { RegionInfo } from '../../../region-info';
Expand Down Expand Up @@ -516,16 +518,20 @@ export abstract class BaseService extends Resource
public static fromServiceArnWithCluster(scope: Construct, id: string, serviceArn: string): IBaseService {
const stack = Stack.of(scope);
const arn = stack.splitArn(serviceArn, ArnFormat.SLASH_RESOURCE_NAME);
const resourceName = arn.resourceName;
if (!resourceName) {
throw new Error(`Missing resource Name from service ARN: ${serviceArn}`);
}
const resourceNameParts = resourceName.split('/');
if (resourceNameParts.length !== 2) {
throw new Error(`resource name ${resourceName} from service ARN: ${serviceArn} is not using the ARN cluster format`);
const resourceName = Arn.extractResourceName(serviceArn, 'service');
let clusterName: string;
let serviceName: string;
if (Token.isUnresolved(resourceName)) {
clusterName = Fn.select(0, Fn.split('/', resourceName));
serviceName = Fn.select(1, Fn.split('/', resourceName));
} else {
const resourceNameParts = resourceName.split('/');
if (resourceNameParts.length !== 2) {
throw new Error(`resource name ${resourceName} from service ARN: ${serviceArn} is not using the ARN cluster format`);
}
clusterName = resourceNameParts[0];
serviceName = resourceNameParts[1];
}
const clusterName = resourceNameParts[0];
const serviceName = resourceNameParts[1];

const clusterArn = Stack.of(scope).formatArn({
partition: arn.partition,
Expand Down
7 changes: 6 additions & 1 deletion packages/aws-cdk-lib/aws-ecs/test/base-service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('When import an ECS Service', () => {
test('throws an expection if no resourceName provided on fromServiceArnWithCluster', () => {
expect(() => {
ecs.BaseService.fromServiceArnWithCluster(stack, 'Service', 'arn:aws:ecs:service-region:service-account:service');
}).toThrowError(/Missing resource Name from service ARN/);
}).toThrowError(/Expected resource name in ARN, didn't find one: 'arn:aws:ecs:service-region:service-account:service'/);
});

test('throws an expection if not using cluster arn format on fromServiceArnWithCluster', () => {
Expand All @@ -47,6 +47,11 @@ describe('When import an ECS Service', () => {
}).toThrowError(/is not using the ARN cluster format/);
});

test('skip validation for tokenized values', () => {
expect(() => ecs.BaseService.fromServiceArnWithCluster(stack, 'Service',
cdk.Lazy.string({ produce: () => 'arn:aws:ecs:service-region:service-account:service' }))).not.toThrow();
});

test('should add a dependency on task role', () => {
// GIVEN
const vpc = new ec2.Vpc(stack, 'Vpc');
Expand Down