diff --git a/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts b/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts index f4f229dd3..5e498e671 100644 --- a/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts +++ b/packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts @@ -420,7 +420,7 @@ export class TestFixture extends ShellHelper { // use events because bar renders bad in tests '--progress', 'events', ...(skipStackRename ? stackNames : this.fullStackName(stackNames)), - ...(options.telemetryFile ? ['--unstable=telemetry', `--telemetry-file=${options.telemetryFile}`] : []), + ...(options.telemetryFile ? [`--telemetry-file=${options.telemetryFile}`] : []), ]; } diff --git a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-telemetry/cdk-cli-telemetry-send-to-file-unstable.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-telemetry/cdk-cli-telemetry-send-to-file-unstable.integtest.ts deleted file mode 100644 index 736d96c35..000000000 --- a/packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli-telemetry/cdk-cli-telemetry-send-to-file-unstable.integtest.ts +++ /dev/null @@ -1,19 +0,0 @@ -import * as path from 'path'; -import * as fs from 'fs-extra'; -import { integTest, withDefaultFixture } from '../../../lib'; - -jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime - -integTest( - 'sending cli telemetry to file fails if not invoked with --unstable', - withDefaultFixture(async (fixture) => { - const telemetryFile = path.join(fixture.integTestDir, `telemetry-${Date.now()}.json`); - try { - await fixture.cdk(['list', `--telemetry-file=${telemetryFile}`]); - throw new Error('Expected command to fail'); - } catch (error) { - expect(fs.existsSync(telemetryFile)).toBeFalsy(); - expect(fixture.output.toString()).toContain('Unstable feature use'); - } - }), -); diff --git a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts index a81563db7..d06cd93eb 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts @@ -9,7 +9,7 @@ integTest( 'cdk synth with telemetry and validation error leads to invoke failure', withDefaultFixture(async (fixture) => { const telemetryFile = path.join(fixture.integTestDir, `telemetry-${Date.now()}.json`); - const output = await fixture.cdk(['synth', '--unstable=telemetry', `--telemetry-file=${telemetryFile}`], { + const output = await fixture.cdk(['synth', `--telemetry-file=${telemetryFile}`], { allowErrExit: true, modEnv: { INTEG_STACK_SET: 'stage-with-errors', diff --git a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts index 0e80a3a55..3f3ba6729 100644 --- a/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts +++ b/packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry.integtest.ts @@ -11,7 +11,7 @@ integTest( const telemetryFile = path.join(fixture.integTestDir, `telemetry-${Date.now()}.json`); const synthOutput = await fixture.cdk( - ['synth', fixture.fullStackName('test-1'), '--unstable=telemetry', `--telemetry-file=${telemetryFile}`], + ['synth', fixture.fullStackName('test-1'), `--telemetry-file=${telemetryFile}`], { modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT }, verboseLevel: 3 }, // trace mode ); diff --git a/packages/aws-cdk/lib/cli/cli.ts b/packages/aws-cdk/lib/cli/cli.ts index 4e2f68df1..cba6bc509 100644 --- a/packages/aws-cdk/lib/cli/cli.ts +++ b/packages/aws-cdk/lib/cli/cli.ts @@ -100,10 +100,6 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise