Merge branch 'master' into integ-tests/fix-disable-update-workflow

.devcontainer.json

@@ -4,5 +4,6 @@
     "postCreateCommand": "yarn build --skip-test --no-bail --skip-prereqs --skip-compat",
     "extensions": [
         "[email protected]"
-    ]
+    ],
+    "remoteUser": "superchain"
 }

.github/dependabot.yml

@@ -18,3 +18,26 @@ updates:
     labels:
       - "auto-approve"
     open-pull-requests-limit: 5
+
+  # Non-TypeScript init template dependency updates
+  - package-ecosystem: "pip"
+    directory: "/packages/aws-cdk/lib/init-templates"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "auto-approve"
+    open-pull-requests-limit: 5
+  - package-ecosystem: "maven"
+    directory: "/packages/aws-cdk/lib/init-templates"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "auto-approve"
+    open-pull-requests-limit: 5
+  - package-ecosystem: "nuget"
+    directory: "/packages/aws-cdk/lib/init-templates"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "auto-approve"
+    open-pull-requests-limit: 5

.github/workflows/yarn-upgrade.yml

@@ -65,6 +65,10 @@ jobs:
           lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
           lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
           lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}'  --target=minor
+          # Upgrade package.jsons in init templates
+          for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
+            (cd $(dirname $pj) && ncu --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}')
+          done
 
       # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
       - name: Run "yarn install"

packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "app-delivery/test/integ.cicd": {
+      "stacks": [
+        "CICD"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/assertions/lib/match.ts

@@ -300,7 +300,7 @@ class ObjectMatch extends Matcher {
         result.recordFailure({
           matcher: this,
           path: [`/${patternKey}`],
-          message: 'Missing key',
+          message: `Missing key '${patternKey}' among {${Object.keys(actual).join(',')}}`,
         });
         continue;
       }

packages/@aws-cdk/assertions/test/match.test.ts

@@ -39,7 +39,7 @@ describe('Matchers', () => {
         'Expected fred but received flob at [1]/waldo',
         'Expected flob but received fred at [1]/wobble',
       ]);
-      expectFailure(matcher, [{ foo: 'bar', baz: 'qux' }, { waldo: 'fred' }], [/Missing key at \[1\]\/wobble/]);
+      expectFailure(matcher, [{ foo: 'bar', baz: 'qux' }, { waldo: 'fred' }], [/Missing key.*at \[1\]\/wobble/]);
     });
 
     test('objects', () => {
@@ -49,7 +49,7 @@ describe('Matchers', () => {
       expectFailure(matcher, ['3', 5], [/Expected type object but received array/]);
       expectFailure(matcher, { baz: 'qux' }, [
         'Unexpected key at /baz',
-        'Missing key at /foo',
+        /Missing key.*at \/foo/,
       ]);
 
       matcher = Match.exact({ foo: 'bar', baz: 5 });
@@ -59,8 +59,8 @@ describe('Matchers', () => {
       matcher = Match.exact({ foo: [2, 3], bar: 'baz' });
       expectPass(matcher, { foo: [2, 3], bar: 'baz' });
       expectFailure(matcher, {}, [
-        'Missing key at /foo',
-        'Missing key at /bar',
+        /Missing key.*at \/foo/,
+        /Missing key.*at \/bar/,
       ]);
       expectFailure(matcher, { bar: [2, 3], foo: 'baz' }, [
         'Expected type array but received string at /foo',
@@ -155,7 +155,7 @@ describe('Matchers', () => {
       expectPass(matcher, { foo: 'bar' });
       expectFailure(matcher, { foo: 'baz' }, [/Expected bar but received baz at \/foo/]);
       expectFailure(matcher, { foo: ['bar'] }, [/Expected type string but received array at \/foo/]);
-      expectFailure(matcher, { bar: 'foo' }, [/Missing key at \/foo/]);
+      expectFailure(matcher, { bar: 'foo' }, [/Missing key.*at \/foo/]);
       expectPass(matcher, { foo: 'bar', baz: 'qux' });
     });
 
@@ -338,7 +338,7 @@ describe('Matchers', () => {
       expectPass(matcher, { foo: [1, 2] });
 
       expectFailure(matcher, { foo: null }, ['Expected a value but found none at /foo']);
-      expectFailure(matcher, {}, ['Missing key at /foo']);
+      expectFailure(matcher, {}, [/Missing key.*at \/foo/]);
     });
   });
 
@@ -358,7 +358,7 @@ describe('Matchers', () => {
       expectFailure(matcher, '{ "Foo": 4 }', ['Expected type string but received number at (serializedJson)/Foo']);
       expectFailure(matcher, '{ "Bar": "Baz" }', [
         'Unexpected key at (serializedJson)/Bar',
-        'Missing key at (serializedJson)/Foo',
+        /Missing key.*at \(serializedJson\)\/Foo/,
       ]);
     });
 
@@ -372,7 +372,7 @@ describe('Matchers', () => {
       expectPass(matcher, '{ "Foo": ["Bar", "Baz"], "Fred": "Waldo" }');
 
       expectFailure(matcher, '{ "Foo": ["Baz"] }', ['Missing element [Bar] at pattern index 0 at (serializedJson)/Foo']);
-      expectFailure(matcher, '{ "Bar": ["Baz"] }', ['Missing key at (serializedJson)/Foo']);
+      expectFailure(matcher, '{ "Bar": ["Baz"] }', [/Missing key.*at \(serializedJson\)\/Foo/]);
     });
 
     test('invalid json string', () => {

packages/@aws-cdk/assertions/test/template.test.ts

@@ -181,7 +181,7 @@ describe('Template', () => {
 
       expect(() => inspect.hasResource('Foo::Bar', {
         Properties: { baz: 'qux', fred: 'waldo' },
-      })).toThrow(/Missing key at \/Properties\/fred/);
+      })).toThrow(/Missing key.*at \/Properties\/fred/);
     });
 
     test('arrayWith', () => {
@@ -337,7 +337,7 @@ describe('Template', () => {
         .toThrow(/Expected waldo but received qux at \/Properties\/baz/);
 
       expect(() => inspect.hasResourceProperties('Foo::Bar', { baz: 'qux', fred: 'waldo' }))
-        .toThrow(/Missing key at \/Properties\/fred/);
+        .toThrow(/Missing key.*at \/Properties\/fred/);
     });
 
     test('absent - with properties', () => {
@@ -367,7 +367,7 @@ describe('Template', () => {
       const inspect = Template.fromStack(stack);
 
       expect(() => inspect.hasResourceProperties('Foo::Bar', { bar: Match.absent(), baz: 'qux' }))
-        .toThrow(/Missing key at \/Properties\/baz/);
+        .toThrow(/Missing key.*at \/Properties\/baz/);
 
       inspect.hasResourceProperties('Foo::Bar', Match.absent());
     });

packages/@aws-cdk/aws-amplify/test/app-asset-deployment.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-amplify/test/integ.app-asset-deployment": {
+      "stacks": [
+        "cdk-amplify-app-asset-deployment"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-amplify/test/app-codecommit.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-amplify/test/integ.app-codecommit": {
+      "stacks": [
+        "cdk-amplify-codecommit-app"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-amplify/test/app.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-amplify/test/integ.app": {
+      "stacks": [
+        "cdk-amplify-app"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/api-definition.asset.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/integ.api-definition.asset": {
+      "stacks": [
+        "integtest-restapi-fromdefinition-asset"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/api-definition.inline.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/integ.api-definition.inline": {
+      "stacks": [
+        "integtest-restapi-fromdefinition-inline"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/authorizers/cognito-authorizer.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/authorizers/integ.cognito-authorizer": {
+      "stacks": [
+        "CognitoUserPoolsAuthorizerInteg"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/authorizers/request-authorizer.lit.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/authorizers/integ.request-authorizer.lit": {
+      "stacks": [
+        "RequestAuthorizerInteg"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/authorizers/token-authorizer-iam-role.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/authorizers/integ.token-authorizer-iam-role": {
+      "stacks": [
+        "TokenAuthorizerIAMRoleInteg"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/authorizers/token-authorizer.lit.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/authorizers/integ.token-authorizer.lit": {
+      "stacks": [
+        "TokenAuthorizerInteg"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/cors.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/integ.cors": {
+      "stacks": [
+        "cors-twitch-test"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/lambda-api.latebound-deploymentstage.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/integ.lambda-api.latebound-deploymentstage": {
+      "stacks": [
+        "LateBoundDeploymentStageStack"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/restapi-import.lit.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/integ.restapi-import.lit": {
+      "stacks": [
+        "integ-restapi-import-RootStack"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/restapi.books.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/integ.restapi.books": {
+      "stacks": [
+        "restapi-books-example"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}

packages/@aws-cdk/aws-apigateway/test/restapi.defaults.integ.snapshot/integ.json

@@ -0,0 +1,14 @@
+{
+  "version": "18.0.0",
+  "testCases": {
+    "aws-apigateway/test/integ.restapi.defaults": {
+      "stacks": [
+        "test-apigateway-restapi-defaults"
+      ],
+      "diffAssets": false,
+      "stackUpdateWorkflow": true
+    }
+  },
+  "synthContext": {},
+  "enableLookups": false
+}