chore: refactor telemetry integ tests

Author: kaizencc

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

@@ -218,6 +218,7 @@ export interface CdkCliOptions extends ShellOptions {
   options?: string[];
   neverRequireApproval?: boolean;
   verbose?: boolean;
+  verboseLevel?: number;
   telemetryFile?: string;
 }
 
@@ -579,11 +580,17 @@ export class TestFixture extends ShellHelper {
   public async cdk(args: string[], options: CdkCliOptions = {}) {
     const verbose = options.verbose ?? true;
 
+    if (!verbose && options.verboseLevel) {
+      throw new Error(`Invalid verbose state: verbose is false and verboseLevel is ${options.verboseLevel}`);
+    }
+
+    const verboseLevel = options.verboseLevel ?? 1;
+
     await this.cli.makeCliAvailable();
 
     return this.shell([
       'cdk',
-      ...(verbose ? ['-vvv'] : []), // if we set verbose, we get all the logs
+      ...(verbose ? [`-${'v'.repeat(verboseLevel)}`] : []), // if we set verbose, we get all the logs
       ...args,
     ], {
       ...options,

packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-cli-telemetry-disable-sends-no-data.integtest.ts

@@ -1,11 +1,12 @@
 import { integTest, withDefaultFixture } from '../../lib';
+import { TELEMETRY_ENDPOINT } from './constants';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
 
 integTest(
   'CLI Telemetry --disable does not send to endpoint',
   withDefaultFixture(async (fixture) => {
-    const output = await fixture.cdk(['cli-telemetry', '--disable'], { verbose: true });
+    const output = await fixture.cdk(['cli-telemetry', '--disable'], { verboseLevel: 3, modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT }});
 
     // Check the trace that telemetry was not executed successfully
     expect(output).not.toContain('Telemetry Sent Successfully');

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

@@ -1,6 +1,7 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
 import { integTest, withDefaultFixture } from '../../lib';
+import { TELEMETRY_ENDPOINT } from './constants';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
 
@@ -12,7 +13,8 @@ integTest(
     // Deploy stack while collecting telemetry
     const deployOutput = await fixture.cdkDeploy('test-1', {
       telemetryFile,
-      verbose: true, // force trace mode
+      verboseLevel: 3, // trace mode
+      modEnv: { TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT },
     });
 
     // Check the trace that telemetry was executed successfully

packages/@aws-cdk-testing/cli-integ/tests/telemetry-integ-tests/cdk-synth-telemetry-with-errors.integtest.ts

@@ -1,6 +1,7 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
 import { integTest, withDefaultFixture } from '../../lib';
+import { TELEMETRY_ENDPOINT } from './constants';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
 
@@ -12,8 +13,9 @@ integTest(
       allowErrExit: true,
       modEnv: {
         INTEG_STACK_SET: 'stage-with-errors',
+        TELEMETRY_ENDPOINT: TELEMETRY_ENDPOINT,
       },
-      verbose: true, // force trace mode
+      verboseLevel: 3, // trace mode
     });
 
     expect(output).toContain('This is an error');

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

@@ -11,7 +11,7 @@ integTest(
 
     const synthOutput = await fixture.cdk(
       ['synth', fixture.fullStackName('test-1'), '--unstable=telemetry', `--telemetry-file=${telemetryFile}`],
-      { verbose: true }, // force trace mode
+      { modEnv: { TELEMETRY_ENDPOINT: 'https://cdk-cli-telemetry.us-east-1.api.aws/metrics' }, verboseLevel: 3 }, // trace mode
     );
 
     // Check the trace that telemetry was executed successfully

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

@@ -0,0 +1 @@
+export const TELEMETRY_ENDPOINT = 'https://cdk-cli-telemetry.us-east-1.api.aws/metrics';