Merge branch 'main' into allow-gen1

Author: Dane Pilcher

dependency_licenses.txt

@@ -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",

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": {

packages/amplify-category-api/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"

packages/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"

packages/amplify-category-api/resources/awscloudformation/overrides-resource/AppSync/package.json

@@ -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",

packages/amplify-category-api/src/__tests__/provider-utils/awscloudformation/__snapshots__/ecs-apigw-stack.test.ts.snap

@@ -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;
   }
 }