chore(release): 2.161.1 (aws#31659)

See CHANGELOG

CHANGELOG.v2.alpha.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.161.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.161.0-alpha.0...v2.161.1-alpha.0) (2024-10-05)
+
 ## [2.161.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.160.0-alpha.0...v2.161.0-alpha.0) (2024-10-03)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.161.1](https://github.com/aws/aws-cdk/compare/v2.161.0...v2.161.1) (2024-10-05)
+
+
+### Reverts
+
+* feat(cli): cdk rollback ([#31407](https://github.com/aws/aws-cdk/issues/31407)) ([#31657](https://github.com/aws/aws-cdk/issues/31657)) ([29bf223](https://github.com/aws/aws-cdk/commit/29bf2233a33d3ded20639279fa712a5b036fe041))
+
 ## [2.161.0](https://github.com/aws/aws-cdk/compare/v2.160.0...v2.161.0) (2024-10-03)
 
 

packages/@aws-cdk-testing/cli-integ/README.md

@@ -37,7 +37,7 @@ Test suites are written as a collection of Jest tests, and they are run using Je
 
 ### Setup
 
-Building the @aws-cdk-testing package is not very different from building the rest of the CDK. However, If you are having issues with the tests, you can ensure your environment is built properly by following the steps below:
+Building the @aws-cdk-testing package is not very different from building the rest of the CDK. However, If you are having issues with the tests, you can ensure your enviornment is built properly by following the steps below:
 
 ```shell
 yarn install # Install dependencies

packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts

@@ -24,8 +24,7 @@ export const EXTENDED_TEST_TIMEOUT_S = 30 * 60;
  * For backwards compatibility with existing tests (so we don't have to change
  * too much) the inner block is expected to take a `TestFixture` object.
  */
-export function withSpecificCdkApp(
-  appName: string,
+export function withCdkApp(
   block: (context: TestFixture) => Promise<void>,
 ): (context: TestContext & AwsContext & DisableBootstrapContext) => Promise<void> {
   return async (context: TestContext & AwsContext & DisableBootstrapContext) => {
@@ -37,7 +36,7 @@ export function withSpecificCdkApp(
     context.output.write(` Test directory: ${integTestDir}\n`);
     context.output.write(` Region:         ${context.aws.region}\n`);
 
-    await cloneDirectory(path.join(RESOURCES_DIR, 'cdk-apps', appName), integTestDir, context.output);
+    await cloneDirectory(path.join(RESOURCES_DIR, 'cdk-apps', 'app'), integTestDir, context.output);
     const fixture = new TestFixture(
       integTestDir,
       stackNamePrefix,
@@ -88,16 +87,6 @@ export function withSpecificCdkApp(
   };
 }
 
-/**
- * Like `withSpecificCdkApp`, but uses the default integration testing app with a million stacks in it
- */
-export function withCdkApp(
-  block: (context: TestFixture) => Promise<void>,
-): (context: TestContext & AwsContext & DisableBootstrapContext) => Promise<void> {
-  // 'app' is the name of the default integration app in the `cdk-apps` directory
-  return withSpecificCdkApp('app', block);
-}
-
 export function withCdkMigrateApp<A extends TestContext>(language: string, block: (context: TestFixture) => Promise<void>) {
   return async (context: A) => {
     const stackName = `cdk-migrate-${language}-integ-${context.randomString}`;
@@ -199,10 +188,6 @@ export function withDefaultFixture(block: (context: TestFixture) => Promise<void
   return withAws(withTimeout(DEFAULT_TEST_TIMEOUT_S, withCdkApp(block)));
 }
 
-export function withSpecificFixture(appName: string, block: (context: TestFixture) => Promise<void>) {
-  return withAws(withTimeout(DEFAULT_TEST_TIMEOUT_S, withSpecificCdkApp(appName, block)));
-}
-
 export function withExtendedTimeoutFixture(block: (context: TestFixture) => Promise<void>) {
   return withAws(withTimeout(EXTENDED_TEST_TIMEOUT_S, withCdkApp(block)));
 }

packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.161.0/NOTES.md

@@ -0,0 +1 @@
+This patch brings the [fix](https://github.com/aws/aws-cdk/issues/31654) into the regression suite.

packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.161.0/skip-tests.txt

@@ -0,0 +1,5 @@
+# Skipping the test to fix issue https://github.com/aws/aws-cdk/issues/31654. 
+# cli-integ tests failing for the old tests with the new cli changes for nested stacks.
+
+test cdk rollback
+test cdk rollback --force

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -32,7 +32,6 @@ import {
   withCDKMigrateFixture,
   withExtendedTimeoutFixture,
   randomString,
-  withSpecificFixture,
   withoutBootstrap,
 } from '../../lib';
 
@@ -2285,85 +2284,7 @@ integTest(
   }),
 );
 
-integTest(
-  'test cdk rollback',
-  withSpecificFixture('rollback-test-app', async (fixture) => {
-    let phase = '1';
-
-    // Should succeed
-    await fixture.cdkDeploy('test-rollback', {
-      options: ['--no-rollback'],
-      modEnv: { PHASE: phase },
-      verbose: false,
-    });
-    try {
-      phase = '2a';
-
-      // Should fail
-      const deployOutput = await fixture.cdkDeploy('test-rollback', {
-        options: ['--no-rollback'],
-        modEnv: { PHASE: phase },
-        verbose: false,
-        allowErrExit: true,
-      });
-      expect(deployOutput).toContain('UPDATE_FAILED');
-
-      // Rollback
-      await fixture.cdk(['rollback'], {
-        modEnv: { PHASE: phase },
-        verbose: false,
-      });
-    } finally {
-      await fixture.cdkDestroy('test-rollback');
-    }
-  }),
-);
-
-integTest(
-  'test cdk rollback --force',
-  withSpecificFixture('rollback-test-app', async (fixture) => {
-    let phase = '1';
-
-    // Should succeed
-    await fixture.cdkDeploy('test-rollback', {
-      options: ['--no-rollback'],
-      modEnv: { PHASE: phase },
-      verbose: false,
-    });
-    try {
-      phase = '2b'; // Fail update and also fail rollback
-
-      // Should fail
-      const deployOutput = await fixture.cdkDeploy('test-rollback', {
-        options: ['--no-rollback'],
-        modEnv: { PHASE: phase },
-        verbose: false,
-        allowErrExit: true,
-      });
-
-      expect(deployOutput).toContain('UPDATE_FAILED');
-
-      // Should still fail
-      const rollbackOutput = await fixture.cdk(['rollback'], {
-        modEnv: { PHASE: phase },
-        verbose: false,
-        allowErrExit: true,
-      });
-
-      expect(rollbackOutput).toContain('Failing rollback');
-
-      // Rollback and force cleanup
-      await fixture.cdk(['rollback', '--force'], {
-        modEnv: { PHASE: phase },
-        verbose: false,
-      });
-    } finally {
-      await fixture.cdkDestroy('test-rollback');
-    }
-  }),
-);
-
-integTest('cdk bootstrap notice is displayed correctly', withDefaultFixture(async (fixture) => {
+integTest('cdk notices are displayed correctly', withDefaultFixture(async (fixture) => {
 
   const cache = {
     expiration: 4125963264000, // year 2100 so we never overwrite the cache