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.

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

chore: upgrade cdk to 2.152.0 #2788

Merged
merged 11 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,450 changes: 1,204 additions & 246 deletions dependency_licenses.txt

Large diffs are not rendered by default.

164 changes: 159 additions & 5 deletions packages/amplify-data-construct/.jsii
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@aws-amplify/graphql-api-construct": "1.11.6",
"aws-cdk-lib": "^2.129.0",
"aws-cdk-lib": "^2.152.0",
"constructs": "^10.3.0"
},
"dependencyClosure": {
Expand Down Expand Up @@ -268,8 +268,32 @@
}
}
},
"aws-cdk-lib.aws_apigatewayv2_authorizers": {},
"aws-cdk-lib.aws_apigatewayv2_integrations": {},
"aws-cdk-lib.aws_apigatewayv2_authorizers": {
"targets": {
"dotnet": {
"namespace": "Amazon.CDK.AwsApigatewayv2Authorizers"
},
"java": {
"package": "software.amazon.awscdk.aws_apigatewayv2_authorizers"
},
"python": {
"module": "aws_cdk.aws_apigatewayv2_authorizers"
}
}
},
"aws-cdk-lib.aws_apigatewayv2_integrations": {
"targets": {
"dotnet": {
"namespace": "Amazon.CDK.AwsApigatewayv2Integrations"
},
"java": {
"package": "software.amazon.awscdk.aws_apigatewayv2_integrations"
},
"python": {
"module": "aws_cdk.aws_apigatewayv2_integrations"
}
}
},
"aws-cdk-lib.aws_appconfig": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -335,6 +359,19 @@
}
}
},
"aws-cdk-lib.aws_applicationsignals": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.ApplicationSignals"
},
"java": {
"package": "software.amazon.awscdk.services.applicationsignals"
},
"python": {
"module": "aws_cdk.aws_applicationsignals"
}
}
},
"aws-cdk-lib.aws_appmesh": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -387,6 +424,19 @@
}
}
},
"aws-cdk-lib.aws_apptest": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.AppTest"
},
"java": {
"package": "software.amazon.awscdk.services.apptest"
},
"python": {
"module": "aws_cdk.aws_apptest"
}
}
},
"aws-cdk-lib.aws_aps": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -543,10 +593,23 @@
}
}
},
"aws-cdk-lib.aws_bcmdataexports": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.BCMDataExports"
},
"java": {
"package": "software.amazon.awscdk.services.bcmdataexports"
},
"python": {
"module": "aws_cdk.aws_bcmdataexports"
}
}
},
"aws-cdk-lib.aws_bedrock": {
"targets": {
"dotnet": {
"namespace": "Amazon.CDK.AWS.Bedrock"
"package": "Amazon.CDK.AWS.Bedrock"
},
"java": {
"package": "software.amazon.awscdk.services.bedrock"
Expand Down Expand Up @@ -647,6 +710,19 @@
}
}
},
"aws-cdk-lib.aws_cleanroomsml": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.CleanRoomsML"
},
"java": {
"package": "software.amazon.awscdk.services.cleanroomsml"
},
"python": {
"module": "aws_cdk.aws_cleanroomsml"
}
}
},
"aws-cdk-lib.aws_cloud9": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -778,6 +854,19 @@
}
}
},
"aws-cdk-lib.aws_codeconnections": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.CodeConnections"
},
"java": {
"package": "software.amazon.awscdk.services.codeconnections"
},
"python": {
"module": "aws_cdk.aws_codeconnections"
}
}
},
"aws-cdk-lib.aws_codedeploy": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -1051,6 +1140,19 @@
}
}
},
"aws-cdk-lib.aws_deadline": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.Deadline"
},
"java": {
"package": "software.amazon.awscdk.services.deadline"
},
"python": {
"module": "aws_cdk.aws_deadline"
}
}
},
"aws-cdk-lib.aws_detective": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -2572,6 +2674,19 @@
}
}
},
"aws-cdk-lib.aws_paymentcryptography": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.PaymentCryptography"
},
"java": {
"package": "software.amazon.awscdk.services.paymentcryptography"
},
"python": {
"module": "aws_cdk.aws_paymentcryptography"
}
}
},
"aws-cdk-lib.aws_pcaconnectorad": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -2650,6 +2765,19 @@
}
}
},
"aws-cdk-lib.aws_qbusiness": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.QBusiness"
},
"java": {
"package": "software.amazon.awscdk.services.qbusiness"
},
"python": {
"module": "aws_cdk.aws_qbusiness"
}
}
},
"aws-cdk-lib.aws_qldb": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -2858,6 +2986,19 @@
}
}
},
"aws-cdk-lib.aws_route53profiles": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.Route53Profiles"
},
"java": {
"package": "software.amazon.awscdk.services.route53profiles"
},
"python": {
"module": "aws_cdk.aws_route53profiles"
}
}
},
"aws-cdk-lib.aws_route53recoverycontrol": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -3079,6 +3220,19 @@
}
}
},
"aws-cdk-lib.aws_securitylake": {
"targets": {
"dotnet": {
"package": "Amazon.CDK.AWS.SecurityLake"
},
"java": {
"package": "software.amazon.awscdk.services.securitylake"
},
"python": {
"module": "aws_cdk.aws_securitylake"
}
}
},
"aws-cdk-lib.aws_servicecatalog": {
"targets": {
"dotnet": {
Expand Down Expand Up @@ -3732,5 +3886,5 @@
},
"types": {},
"version": "1.9.6",
"fingerprint": "t05jtg1Ootrrjq7Ki2F8cpVzSntYItQs3SkxAqaYmoA="
"fingerprint": "SdJZCjnS8qNDxzovyPRKBjmX8BKQnFxJLzNMF5SN3Zs="
}
4 changes: 2 additions & 2 deletions packages/amplify-data-construct/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"devDependencies": {
"@types/fs-extra": "^8.0.1",
"@types/node": "^12.12.6",
"aws-cdk-lib": "2.129.0",
"aws-cdk-lib": "2.152.0",
"constructs": "10.3.0",
"jsii": "^5.4.23",
"jsii-pacmak": "^1.84.0",
Expand All @@ -125,7 +125,7 @@
"ts-node": "^8.10.1"
},
"peerDependencies": {
"aws-cdk-lib": "^2.129.0",
"aws-cdk-lib": "^2.152.0",
"constructs": "^10.3.0"
},
"stability": "stable",
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-graphql-api-construct-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@aws-amplify/auth-construct-alpha": "^0.5.6",
"@aws-amplify/core": "^2.1.0",
"@aws-amplify/graphql-api-construct": "1.11.6",
"@aws-cdk/aws-cognito-identitypool-alpha": "2.129.0-alpha.0",
"@aws-cdk/aws-cognito-identitypool-alpha": "2.152.0-alpha.0",
"@aws-sdk/client-cognito-identity-provider": "3.624.0",
"@aws-sdk/client-lambda": "3.624.0",
"@aws-sdk/client-rds": "3.624.0",
Expand All @@ -45,7 +45,7 @@
"@aws-amplify/graphql-transformer-core": "3.0.0",
"@aws-amplify/graphql-transformer-interfaces": "4.0.0",
"@types/node": "^16.11.56",
"aws-cdk-lib": "2.129.0",
"aws-cdk-lib": "2.152.0",
"constructs": "10.3.0",
"ts-node": "^8.10.2"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.129.0 1`] = `
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.152.0 1`] = `
Object {
"body": Object {
"data": Object {
Expand All @@ -14,7 +14,7 @@ Object {
}
`;

exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.129.0 2`] = `
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.152.0 2`] = `
Object {
"body": Object {
"data": Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ describe('CDK Auth Modes', () => {
test('Can be invoked with Admin Roles defined', async () => {
const templatePath = path.resolve(path.join(__dirname, 'backends', 'admin-role'));
const name = await initCDKProject(projRoot, templatePath, {
cdkVersion: '2.129.0', // Explicitly declaring this, since this version needs to match cognito idp
cdkVersion: '2.152.0', // Explicitly declaring this, since this version needs to match cognito idp
additionalDependencies: [
'esbuild', // required to bundle the lambda function
'@aws-cdk/aws-cognito-identitypool-alpha@2.129.0-alpha.0', // using alpha cognito idp resource for auth config
'@aws-cdk/aws-cognito-identitypool-alpha@2.152.0-alpha.0', // using alpha cognito idp resource for auth config
'@aws-crypto/sha256-js', // All remaining deps are required for the lambda to sign the request to appsync
'@aws-sdk/credential-provider-node',
'@aws-sdk/protocol-http',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('CDK GraphQL Transformer', () => {
deleteProjectDir(projRoot);
});

['2.129.0', 'latest'].forEach((cdkVersion) => {
['2.152.0', 'latest'].forEach((cdkVersion) => {
test(`CDK base case - aws-cdk-lib@${cdkVersion}`, async () => {
const templatePath = path.resolve(path.join(__dirname, 'backends', 'base-cdk'));
const name = await initCDKProject(projRoot, templatePath, { cdkVersion });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('Data Construct', () => {
deleteProjectDir(projRoot);
});

['2.129.0', 'latest'].forEach((cdkVersion) => {
['2.152.0', 'latest'].forEach((cdkVersion) => {
test(`Data Construct - aws-cdk-lib@${cdkVersion}`, async () => {
const templatePath = path.resolve(path.join(__dirname, 'backends', 'data-construct'));
const name = await initCDKProject(projRoot, templatePath, { cdkVersion, construct: 'Data' });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export type InitCDKProjectProps = {
* @returns a promise which resolves to the stack name
*/
export const initCDKProject = async (cwd: string, templatePath: string, props?: InitCDKProjectProps): Promise<string> => {
const { cdkVersion = '2.129.0', additionalDependencies = [] } = props ?? {};
const { cdkVersion = '2.152.0', additionalDependencies = [] } = props ?? {};

await spawn(getNpxPath(), ['cdk', 'init', 'app', '--language', 'typescript'], {
cwd,
Expand Down
Loading
Loading