Merge branch 'main' of https://github.com/go-to-k/aws-cdk-cli into hotswap-agentcore-runtime

Author: go-to-k

package.json

@@ -0,0 +1,15 @@
+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('no telemetry is collected if command is invalid', withDefaultFixture(async (fixture) => {
+  const telemetryFile = path.join(fixture.integTestDir, `telemetry-${Date.now()}.json`);
+
+  const commandOutput = await fixture.cdk(['invalid-command', `--telemetry-file=${telemetryFile}`], { verboseLevel: 3, allowErrExit: true }); // trace mode
+
+  expect(commandOutput).toContain('Session instantiated with an invalid command');
+  expect(fs.existsSync(telemetryFile)).toBeFalsy();
+}),
+);

packages/@aws-cdk-testing/cli-integ/package.json

@@ -1,5 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
+import { CURRENT_TELEMETRY_VERSION } from './constants';
 import { integTest, withDefaultFixture } from '../../lib';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
@@ -51,7 +52,7 @@ integTest(
         identifiers: expect.objectContaining({
           installationId: expect.anything(),
           sessionId: expect.anything(),
-          telemetryVersion: '1.0',
+          telemetryVersion: CURRENT_TELEMETRY_VERSION,
           cdkCliVersion: expect.anything(),
           cdkLibraryVersion: fixture.library.requestedVersion(),
           region: expect.anything(),
@@ -99,7 +100,7 @@ integTest(
         identifiers: expect.objectContaining({
           installationId: expect.anything(),
           sessionId: expect.anything(),
-          telemetryVersion: '1.0',
+          telemetryVersion: CURRENT_TELEMETRY_VERSION,
           cdkCliVersion: expect.anything(),
           cdkLibraryVersion: fixture.library.requestedVersion(),
           region: expect.anything(),

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

@@ -1,5 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs-extra';
+import { CURRENT_TELEMETRY_VERSION } from './constants';
 import { integTest, withDefaultFixture } from '../../lib';
 
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
@@ -48,7 +49,7 @@ integTest(
         identifiers: expect.objectContaining({
           installationId: expect.anything(),
           sessionId: expect.anything(),
-          telemetryVersion: '1.0',
+          telemetryVersion: CURRENT_TELEMETRY_VERSION,
           cdkCliVersion: expect.anything(),
           cdkLibraryVersion: fixture.library.requestedVersion(),
           region: expect.anything(),
@@ -96,7 +97,7 @@ integTest(
         identifiers: expect.objectContaining({
           installationId: expect.anything(),
           sessionId: expect.anything(),
-          telemetryVersion: '1.0',
+          telemetryVersion: CURRENT_TELEMETRY_VERSION,
           cdkCliVersion: expect.anything(),
           cdkLibraryVersion: fixture.library.requestedVersion(),
           region: expect.anything(),

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

@@ -0,0 +1 @@
+export const CURRENT_TELEMETRY_VERSION = '2.0';