Skip to content

Commit e916af8

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into addInterfaceEndpoint
2 parents 40bd30a + 76e83a5 commit e916af8

3 files changed

Lines changed: 3 additions & 46 deletions

File tree

‎packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { ISubnet, IVpc, SubnetSelection } from './vpc';
99
import * as iam from '../../aws-iam';
1010
import * as cxschema from '../../cloud-assembly-schema';
1111
import { Aws, ContextProvider, IResource, Lazy, Resource, Stack, Token } from '../../core';
12-
import { PARTITION_MAP } from '../../region-info/build-tools/fact-tables';
1312

1413
/**
1514
* A VPC endpoint.
@@ -670,21 +669,8 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
670669
'redshift', 'redshift-data', 's3', 'sagemaker.api', 'sagemaker.featurestore-runtime', 'sagemaker.runtime', 'securityhub',
671670
'servicecatalog', 'sms', 'sqs', 'states', 'sts', 'sync-states', 'synthetics', 'transcribe', 'transcribestreaming', 'transfer',
672671
'workspaces', 'xray'],
673-
'us-isof-': ['ecr.api', 'ecr.dkr'],
674-
'eu-isoe-': ['ecr.api', 'ecr.dkr'],
675672
};
676-
677-
const regionPartition = region.split('-').slice(0, 2).join('-');
678-
const partitionDetails = PARTITION_MAP[`${regionPartition}-`];
679-
680-
// Check for specific service name under isolated region prefix
681-
const serviceInExceptions = VPC_ENDPOINT_SERVICE_EXCEPTIONS[`${regionPartition}-`]?.includes(name);
682-
683-
if (serviceInExceptions) {
684-
// Endpoints generated in reverse of domain suffix for the services mentioned in map
685-
const reverseString = partitionDetails.domainSuffix.split('.').reverse().join('.');
686-
return reverseString;
687-
} else if (VPC_ENDPOINT_SERVICE_EXCEPTIONS[region]?.includes(name)) {
673+
if (VPC_ENDPOINT_SERVICE_EXCEPTIONS[region]?.includes(name)) {
688674
return 'cn.com.amazonaws';
689675
} else {
690676
return 'com.amazonaws';

‎packages/aws-cdk-lib/aws-ec2/test/vpc-endpoint.test.ts‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -694,37 +694,6 @@ describe('vpc endpoint', () => {
694694
});
695695

696696
});
697-
698-
test.each([
699-
['us-isof-test-1', 'gov.ic.hci.csp'],
700-
['eu-isoe-test-1', 'uk.adc-e.cloud'],
701-
['us-east-1', 'com.amazonaws'],
702-
['us-gov-west-1', 'com.amazonaws'],
703-
['cn-northwest-1', 'cn.com.amazonaws'],
704-
['cn-north-1', 'cn.com.amazonaws'],
705-
])('test vpc interface endpoint for ECR can be created correctly in all regions', (region : string, domain: string) => {
706-
//GIVEN
707-
const stack = new Stack(undefined, 'TestStack', { env: { account: '123456789012', region: region } });
708-
const vpc = new Vpc(stack, 'VPC');
709-
710-
//WHEN
711-
vpc.addInterfaceEndpoint('ECR Endpoint', {
712-
service: InterfaceVpcEndpointAwsService.ECR,
713-
});
714-
715-
vpc.addInterfaceEndpoint('ECR Docker Endpoint', {
716-
service: InterfaceVpcEndpointAwsService.ECR_DOCKER,
717-
});
718-
719-
//THEN
720-
Template.fromStack(stack).hasResourceProperties('AWS::EC2::VPCEndpoint', {
721-
ServiceName: `${domain}.${region}.ecr.api`,
722-
});
723-
Template.fromStack(stack).hasResourceProperties('AWS::EC2::VPCEndpoint', {
724-
ServiceName: `${domain}.${region}.ecr.dkr`,
725-
});
726-
});
727-
728697
test.each([
729698
['transcribe', InterfaceVpcEndpointAwsService.TRANSCRIBE],
730699
])('test vpc interface endpoint with .cn suffix for %s can be created correctly in China regions', (name: string, given: InterfaceVpcEndpointAwsService) => {

‎packages/aws-cdk-lib/aws-lambda/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,8 @@ When enabled, AWS Lambda checks every code deployment and verifies that the code
13261326
For more information, see [Configuring code signing for AWS Lambda](https://docs.aws.amazon.com/lambda/latest/dg/configuration-codesigning.html).
13271327
The following code configures a function with code signing.
13281328

1329+
Please note the code will not be automatically signed before deployment. To ensure your code is properly signed, you'll need to conduct the code signing process either through the AWS CLI (Command Line Interface) [start-signing-job](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/signer/start-signing-job.html) or by accessing the AWS Signer console.
1330+
13291331
```ts
13301332
import * as signer from 'aws-cdk-lib/aws-signer';
13311333

0 commit comments

Comments
 (0)