Merge branch 'main' into issues/26728

aws · Nov 13, 2024 · 3c3dbbe · 3c3dbbe
2 parents cbcdb18 + 53f4713
commit 3c3dbbe
Show file tree

Hide file tree

Showing 575 changed files with 197,880 additions and 98,932 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   collect:
     name: collect
+    if: github.repository == 'aws/aws-cdk'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/...s/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.166.0/NOTES.md b/...s/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.166.0/NOTES.md
@@ -0,0 +1 @@
+The output of this test is changed by the sdk upgrade. The type and content of the error have changed from sdkv2 to sdkv3. We now receive more specific information about the error type.
diff --git a/packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.166.0/skip-tests.txt b/packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.166.0/skip-tests.txt
@@ -0,0 +1,2 @@
+# Skipping test due to the incompatibility in error output between sdkv2 and sdkv3
+hotswap deployment for ecs service detects failed deployment and errors
diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts
@@ -2160,11 +2160,12 @@ integTest(
     const functionName = response.Stacks?.[0].Outputs?.[0].OutputValue;
 
     // THEN
-
     // The deployment should not trigger a full deployment, thus the stack's status must remains
     // "CREATE_COMPLETE"
     expect(response.Stacks?.[0].StackStatus).toEqual('CREATE_COMPLETE');
-    expect(deployOutput).toContain(`Lambda Function '${functionName}' hotswapped!`);
+    // The entire string fails locally due to formatting. Making this test less specific
+    expect(deployOutput).toMatch(/hotswapped!/);
+    expect(deployOutput).toContain(functionName);
   }),
 );
 
@@ -2205,7 +2206,9 @@ integTest(
       // The deployment should not trigger a full deployment, thus the stack's status must remains
       // "CREATE_COMPLETE"
       expect(response.Stacks?.[0].StackStatus).toEqual('CREATE_COMPLETE');
-      expect(deployOutput).toContain(`Lambda Function '${functionName}' hotswapped!`);
+      // The entire string fails locally due to formatting. Making this test less specific
+      expect(deployOutput).toMatch(/hotswapped!/);
+      expect(deployOutput).toContain(functionName);
     } finally {
       // Ensure cleanup in reverse order due to use of import/export
       await fixture.cdkDestroy('lambda-hotswap');
@@ -2244,7 +2247,9 @@ integTest(
     // The deployment should not trigger a full deployment, thus the stack's status must remains
     // "CREATE_COMPLETE"
     expect(response.Stacks?.[0].StackStatus).toEqual('CREATE_COMPLETE');
-    expect(deployOutput).toContain(`ECS Service '${serviceName}' hotswapped!`);
+    // The entire string fails locally due to formatting. Making this test less specific
+    expect(deployOutput).toMatch(/hotswapped!/);
+    expect(deployOutput).toContain(serviceName);
   }),
 );
 
@@ -2257,7 +2262,7 @@ integTest(
     });
 
     // WHEN
