Skip to content

fix(ec2): add VPC endpoint naming conventions for some isolated regions #36794

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

Open
bk5115545 wants to merge 2 commits into
base: main
Choose a base branch
from
+135 −0
Open

fix(ec2): add VPC endpoint naming conventions for some isolated regions #36794

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
0dd765e
fix(ec2): add VPC endpoint naming conventions for some isolated regions
blaikoch Jan 23, 2026
90fe92e
Merge branch 'main' into fix/vpc-endpoint-isolated-regions
bk5115545 Jan 23, 2026
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
21 changes: 21 additions & 0 deletions packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,11 +849,32 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
'servicecatalog', 'sms', 'sqs', 'states', 'sts', 'sync-states', 'synthetics', 'transcribe', 'transcribestreaming', 'transfer',
'workspaces', 'xray'],
'eusc-de-east-1': ['ecr.dkr', 'ecr.api', 'execute-api', 'securityhub'],
'us-iso-east-1': ['application-autoscaling', 'athena', 'autoscaling', 'comprehend', 'diode-messaging',
'diode-messaging-proxy', 'ebs', 'ec2', 'ecr.api', 'ecr.dkr', 'elasticfilesystem', 'elasticfilesystem-fips',
'execute-api', 'sagemaker.api', 'sagemaker.runtime', 'sns', 'sqs', 'textract', 'textract-fips', 'transcribe',
'workspaces'],
'us-iso-west-1': ['autoscaling', 'ebs', 'ec2', 'ecr.api', 'ecr.dkr', 'elasticfilesystem', 'elasticfilesystem-fips',
'execute-api', 'monitoring', 'sns', 'sqs', 'workspaces'],
'us-isob-east-1': ['application-autoscaling', 'autoscaling', 'diode-messaging', 'diode-messaging-proxy', 'ebs',
'ec2', 'ecr.api', 'ecr.dkr', 'elasticfilesystem', 'elasticfilesystem-fips', 'execute-api', 'sagemaker.api',
'sagemaker.runtime', 'sns', 'sqs', 'workspaces'],
'us-isob-west-1': ['ecr.api', 'ecr.dkr', 'elasticfilesystem-fips', 'execute-api'],
'us-isof-south-1': ['ebs', 'ecr.api', 'ecr.dkr', 'execute-api'],
'us-isof-east-1': ['ebs', 'ecr.api', 'ecr.dkr', 'execute-api'],
Copy link
Contributor

@lpizzinidev lpizzinidev Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add eu-isoe-west-1 for completeness?

Copy link
Author

@bk5115545 bk5115545 Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have access to or know anyone who can access eu-isoe-west-1 so I am not aware of the services that use special naming conventions. I'd rather not guess at these as that could break functional CDK templates.

};
if (VPC_ENDPOINT_SERVICE_EXCEPTIONS[region]?.includes(name)) {
switch (region) {
case 'eusc-de-east-1':
return 'eu.amazonaws';
case 'us-iso-east-1':
case 'us-iso-west-1':
return 'gov.ic.c2s';
case 'us-isob-east-1':
case 'us-isob-west-1':
return 'gov.sgov.sc2s';
case 'us-isof-south-1':
case 'us-isof-east-1':
return 'gov.ic.hci.csp';
case 'cn-north-1':
case 'cn-northwest-1':
return 'cn.com.amazonaws';
Expand Down
114 changes: 114 additions & 0 deletions packages/aws-cdk-lib/aws-ec2/test/vpc-endpoint.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,120 @@ describe('vpc endpoint', () => {
});
});

test.each([
['us-iso-east-1', 'gov.ic.c2s'],
['us-iso-west-1', 'gov.ic.c2s'],
])('test vpc interface endpoint with %s prefix can be created correctly in %s', (region: string, prefix: string) => {
// GIVEN
const stack = new Stack(undefined, 'TestStack', { env: { account: '123456789012', region } });
const vpc = new Vpc(stack, 'VPC');

// WHEN
vpc.addInterfaceEndpoint('ECR Endpoint', {
service: InterfaceVpcEndpointAwsService.ECR,
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::EC2::VPCEndpoint', {
ServiceName: `${prefix}.${region}.ecr.api`,
});
});

test.each([
['us-iso-east-1'],
['us-iso-west-1'],
])('test vpc interface endpoint without gov.ic.c2s prefix can be created correctly in %s', (region: string) => {
// GIVEN
const stack = new Stack(undefined, 'TestStack', { env: { account: '123456789012', region } });
const vpc = new Vpc(stack, 'VPC');

// WHEN
vpc.addInterfaceEndpoint('ECS Endpoint', {
service: InterfaceVpcEndpointAwsService.ECS,
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::EC2::VPCEndpoint', {
ServiceName: `com.amazonaws.${region}.ecs`,
});
});

test.each([
['us-isob-east-1', 'gov.sgov.sc2s'],
['us-isob-west-1', 'gov.sgov.sc2s'],
])('test vpc interface endpoint with %s prefix can be created correctly in %s', (region: string, prefix: string) => {
// GIVEN
const stack = new Stack(undefined, 'TestStack', { env: { account: '123456789012', region } });
const vpc = new Vpc(stack, 'VPC');

// WHEN
vpc.addInterfaceEndpoint('ECR Endpoint', {
service: InterfaceVpcEndpointAwsService.ECR,
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::EC2::VPCEndpoint', {
ServiceName: `${prefix}.${region}.ecr.api`,
});
});

test.each([
['us-isob-east-1'],
['us-isob-west-1'],
])('test vpc interface endpoint without gov.sgov.sc2s prefix can be created correctly in %s', (region: string) => {
// GIVEN
const stack = new Stack(undefined, 'TestStack', { env: { account: '123456789012', region } });
const vpc = new Vpc(stack, 'VPC');

// WHEN
vpc.addInterfaceEndpoint('ECS Endpoint', {
service: InterfaceVpcEndpointAwsService.ECS,
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::EC2::VPCEndpoint', {
ServiceName: `com.amazonaws.${region}.ecs`,
});
});

test.each([
['us-isof-south-1', 'gov.ic.hci.csp'],
['us-isof-east-1', 'gov.ic.hci.csp'],
])('test vpc interface endpoint with %s prefix can be created correctly in %s', (region: string, prefix: string) => {
// GIVEN
const stack = new Stack(undefined, 'TestStack', { env: { account: '123456789012', region } });
const vpc = new Vpc(stack, 'VPC');

// WHEN
vpc.addInterfaceEndpoint('ECR Endpoint', {
service: InterfaceVpcEndpointAwsService.ECR,
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::EC2::VPCEndpoint', {
ServiceName: `${prefix}.${region}.ecr.api`,
});
});

test.each([
['us-isof-south-1'],
['us-isof-east-1'],
])('test vpc interface endpoint without gov.ic.hci.csp prefix can be created correctly in %s', (region: string) => {
// GIVEN
const stack = new Stack(undefined, 'TestStack', { env: { account: '123456789012', region } });
const vpc = new Vpc(stack, 'VPC');

// WHEN
vpc.addInterfaceEndpoint('ECS Endpoint', {
service: InterfaceVpcEndpointAwsService.ECS,
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::EC2::VPCEndpoint', {
ServiceName: `com.amazonaws.${region}.ecs`,
});
});

test('test codeartifact vpc interface endpoint in us-west-2', () => {
// GIVEN
const stack = new Stack(undefined, 'TestStack', { env: { account: '123456789012', region: 'us-west-2' } });
Expand Down
Loading