Skip to content

Commit

Permalink
remove check enableExecuteCommand statement
Browse files Browse the repository at this point in the history
  • Loading branch information
mazyu36 committed Sep 9, 2024
1 parent ab73e53 commit aff0296
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 28 deletions.
4 changes: 0 additions & 4 deletions packages/aws-cdk-lib/aws-ecs/lib/external/external-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ export class ExternalService extends BaseService implements IExternalService {
throw new Error ('Cloud map options are not supported for External service');
}

if (props.enableExecuteCommand !== undefined) {
throw new Error ('Enable Execute Command options are not supported for External service');
}

if (props.capacityProviderStrategies !== undefined) {
throw new Error ('Capacity Providers are not supported for External service');
}
Expand Down
57 changes: 33 additions & 24 deletions packages/aws-cdk-lib/aws-ecs/test/external/external-service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,39 @@ describe('external service', () => {
});
});

test('with enableExecuteCommand set to true', () => {
// GIVEN
const stack = new cdk.Stack();
const vpc = new ec2.Vpc(stack, 'MyVpc', {});
const cluster = new ecs.Cluster(stack, 'EcsCluster', { vpc });
addDefaultCapacityProvider(cluster, stack, vpc);
const taskDefinition = new ecs.ExternalTaskDefinition(stack, 'TaskDef');

taskDefinition.addContainer('web', {
image: ecs.ContainerImage.fromRegistry('amazon/amazon-ecs-sample'),
memoryLimitMiB: 512,
});

// WHEN
new ecs.ExternalService(stack, 'ExternalService', {
cluster,
taskDefinition,
enableExecuteCommand: true,
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::ECS::Service', {
TaskDefinition: {
Ref: 'TaskDef54694570',
},
Cluster: {
Ref: 'EcsCluster97242B84',
},
LaunchType: LaunchType.EXTERNAL,
EnableExecuteCommand: true,
});
});

test('throws when task definition is not External compatible', () => {
const stack = new cdk.Stack();
const vpc = new ec2.Vpc(stack, 'MyVpc', {});
Expand Down Expand Up @@ -306,30 +339,6 @@ describe('external service', () => {

});

test('error if enableExecuteCommand options provided with external service', () => {
// GIVEN
const stack = new cdk.Stack();
const vpc = new ec2.Vpc(stack, 'MyVpc', {});
const cluster = new ecs.Cluster(stack, 'EcsCluster', { vpc });
addDefaultCapacityProvider(cluster, stack, vpc);
const taskDefinition = new ecs.ExternalTaskDefinition(stack, 'TaskDef');

taskDefinition.addContainer('web', {
image: ecs.ContainerImage.fromRegistry('amazon/amazon-ecs-sample'),
memoryLimitMiB: 512,
});

// THEN
expect(() => new ecs.ExternalService(stack, 'ExternalService', {
cluster,
taskDefinition,
enableExecuteCommand: true,
})).toThrow('Enable Execute Command options are not supported for External service');

// THEN

});

test('error if capacityProviderStrategies options provided with external service', () => {
// GIVEN
const stack = new cdk.Stack();
Expand Down

0 comments on commit aff0296

Please sign in to comment.