fixup

Author: mrgrain

.projenrc.ts

@@ -1386,10 +1386,6 @@ for (const tsconfig of [cli.tsconfig, cli.tsconfigDev]) {
   tsconfig?.addExclude('vendor/**/*');
 }
 
-// #endregion
-//////////////////////////////////////////////////////////////////////
-// #region @aws-cdk/cdk-cli-wrapper - REMOVED
-// The cdk-cli-wrapper package has been removed. The toolkit-lib engine is now the only supported engine.
 // #endregion
 //////////////////////////////////////////////////////////////////////
 // #region cdk

packages/@aws-cdk/integ-runner/lib/cli.ts

@@ -4,10 +4,9 @@ import * as path from 'path';
 import * as chalk from 'chalk';
 import * as workerpool from 'workerpool';
 import * as logger from './logger';
-import type { EngineOptions } from './runner/engine';
 import type { IntegTest, IntegTestInfo } from './runner/integration-tests';
 import { IntegrationTests } from './runner/integration-tests';
-import { processUnstableFeatures } from './unstable-features';
+import { processUnstableFeatures, availableFeaturesDescription } from './unstable-features';
 import type { IntegRunnerMetrics, IntegTestWorkerConfig, DestructiveChange } from './workers';
 import { runSnapshotTests, runIntegrationTests } from './workers';
 import { watchIntegrationTest } from './workers/integ-watch-worker';
@@ -53,7 +52,7 @@ export function parseCliArgs(args: string[] = []) {
     })
     .option('app', { type: 'string', default: undefined, desc: 'The custom CLI command that will be used to run the test files. You can include {filePath} to specify where in the command the test file path should be inserted. Example: --app="python3.8 {filePath}".' })
     .option('test-regex', { type: 'array', desc: 'Detect integration test files matching this JavaScript regex pattern. If used multiple times, all files matching any one of the patterns are detected.', default: [] })
-    .option('unstable', { type: 'array', desc: 'Opt-in to using unstable features. Currently no unstable features are available.', nargs: 1, default: [] })
+    .option('unstable', { type: 'array', desc: `Opt-in to using unstable features. By using these flags you acknowledge that scope and API of unstable features may change without notice. Specify multiple times for each unstable feature you want to opt-in to. ${availableFeaturesDescription()}`, nargs: 1, default: [] })
     .strict()
     .parse(args);
 
@@ -121,17 +120,16 @@ export async function main(args: string[]) {
     const options = parseCliArgs(args);
 
     // Process unstable features and emit appropriate warnings
-    processUnstableFeatures(options.unstable);
+    options.unstable = processUnstableFeatures(options.unstable);
 
-    const engine = engineFromOptions();
-    await run(options, engine);
+    await run(options);
   } catch (err: any) {
     logger.error(err);
     throw err;
   }
 }
 