-    await fixture.cdkDeploy('ecs-hotswap', {
+    const deployOutput = await fixture.cdkDeploy('ecs-hotswap', {
       options: ['--hotswap'],
       modEnv: {
         DYNAMIC_ECS_PROPERTY_VALUE: 'new value',
@@ -2283,14 +2288,15 @@ integTest(
       }),
     );
     expect(describeServicesResponse.services?.[0].deployments).toHaveLength(1); // only one deployment present
+    expect(deployOutput).toMatch(/hotswapped!/);
   }),
 );
 
 integTest(
   'hotswap deployment for ecs service detects failed deployment and errors',
   withExtendedTimeoutFixture(async (fixture) => {
     // GIVEN
-    await fixture.cdkDeploy('ecs-hotswap');
+    await fixture.cdkDeploy('ecs-hotswap', { verbose: true });
 
     // WHEN
     const deployOutput = await fixture.cdkDeploy('ecs-hotswap', {
@@ -2299,10 +2305,11 @@ integTest(
         USE_INVALID_ECS_HOTSWAP_IMAGE: 'true',
       },
       allowErrExit: true,
+      verbose: true,
     });
 
-    const expectedSubstring = 'Resource is not in the state deploymentCompleted';
-
+    // THEN
+    const expectedSubstring = 'Resource is not in the expected state due to waiter status: TIMEOUT';
     expect(deployOutput).toContain(expectedSubstring);
     expect(deployOutput).not.toContain('hotswapped!');
   }),

diff --git a/...t/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.assets.json b/...t/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.assets.json
diff --git a/...integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.template.json b/...integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.template.json
diff --git a/...teg/test/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.assets.json b/...teg/test/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.assets.json
diff --git a/...g/test/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.template.json b/...g/test/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.template.json
@@ -38,7 +38,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "79d996cbc4399f346983e7812dac92ec3a24a0f1ffb793b5b0acea8c43d33332.zip"
+     "S3Key": "090e0296140a1dcbecf4e3e94b65780102aefb7e81e4247b1f00a7cc9e8e98c5.zip"
     },
     "Handler": "index.handler",
     "Role": {

diff --git a/...d31b3d1f062577b260945d9363c34c5c0ffa4a61d → ...d31b3d1f062577b260945d9363c34c5c0ffa4a61d b/...d31b3d1f062577b260945d9363c34c5c0ffa4a61d → ...d31b3d1f062577b260945d9363c34c5c0ffa4a61d
diff --git a/...d9764af82ff04a779baa849feb75a0fb2b6cd81ea → ...d9764af82ff04a779baa849feb75a0fb2b6cd81ea b/...d9764af82ff04a779baa849feb75a0fb2b6cd81ea → ...d9764af82ff04a779baa849feb75a0fb2b6cd81ea
diff --git a/...4bb32df05b3692d5ac5ce8412fa40e9864096a6a4 → ...2ee822d4ab8ee47801c8dbdfd54e542b239319a0a b/...4bb32df05b3692d5ac5ce8412fa40e9864096a6a4 → ...2ee822d4ab8ee47801c8dbdfd54e542b239319a0a
diff --git a/...7eef67861f90cb64e27a91a2bf650fa72c42b70ef → ...7eef67861f90cb64e27a91a2bf650fa72c42b70ef b/...7eef67861f90cb64e27a91a2bf650fa72c42b70ef → ...7eef67861f90cb64e27a91a2bf650fa72c42b70ef
diff --git a/...0d2173eca00195f05bcb87c78a8b267f0e68e7c14 → ...0d2173eca00195f05bcb87c78a8b267f0e68e7c14 b/...0d2173eca00195f05bcb87c78a8b267f0e68e7c14 → ...0d2173eca00195f05bcb87c78a8b267f0e68e7c14
diff --git a/...2d127117c5b0459a82c1b8bd60e49e37e4a349975 → ...2d127117c5b0459a82c1b8bd60e49e37e4a349975 b/...2d127117c5b0459a82c1b8bd60e49e37e4a349975 → ...2d127117c5b0459a82c1b8bd60e49e37e4a349975
diff --git a/...3e11bb28728a67892b44e9b65491a93276a500721 → ...3e11bb28728a67892b44e9b65491a93276a500721 b/...3e11bb28728a67892b44e9b65491a93276a500721 → ...3e11bb28728a67892b44e9b65491a93276a500721
diff --git a/...2ae88cc52f987dafdebc2fd5b18204f7e1029e4ea → ...9420f2a546502db97382cffdf203c62ae880e8856 b/...2ae88cc52f987dafdebc2fd5b18204f7e1029e4ea → ...9420f2a546502db97382cffdf203c62ae880e8856
diff --git a/...b28c42553f46298651233a4bc5bf13c33e19c0f3d7fa340cc0c84d43d6f9fb30c479f73e75cbd0a0f586359de b/...b28c42553f46298651233a4bc5bf13c33e19c0f3d7fa340cc0c84d43d6f9fb30c479f73e75cbd0a0f586359de
diff --git a/...7c98f9a0f85ca9d5f595db2012f7cc3571945c123 → ...7c98f9a0f85ca9d5f595db2012f7cc3571945c123 b/...7c98f9a0f85ca9d5f595db2012f7cc3571945c123 → ...7c98f9a0f85ca9d5f595db2012f7cc3571945c123
diff --git a/...3e17f24e4b4d2503d43930e3b98a24465036e9c8b514e45b082d6944a8d515454481bd65788562-index.json b/...3e17f24e4b4d2503d43930e3b98a24465036e9c8b514e45b082d6944a8d515454481bd65788562-index.json
diff --git a/...25b11dfa006488d7df4cc4d25ba47b60d6b511a83 → ...25b11dfa006488d7df4cc4d25ba47b60d6b511a83 b/...25b11dfa006488d7df4cc4d25ba47b60d6b511a83 → ...25b11dfa006488d7df4cc4d25ba47b60d6b511a83
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		The output of this test is changed by the sdk upgrade. The type and content of the error have changed from sdkv2 to sdkv3. We now receive more specific information about the error type.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Skipping test due to the incompatibility in error output between sdkv2 and sdkv3
		hotswap deployment for ecs service detects failed deployment and errors