chore: upgrade cdk to 2.129.0 (#2529)

aws-amplify · Jul 3, 2024 · c519703 · c519703
1 parent 4feb898
commit c519703
Show file tree

Hide file tree

Showing 41 changed files with 860 additions and 700 deletions.
diff --git a/dependency_licenses.txt b/dependency_licenses.txt
diff --git a/package.json b/package.json
@@ -199,6 +199,7 @@
  "@types/js-yaml": "^4.0.0",
  "@typescript-eslint/eslint-plugin": "^5.59.2",
  "@typescript-eslint/parser": "^5.59.2",
+ "@yarnpkg/lockfile": "^1.1.0",
  "@zkochan/cmd-shim": "^5.1.0",
  "babel-eslint": "^10.1.0",
  "babel-loader": "^8.1.0",
@@ -228,8 +229,7 @@
  "rimraf": "^3.0.0",
  "ts-jest": "^26.4.4",
  "ts-node": "^8.10.1",
- "typescript": "^4.5.5",
- "@yarnpkg/lockfile": "^1.1.0"
+ "typescript": "^4.5.5"
  },
  "resolutions": {
  "**/glob-parent": "^6.0.2",

diff --git a/packages/amplify-category-api/package.json b/packages/amplify-category-api/package.json
@@ -35,7 +35,7 @@
  "@aws-amplify/graphql-transformer-core": "2.9.2",
  "@aws-amplify/graphql-transformer-interfaces": "3.10.0",
  "@aws-amplify/graphql-transformer-migrator": "2.2.26",
- "@aws-cdk/aws-apigatewayv2-alpha": "~2.80.0-alpha.0",
+ "@aws-cdk/aws-apigatewayv2-alpha": "~2.114.1-alpha.0",
  "@aws-sdk/client-ec2": "3.338.0",
  "@aws-sdk/client-iam": "3.338.0",
  "@aws-sdk/client-lambda": "3.338.0",
@@ -69,20 +69,20 @@
  "uuid": "^8.3.2"
  },
  "peerDependencies": {
- "@aws-amplify/amplify-cli-core": "^4.2.10",
- "@aws-amplify/amplify-environment-parameters": "^1.9.1",
- "@aws-amplify/amplify-prompts": "^2.8.4",
- "@aws-amplify/amplify-provider-awscloudformation": "^8.8.0",
- "amplify-headless-interface": "^1.17.4",
- "amplify-util-headless-input": "^1.9.15",
- "aws-cdk-lib": "^2.80.0",
- "constructs": "^10.0.5"
+ "@aws-amplify/amplify-cli-core": "^4.3.9",
+ "@aws-amplify/amplify-environment-parameters": "^1.9.14",
+ "@aws-amplify/amplify-prompts": "^2.8.6",
+ "@aws-amplify/amplify-provider-awscloudformation": "^8.10.11",
+ "amplify-headless-interface": "^1.17.7",
+ "amplify-util-headless-input": "^1.9.18",
+ "aws-cdk-lib": "^2.129.0",
+ "constructs": "^10.3.0"
  },
  "devDependencies": {
  "@aws-amplify/graphql-transformer-test-utils": "0.5.5",
  "@types/js-yaml": "^4.0.0",
  "@types/node": "^12.12.6",
- "amplify-util-headless-input": "^1.9.15",
+ "amplify-util-headless-input": "^1.9.18",
  "ts-jest": "26.4.4"
  },
  "jest": {

diff --git a/...es/amplify-category-api/resources/awscloudformation/overrides-resource/APIGW/package.json b/...es/amplify-category-api/resources/awscloudformation/overrides-resource/APIGW/package.json
@@ -7,7 +7,7 @@
  "watch": "tsc -w"
  },
  "dependencies": {
- "@aws-amplify/cli-extensibility-helper": "^3.0.20"
+ "@aws-amplify/cli-extensibility-helper": "^3.0.33"
  },
  "devDependencies": {
  "typescript": "^4.2.4"

diff --git a/.../amplify-category-api/resources/awscloudformation/overrides-resource/AppSync/package.json b/.../amplify-category-api/resources/awscloudformation/overrides-resource/AppSync/package.json
@@ -7,7 +7,7 @@
  "watch": "tsc -w"
  },
  "dependencies": {
- "@aws-amplify/cli-extensibility-helper": "^3.0.20"
+ "@aws-amplify/cli-extensibility-helper": "^3.0.33"
  },
  "devDependencies": {
  "typescript": "^4.2.4"

diff --git a/...src/__tests__/provider-utils/awscloudformation/__snapshots__/ecs-apigw-stack.test.ts.snap b/...src/__tests__/provider-utils/awscloudformation/__snapshots__/ecs-apigw-stack.test.ts.snap
@@ -66,6 +66,9 @@ Object {
  "ap-southeast-3": Object {
  "states": "states.ap-southeast-3.amazonaws.com",
  },
+ "ap-southeast-4": Object {
+ "states": "states.ap-southeast-4.amazonaws.com",
+ },
  "ca-central-1": Object {
  "states": "states.ca-central-1.amazonaws.com",
  },
@@ -99,6 +102,9 @@ Object {
  "eu-west-3": Object {
  "states": "states.eu-west-3.amazonaws.com",
  },
+ "il-central-1": Object {
+ "states": "states.il-central-1.amazonaws.com",
+ },
  "me-central-1": Object {
  "states": "states.me-central-1.amazonaws.com",
  },
@@ -1447,7 +1453,7 @@ exports.handler = async function({ RequestType, ResourceProperties, StackId }) {
  "Arn",
  ],
  },
- "Runtime": "nodejs16.x",
+ "Runtime": "nodejs18.x",
  "Timeout": 900,
  },
  "Type": "AWS::Lambda::Function",
@@ -1592,7 +1598,7 @@ exports.handler = async function({ RequestType, ResourceProperties, StackId }) {
  "Arn",
  ],
  },
- "Runtime": "nodejs16.x",
+ "Runtime": "nodejs18.x",
  "Timeout": 900,
  },
  "Type": "AWS::Lambda::Function",
@@ -1741,7 +1747,7 @@ exports.handler = async function({ RequestType, ResourceProperties, StackId }) {
  "Arn",
  ],
  },
- "Runtime": "nodejs16.x",
+ "Runtime": "nodejs18.x",
  "Timeout": 900,
  },
  "Type": "AWS::Lambda::Function",

diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/base-api-stack.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/base-api-stack.ts
@@ -554,14 +554,6 @@ export abstract class ContainersStack extends cdk.Stack {
  }
  });
 
- // Until we update CDK lib to >= 2.87, custom resources use older nodejs version in lambda,
- // explicitly overriding the generated resources.
- Object.values(cfn.Resources).forEach((resource: any) => {
- if (resource.Type === 'AWS::Lambda::Function' && resource.Properties.Runtime && resource.Properties.Runtime === 'nodejs14.x') {
- resource.Properties.Runtime = 'nodejs16.x';
- }
- });
-
  return cfn;
  }
 }