-async function run(options: ReturnType<typeof parseCliArgs>, { engine }: EngineOptions) {
+async function run(options: ReturnType<typeof parseCliArgs>) {
   const testsFromArgs = await new IntegrationTests(path.resolve(options.directory)).fromCliOptions(options);
 
   // List only prints the discovered tests
@@ -162,7 +160,6 @@ async function run(options: ReturnType<typeof parseCliArgs>, { engine }: EngineO
       failedSnapshots = await runSnapshotTests(pool, testsFromArgs, {
         retain: options.inspectFailures,
         verbose: options.verbose,
-        engine,
       });
       for (const failure of failedSnapshots) {
         logger.warning(`Failed: ${failure.fileName}`);
@@ -186,7 +183,6 @@ async function run(options: ReturnType<typeof parseCliArgs>, { engine }: EngineO
     if (options.runUpdateOnFailed || options.force) {
       const { success, metrics } = await runIntegrationTests({
         pool,
-        engine,
         tests: testsToRun,
         regions: options.testRegions,
         profiles: options.profiles,
@@ -212,7 +208,6 @@ async function run(options: ReturnType<typeof parseCliArgs>, { engine }: EngineO
     } else if (options.watch) {
       await watchIntegrationTest(pool, {
         watch: true,
-        engine,
         verbosity: options.verbosity,
         ...testsToRun[0],
         profile: options.profiles ? options.profiles[0] : undefined,
@@ -334,10 +329,6 @@ function configFromFile(fileName?: string): Record<string, any> {
   }
 }
 
-function engineFromOptions(): Required<EngineOptions> {
-  return { engine: 'toolkit-lib' };
-}
-
 /**
  * Coerce function for yargs array options to support comma-separated values.
  * Yargs doesn't natively split `--option=a,b,c` into ['a', 'b', 'c'].

packages/@aws-cdk/integ-runner/lib/runner/engine.ts

@@ -1,20 +1,6 @@
 import type { IntegRunnerOptions } from './runner-base';
 import { ToolkitLibRunnerEngine } from '../engines/toolkit-lib';
 
-/**
- * Engine options for the integ runner
- *
- * Note: The 'cli-wrapper' engine has been removed. Only 'toolkit-lib' is supported.
- */
-export interface EngineOptions {
-  /**
-   * The CDK Toolkit engine to be used by the runner.
-   *
-   * @default "toolkit-lib"
-   */
-  readonly engine?: 'toolkit-lib';
-}
-
 /**
  * Creates the engine for running integration tests.
  *

packages/@aws-cdk/integ-runner/lib/runner/runner-base.ts

@@ -8,7 +8,7 @@ import { IntegTestSuite, LegacyIntegTestSuite } from './integ-test-suite';
 import type { IntegTest } from './integration-tests';
 import * as recommendedFlagsFile from '../recommended-feature-flags.json';
 import { flatten } from '../utils';
-import { makeEngine, type EngineOptions } from './engine';
+import { makeEngine } from './engine';
 import type { ICdk } from '../engines/cdk-interface';
 import * as logger from '../logger';
 import type { ManifestTrace } from './private/cloud-assembly';
@@ -21,7 +21,7 @@ const DESTRUCTIVE_CHANGES = '!!DESTRUCTIVE_CHANGES:';
 /**
  * Options for creating an integration test runner
  */
-export interface IntegRunnerOptions extends EngineOptions {
+export interface IntegRunnerOptions {
   /**
    * Information about the test to run
    */

packages/@aws-cdk/integ-runner/lib/unstable-features.ts

@@ -16,80 +16,60 @@ export enum FeatureStatus {
  * Definition of an unstable feature
  */
 export interface UnstableFeature {
-  /** The feature name as passed to --unstable */
-  readonly name: string;
   /** Current status of the feature */
   readonly status: FeatureStatus;
-  /** Warning message to display when feature is used */
-  readonly warningMessage: string;
-  /** Optional: message to display for removed features */
-  readonly removalMessage?: string;
-}
-
-/**
- * Result of processing unstable features
- */
-export interface ProcessedFeatures {
-  /** Features that are valid and should be applied */
-  readonly validFeatures: string[];
-  /** Features that were ignored (removed or unknown) */
-  readonly ignoredFeatures: string[];
+  /** Warning message to display when requested feature is deprecated */
+  readonly deprecationMessage: string;
+  /** Message to display for requested features that are removed */
+  readonly removalMessage: string;
 }
 
 /**
  * Registry of all unstable features
  */
-export const UNSTABLE_FEATURES: readonly UnstableFeature[] = [
-  {
-    name: 'deprecated-cli-engine',
+export const UNSTABLE_FEATURES: Record<string, UnstableFeature> = {
+  'deprecated-cli-engine': {
     status: FeatureStatus.REMOVED,
-    warningMessage: 'The deprecated-cli-engine option has been removed.',
-    removalMessage: 'The cli-wrapper engine has been removed. The toolkit-lib engine is now the only supported engine.',
+    deprecationMessage: 'You have opted-in to use the deprecated CLI engine which is scheduled to be removed in January 2026. If you have encountered blockers while using the new default engine, please let us know by opening an issue: https://github.com/aws/aws-cdk-cli/issues/new/choose\n\nTo use the new default engine, remove the `--unstable=deprecated-cli-engine` option.',
+    removalMessage: 'The CLI engine has been removed. The toolkit-lib engine is now the only supported engine. Please remove this flag.',
   },
-  {
-    name: 'toolkit-lib-engine',
+  'toolkit-lib-engine': {
     status: FeatureStatus.REMOVED,
-    warningMessage: 'The toolkit-lib-engine option is no longer needed.',
+    deprecationMessage: 'The toolkit-lib engine is now the default engine. This flag can be safely removed. You may choose to temporarily revert to the old engine by adding the `--unstable=deprecated-cli-engine` option.',
     removalMessage: 'The toolkit-lib engine is now the default and only engine. This flag can be safely removed.',
   },
-];
+};
 
 /**
  * Process unstable feature flags and emit appropriate warnings
  *
- * @param features - Array of feature names from CLI --unstable option
- * @returns ProcessedFeatures with validFeatures and ignoredFeatures
+ * @param unstableFeatures - Array of feature names from CLI --unstable option
+ * @returns Array of valid, enabled feature names
  */
-export function processUnstableFeatures(features: string[] | undefined | null): ProcessedFeatures {
+export function processUnstableFeatures(unstableFeatures: string[] = []): string[] {
   const validFeatures: string[] = [];
-  const ignoredFeatures: string[] = [];
 
-  // Handle null/undefined input as empty array
-  const featureList = features ?? [];
-
-  for (const featureName of featureList) {
-    const feature = UNSTABLE_FEATURES.find(f => f.name === featureName);
+  for (const featureName of unstableFeatures) {
+    const feature = UNSTABLE_FEATURES[featureName];
 
     if (!feature) {
       // Unknown feature - warn and ignore
       logger.warning(`Unknown unstable feature: '${featureName}'. This option will be ignored.`);
-      ignoredFeatures.push(featureName);
       continue;
     }
 
     switch (feature.status) {
       case FeatureStatus.REMOVED:
         // Removed feature - warn with removal message and ignore
-        logger.warning(`[Removed] ${feature.warningMessage}`);
+        logger.warning(`[Removed] ${feature.deprecationMessage}`);
         if (feature.removalMessage) {
           logger.warning(feature.removalMessage);
         }
-        ignoredFeatures.push(featureName);
         break;
 
       case FeatureStatus.DEPRECATED:
         // Deprecated feature - warn but still apply
-        logger.warning(`[Deprecated] ${feature.warningMessage}`);
+        logger.warning(`[Deprecated] ${feature.deprecationMessage}`);
         validFeatures.push(featureName);
         break;
 
@@ -100,5 +80,22 @@ export function processUnstableFeatures(features: string[] | undefined | null):
     }
   }
 
-  return { validFeatures, ignoredFeatures };
+  return validFeatures;
+}
+
+/**
+ * Returns a description of available unstable features for CLI help text
+ *
+ * @returns A string describing available features or indicating none are available
+ */
+export function availableFeaturesDescription(): string {
+  const availableFeatures = Object.entries(UNSTABLE_FEATURES)
+    .filter(([_, feature]) => feature.status === FeatureStatus.SUPPORTED)
+    .map(([name]) => name);
+
+  if (availableFeatures.length === 0) {
+    return 'Currently no unstable features are available.';
+  }
+
+  return `Available features: ${availableFeatures.join(', ')}.`;
 }

packages/@aws-cdk/integ-runner/lib/workers/common.ts

@@ -2,7 +2,6 @@ import { format } from 'util';
 import type { ResourceImpact } from '@aws-cdk/cloudformation-diff';
 import * as chalk from 'chalk';
 import * as logger from '../logger';
-import type { EngineOptions } from '../runner/engine';
 import type { IntegTestInfo } from '../runner/integration-tests';
 
 /**
@@ -89,7 +88,7 @@ export interface IntegRunnerMetrics {
   readonly profile?: string;
 }
 
-export interface SnapshotVerificationOptions extends EngineOptions {
+export interface SnapshotVerificationOptions {
   /**
    * Retain failed snapshot comparisons
    *
@@ -124,7 +123,7 @@ export interface IntegBatchResponse {
 /**
  * Common options for running integration tests
  */
-export interface IntegTestOptions extends EngineOptions {
+export interface IntegTestOptions {
   /**
    * A list of integration tests to run
    * in this batch

packages/@aws-cdk/integ-runner/lib/workers/extract/extract_worker.ts

@@ -28,7 +28,6 @@ export async function integTestWorker(request: IntegTestBatchRequest): Promise<I
 
     try {
       const runner = new IntegTestRunner({
-        engine: request.engine,
         test,
         profile: request.profile,
         region: request.region,
@@ -96,7 +95,6 @@ export async function watchTestWorker(options: IntegWatchOptions): Promise<void>
   const verbosity = options.verbosity ?? 0;
   const test = new IntegTest(options);
   const runner = new IntegTestRunner({
-    engine: options.engine,
     test,
     profile: options.profile,
     region: options.region,
@@ -141,7 +139,6 @@ export async function snapshotTestWorker(testInfo: IntegTestInfo, options: Snaps
 
   try {
     const runner = new IntegSnapshotRunner({
-      engine: options.engine,
       test,
       showOutput: options.verbose ?? false,
     });

packages/@aws-cdk/integ-runner/lib/workers/integ-test-worker.ts

@@ -136,7 +136,6 @@ export async function runIntegrationTestsInParallel(
         dryRun: options.dryRun,
         verbosity: options.verbosity,
         updateWorkflow: options.updateWorkflow,
-        engine: options.engine,
       }], {
         on: printResults,
       });

packages/@aws-cdk/integ-runner/lib/workers/integ-watch-worker.ts

@@ -1,9 +1,8 @@
 import type * as workerpool from 'workerpool';
 import { printResults } from './common';
 import type { IntegTestInfo } from '../runner';
-import type { EngineOptions } from '../runner/engine';
 
-export interface IntegWatchOptions extends IntegTestInfo, EngineOptions {
+export interface IntegWatchOptions extends IntegTestInfo {
   readonly region: string;
   readonly profile?: string;
   readonly verbosity?: number;