@aws-cdk-testing/cli-integ 3.24.0 → 3.25.1

package/package.json

@@ -39,9 +39,9 @@
     "organization": true
   },
   "devDependencies": {
-    "@aws-cdk/toolkit-lib": "1.17.0",
+    "@aws-cdk/toolkit-lib": "1.18.0",
     "@aws-cdk/yarn-cling": "0.0.0",
-    "@cdklabs/eslint-plugin": "^1.5.5",
+    "@cdklabs/eslint-plugin": "^1.5.6",
     "@stylistic/eslint-plugin": "^3",
     "@types/fs-extra": "^9",
     "@types/jest": "^29.5.14",
@@ -67,23 +67,23 @@
     "typescript": "5.9"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudformation": "^3.1000.0",
-    "@aws-sdk/client-codeartifact": "^3.1000.0",
-    "@aws-sdk/client-ecr": "^3.1000.0",
-    "@aws-sdk/client-ecr-public": "^3.1000.0",
-    "@aws-sdk/client-ecs": "^3.1000.0",
-    "@aws-sdk/client-iam": "^3.1000.0",
-    "@aws-sdk/client-lambda": "^3.1000.0",
-    "@aws-sdk/client-s3": "^3.1000.0",
-    "@aws-sdk/client-secrets-manager": "^3.1000.0",
-    "@aws-sdk/client-sns": "^3.1000.0",
-    "@aws-sdk/client-sso": "^3.1000.0",
-    "@aws-sdk/client-sts": "^3.1000.0",
-    "@aws-sdk/credential-providers": "^3.1000.0",
-    "@cdklabs/cdk-atmosphere-client": "^0.0.90",
+    "@aws-sdk/client-cloudformation": "^3.1004.0",
+    "@aws-sdk/client-codeartifact": "^3.1004.0",
+    "@aws-sdk/client-ecr": "^3.1004.0",
+    "@aws-sdk/client-ecr-public": "^3.1004.0",
+    "@aws-sdk/client-ecs": "^3.1004.0",
+    "@aws-sdk/client-iam": "^3.1004.0",
+    "@aws-sdk/client-lambda": "^3.1004.0",
+    "@aws-sdk/client-s3": "^3.1004.0",
+    "@aws-sdk/client-secrets-manager": "^3.1004.0",
+    "@aws-sdk/client-sns": "^3.1004.0",
+    "@aws-sdk/client-sso": "^3.1004.0",
+    "@aws-sdk/client-sts": "^3.1004.0",
+    "@aws-sdk/credential-providers": "^3.1004.0",
+    "@cdklabs/cdk-atmosphere-client": "^0.0.91",
     "@octokit/rest": "^20",
     "@smithy/types": "^4.13.0",
-    "@smithy/util-retry": "^4.2.10",
+    "@smithy/util-retry": "^4.2.11",
     "axios": "^1",
     "chalk": "^4",
     "fast-glob": "^3.3.3",
@@ -116,7 +116,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.24.0",
+  "version": "3.25.1",
   "types": "lib/index.d.ts",
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }

package/tests/cli-integ-tests/deploy/cdk-deploy-with-revert-drift.integtest.d.ts

@@ -0,0 +1 @@
+export {};

package/tests/cli-integ-tests/deploy/cdk-deploy-with-revert-drift.integtest.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const client_cloudformation_1 = require("@aws-sdk/client-cloudformation");
+const client_lambda_1 = require("@aws-sdk/client-lambda");
+const lib_1 = require("../../../lib");
+const drift_helpers_1 = require("../drift/drift_helpers");
+jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
+(0, lib_1.integTest)('deploy with revert-drift true', (0, lib_1.withDefaultFixture)(async (fixture) => {
+    await fixture.cdkDeploy('driftable', {});
+    // Get the Lambda, we want to now make it drift
+    const response = await fixture.aws.cloudFormation.send(new client_cloudformation_1.DescribeStackResourcesCommand({
+        StackName: fixture.fullStackName('driftable'),
+    }));
+    const lambdaResource = response.StackResources?.find(resource => resource.ResourceType === 'AWS::Lambda::Function');
+    if (!lambdaResource || !lambdaResource.PhysicalResourceId) {
+        throw new Error('Could not find Lambda function in stack resources');
+    }
+    const functionName = lambdaResource.PhysicalResourceId;
+    // Update the Lambda function, introducing drift
+    await fixture.aws.lambda.send(new client_lambda_1.UpdateFunctionConfigurationCommand({
+        FunctionName: functionName,
+        Description: 'I\'m slowly drifting (drifting away)',
+    }));
+    // Wait for the stack update to complete
+    await (0, drift_helpers_1.waitForLambdaUpdateComplete)(fixture, functionName);
+    const drifted = await fixture.cdk(['drift', fixture.fullStackName('driftable')], { verbose: false });
+    expect(drifted).toMatch(/Stack.*driftable/);
+    expect(drifted).toContain('1 resource has drifted');
+    // Update the Stack with drift-aware
+    await fixture.cdkDeploy('driftable', {
+        options: ['--revert-drift'],
+        captureStderr: false,
+    });
+    // After performing a drift-aware deployment, verify that no drift has occurred.
+    const noDrifted = await fixture.cdk(['drift', fixture.fullStackName('driftable')], { verbose: false });
+    expect(noDrifted).toMatch(/Stack.*driftable/); // can't just .toContain because of formatting
+    expect(noDrifted).toContain('No drift detected');
+}));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLWRlcGxveS13aXRoLXJldmVydC1kcmlmdC5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjZGstZGVwbG95LXdpdGgtcmV2ZXJ0LWRyaWZ0LmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBFQUErRTtBQUMvRSwwREFBNEU7QUFDNUUsc0NBQTZEO0FBQzdELDBEQUFxRTtBQUVyRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyx5RUFBeUU7QUFFM0csSUFBQSxlQUFTLEVBQ1AsK0JBQStCLEVBQy9CLElBQUEsd0JBQWtCLEVBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQ25DLE1BQU0sT0FBTyxDQUFDLFNBQVMsQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFekMsK0NBQStDO0lBQy9DLE1BQU0sUUFBUSxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUNwRCxJQUFJLHFEQUE2QixDQUFDO1FBQ2hDLFNBQVMsRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQztLQUM5QyxDQUFDLENBQ0gsQ0FBQztJQUNGLE1BQU0sY0FBYyxHQUFHLFFBQVEsQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUNsRCxRQUFRLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxZQUFZLEtBQUssdUJBQXVCLENBQzlELENBQUM7SUFDRixJQUFJLENBQUMsY0FBYyxJQUFJLENBQUMsY0FBYyxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFDMUQsTUFBTSxJQUFJLEtBQUssQ0FBQyxtREFBbUQsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7SUFDRCxNQUFNLFlBQVksR0FBRyxjQUFjLENBQUMsa0JBQWtCLENBQUM7SUFFdkQsZ0RBQWdEO0lBQ2hELE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUMzQixJQUFJLGtEQUFrQyxDQUFDO1FBQ3JDLFlBQVksRUFBRSxZQUFZO1FBQzFCLFdBQVcsRUFBRSxzQ0FBc0M7S0FDcEQsQ0FBQyxDQUNILENBQUM7SUFFRix3Q0FBd0M7SUFDeEMsTUFBTSxJQUFBLDJDQUEyQixFQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQztJQUV6RCxNQUFNLE9BQU8sR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLGFBQWEsQ0FBQyxXQUFXLENBQUMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFFckcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQzVDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxTQUFTLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUVwRCxvQ0FBb0M7SUFDcEMsTUFBTSxPQUFPLENBQUMsU0FBUyxDQUFDLFdBQVcsRUFBRTtRQUNuQyxPQUFPLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQztRQUMzQixhQUFhLEVBQUUsS0FBSztLQUNyQixDQUFDLENBQUM7SUFFSCxnRkFBZ0Y7SUFDaEYsTUFBTSxTQUFTLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBRXZHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLDhDQUE4QztJQUM3RixNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsU0FBUyxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFDbkQsQ0FBQyxDQUFDLENBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERlc2NyaWJlU3RhY2tSZXNvdXJjZXNDb21tYW5kIH0gZnJvbSAnQGF3cy1zZGsvY2xpZW50LWNsb3VkZm9ybWF0aW9uJztcbmltcG9ydCB7IFVwZGF0ZUZ1bmN0aW9uQ29uZmlndXJhdGlvbkNvbW1hbmQgfSBmcm9tICdAYXdzLXNkay9jbGllbnQtbGFtYmRhJztcbmltcG9ydCB7IGludGVnVGVzdCwgd2l0aERlZmF1bHRGaXh0dXJlIH0gZnJvbSAnLi4vLi4vLi4vbGliJztcbmltcG9ydCB7IHdhaXRGb3JMYW1iZGFVcGRhdGVDb21wbGV0ZSB9IGZyb20gJy4uL2RyaWZ0L2RyaWZ0X2hlbHBlcnMnO1xuXG5qZXN0LnNldFRpbWVvdXQoMiAqIDYwICogNjBfMDAwKTsgLy8gSW5jbHVkZXMgdGhlIHRpbWUgdG8gYWNxdWlyZSBsb2Nrcywgd29yc3QtY2FzZSBzaW5nbGUtdGhyZWFkZWQgcnVudGltZVxuXG5pbnRlZ1Rlc3QoXG4gICdkZXBsb3kgd2l0aCByZXZlcnQtZHJpZnQgdHJ1ZScsXG4gIHdpdGhEZWZhdWx0Rml4dHVyZShhc3luYyAoZml4dHVyZSkgPT4ge1xuICAgIGF3YWl0IGZpeHR1cmUuY2RrRGVwbG95KCdkcmlmdGFibGUnLCB7fSk7XG5cbiAgICAvLyBHZXQgdGhlIExhbWJkYSwgd2Ugd2FudCB0byBub3cgbWFrZSBpdCBkcmlmdFxuICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZml4dHVyZS5hd3MuY2xvdWRGb3JtYXRpb24uc2VuZChcbiAgICAgIG5ldyBEZXNjcmliZVN0YWNrUmVzb3VyY2VzQ29tbWFuZCh7XG4gICAgICAgIFN0YWNrTmFtZTogZml4dHVyZS5mdWxsU3RhY2tOYW1lKCdkcmlmdGFibGUnKSxcbiAgICAgIH0pLFxuICAgICk7XG4gICAgY29uc3QgbGFtYmRhUmVzb3VyY2UgPSByZXNwb25zZS5TdGFja1Jlc291cmNlcz8uZmluZChcbiAgICAgIHJlc291cmNlID0+IHJlc291cmNlLlJlc291cmNlVHlwZSA9PT0gJ0FXUzo6TGFtYmRhOjpGdW5jdGlvbicsXG4gICAgKTtcbiAgICBpZiAoIWxhbWJkYVJlc291cmNlIHx8ICFsYW1iZGFSZXNvdXJjZS5QaHlzaWNhbFJlc291cmNlSWQpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignQ291bGQgbm90IGZpbmQgTGFtYmRhIGZ1bmN0aW9uIGluIHN0YWNrIHJlc291cmNlcycpO1xuICAgIH1cbiAgICBjb25zdCBmdW5jdGlvbk5hbWUgPSBsYW1iZGFSZXNvdXJjZS5QaHlzaWNhbFJlc291cmNlSWQ7XG5cbiAgICAvLyBVcGRhdGUgdGhlIExhbWJkYSBmdW5jdGlvbiwgaW50cm9kdWNpbmcgZHJpZnRcbiAgICBhd2FpdCBmaXh0dXJlLmF3cy5sYW1iZGEuc2VuZChcbiAgICAgIG5ldyBVcGRhdGVGdW5jdGlvbkNvbmZpZ3VyYXRpb25Db21tYW5kKHtcbiAgICAgICAgRnVuY3Rpb25OYW1lOiBmdW5jdGlvbk5hbWUsXG4gICAgICAgIERlc2NyaXB0aW9uOiAnSVxcJ20gc2xvd2x5IGRyaWZ0aW5nIChkcmlmdGluZyBhd2F5KScsXG4gICAgICB9KSxcbiAgICApO1xuXG4gICAgLy8gV2FpdCBmb3IgdGhlIHN0YWNrIHVwZGF0ZSB0byBjb21wbGV0ZVxuICAgIGF3YWl0IHdhaXRGb3JMYW1iZGFVcGRhdGVDb21wbGV0ZShmaXh0dXJlLCBmdW5jdGlvbk5hbWUpO1xuXG4gICAgY29uc3QgZHJpZnRlZCA9IGF3YWl0IGZpeHR1cmUuY2RrKFsnZHJpZnQnLCBmaXh0dXJlLmZ1bGxTdGFja05hbWUoJ2RyaWZ0YWJsZScpXSwgeyB2ZXJib3NlOiBmYWxzZSB9KTtcblxuICAgIGV4cGVjdChkcmlmdGVkKS50b01hdGNoKC9TdGFjay4qZHJpZnRhYmxlLyk7XG4gICAgZXhwZWN0KGRyaWZ0ZWQpLnRvQ29udGFpbignMSByZXNvdXJjZSBoYXMgZHJpZnRlZCcpO1xuXG4gICAgLy8gVXBkYXRlIHRoZSBTdGFjayB3aXRoIGRyaWZ0LWF3YXJlXG4gICAgYXdhaXQgZml4dHVyZS5jZGtEZXBsb3koJ2RyaWZ0YWJsZScsIHtcbiAgICAgIG9wdGlvbnM6IFsnLS1yZXZlcnQtZHJpZnQnXSxcbiAgICAgIGNhcHR1cmVTdGRlcnI6IGZhbHNlLFxuICAgIH0pO1xuXG4gICAgLy8gQWZ0ZXIgcGVyZm9ybWluZyBhIGRyaWZ0LWF3YXJlIGRlcGxveW1lbnQsIHZlcmlmeSB0aGF0IG5vIGRyaWZ0IGhhcyBvY2N1cnJlZC5cbiAgICBjb25zdCBub0RyaWZ0ZWQgPSBhd2FpdCBmaXh0dXJlLmNkayhbJ2RyaWZ0JywgZml4dHVyZS5mdWxsU3RhY2tOYW1lKCdkcmlmdGFibGUnKV0sIHsgdmVyYm9zZTogZmFsc2UgfSk7XG5cbiAgICBleHBlY3Qobm9EcmlmdGVkKS50b01hdGNoKC9TdGFjay4qZHJpZnRhYmxlLyk7IC8vIGNhbid0IGp1c3QgLnRvQ29udGFpbiBiZWNhdXNlIG9mIGZvcm1hdHRpbmdcbiAgICBleHBlY3Qobm9EcmlmdGVkKS50b0NvbnRhaW4oJ05vIGRyaWZ0IGRldGVjdGVkJyk7XG4gIH0pLFxuKTtcbiJdfQ==

package/tests/cli-integ-tests/doctor/cdk-doctor.integtest.d.ts

@@ -0,0 +1 @@
+export {};

package/tests/cli-integ-tests/doctor/cdk-doctor.integtest.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lib_1 = require("../../../lib");
+jest.setTimeout(2 * 60 * 60_000);
+(0, lib_1.integTest)('cdk doctor displays diagnostic information', (0, lib_1.withDefaultFixture)(async (fixture) => {
+    const output = await fixture.cdk(['doctor']);
+    expect(output).toContain('CDK Version');
+    expect(output).toContain('AWS environment variables');
+    expect(output).toContain('CDK environment variables');
+}));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLWRvY3Rvci5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjZGstZG9jdG9yLmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHNDQUE2RDtBQUU3RCxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsTUFBTSxDQUFDLENBQUM7QUFFakMsSUFBQSxlQUFTLEVBQ1AsNENBQTRDLEVBQzVDLElBQUEsd0JBQWtCLEVBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQ25DLE1BQU0sTUFBTSxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFDN0MsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUN4QyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsU0FBUyxDQUFDLDJCQUEyQixDQUFDLENBQUM7SUFDdEQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFNBQVMsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO0FBQ3hELENBQUMsQ0FBQyxDQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBpbnRlZ1Rlc3QsIHdpdGhEZWZhdWx0Rml4dHVyZSB9IGZyb20gJy4uLy4uLy4uL2xpYic7XG5cbmplc3Quc2V0VGltZW91dCgyICogNjAgKiA2MF8wMDApO1xuXG5pbnRlZ1Rlc3QoXG4gICdjZGsgZG9jdG9yIGRpc3BsYXlzIGRpYWdub3N0aWMgaW5mb3JtYXRpb24nLFxuICB3aXRoRGVmYXVsdEZpeHR1cmUoYXN5bmMgKGZpeHR1cmUpID0+IHtcbiAgICBjb25zdCBvdXRwdXQgPSBhd2FpdCBmaXh0dXJlLmNkayhbJ2RvY3RvciddKTtcbiAgICBleHBlY3Qob3V0cHV0KS50b0NvbnRhaW4oJ0NESyBWZXJzaW9uJyk7XG4gICAgZXhwZWN0KG91dHB1dCkudG9Db250YWluKCdBV1MgZW52aXJvbm1lbnQgdmFyaWFibGVzJyk7XG4gICAgZXhwZWN0KG91dHB1dCkudG9Db250YWluKCdDREsgZW52aXJvbm1lbnQgdmFyaWFibGVzJyk7XG4gIH0pLFxuKTtcbiJdfQ==

package/tests/cli-integ-tests/drift/cdk-cdk-drift---fail-throws-when-drift-is-detected.integtest.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_cloudformation_1 = require("@aws-sdk/client-cloudformation");
 const client_lambda_1 = require("@aws-sdk/client-lambda");
+const drift_helpers_1 = require("./drift_helpers");
 const lib_1 = require("../../../lib");
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
 (0, lib_1.integTest)('cdk drift --fail throws when drift is detected', (0, lib_1.withDefaultFixture)(async (fixture) => {
@@ -24,29 +25,7 @@ jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-c
         Description: 'I\'m slowly drifting (drifting away)',
     }));
     // Wait for the stack update to complete
-    await waitForLambdaUpdateComplete(fixture, functionName);
+    await (0, drift_helpers_1.waitForLambdaUpdateComplete)(fixture, functionName);
     await expect(fixture.cdk(['drift', '--fail', fixture.fullStackName('driftable')], { verbose: false })).rejects.toThrow('exited with error');
 }));
-async function waitForLambdaUpdateComplete(fixture, functionName) {
-    const delaySeconds = 5;
-    const timeout = 30_000; // timeout after 30s
-    const deadline = Date.now() + timeout;
-    while (true) {
-        const response = await fixture.aws.lambda.send(new client_lambda_1.GetFunctionCommand({
-            FunctionName: functionName,
-        }));
-        const lastUpdateStatus = response.Configuration?.LastUpdateStatus;
-        if (lastUpdateStatus === 'Successful') {
-            return; // Update completed successfully
-        }
-        if (lastUpdateStatus === 'Failed') {
-            throw new Error('Lambda function update failed');
-        }
-        if (Date.now() > deadline) {
-            throw new Error(`Timed out after ${timeout / 1000} seconds.`);
-        }
-        // Wait before checking again
-        await (0, lib_1.sleep)(delaySeconds * 1000);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLWNkay1kcmlmdC0tLWZhaWwtdGhyb3dzLXdoZW4tZHJpZnQtaXMtZGV0ZWN0ZWQuaW50ZWd0ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY2RrLWNkay1kcmlmdC0tLWZhaWwtdGhyb3dzLXdoZW4tZHJpZnQtaXMtZGV0ZWN0ZWQuaW50ZWd0ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMEVBQStFO0FBQy9FLDBEQUFnRztBQUNoRyxzQ0FBb0U7QUFFcEUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMseUVBQXlFO0FBRTNHLElBQUEsZUFBUyxFQUNQLGdEQUFnRCxFQUNoRCxJQUFBLHdCQUFrQixFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUNuQyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRXpDLHNGQUFzRjtJQUN0RixNQUFNLEtBQUssR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBRTdHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsQ0FBQztJQUU3QywrQ0FBK0M7SUFDL0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQ3BELElBQUkscURBQTZCLENBQUM7UUFDaEMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDO0tBQzlDLENBQUMsQ0FDSCxDQUFDO0lBQ0YsTUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQ2xELFFBQVEsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLFlBQVksS0FBSyx1QkFBdUIsQ0FDOUQsQ0FBQztJQUNGLElBQUksQ0FBQyxjQUFjLElBQUksQ0FBQyxjQUFjLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUMxRCxNQUFNLElBQUksS0FBSyxDQUFDLG1EQUFtRCxDQUFDLENBQUM7SUFDdkUsQ0FBQztJQUNELE1BQU0sWUFBWSxHQUFHLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQztJQUV2RCxnREFBZ0Q7SUFDaEQsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQzNCLElBQUksa0RBQWtDLENBQUM7UUFDckMsWUFBWSxFQUFFLFlBQVk7UUFDMUIsV0FBVyxFQUFFLHNDQUFzQztLQUNwRCxDQUFDLENBQ0gsQ0FBQztJQUVGLHdDQUF3QztJQUN4QyxNQUFNLDJCQUEyQixDQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQztJQUV6RCxNQUFNLE1BQU0sQ0FDVixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FDekYsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFDekMsQ0FBQyxDQUFDLENBQ0gsQ0FBQztBQUVGLEtBQUssVUFBVSwyQkFBMkIsQ0FBQyxPQUFZLEVBQUUsWUFBb0I7SUFDM0UsTUFBTSxZQUFZLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZCLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxDQUFDLG9CQUFvQjtJQUM1QyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsT0FBTyxDQUFDO0lBRXRDLE9BQU8sSUFBSSxFQUFFLENBQUM7UUFDWixNQUFNLFFBQVEsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDNUMsSUFBSSxrQ0FBa0IsQ0FBQztZQUNyQixZQUFZLEVBQUUsWUFBWTtTQUMzQixDQUFDLENBQ0gsQ0FBQztRQUVGLE1BQU0sZ0JBQWdCLEdBQUcsUUFBUSxDQUFDLGFBQWEsRUFBRSxnQkFBZ0IsQ0FBQztRQUVsRSxJQUFJLGdCQUFnQixLQUFLLFlBQVksRUFBRSxDQUFDO1lBQ3RDLE9BQU8sQ0FBQyxnQ0FBZ0M7UUFDMUMsQ0FBQztRQUVELElBQUksZ0JBQWdCLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDbEMsTUFBTSxJQUFJLEtBQUssQ0FBQywrQkFBK0IsQ0FBQyxDQUFDO1FBQ25ELENBQUM7UUFFRCxJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxRQUFRLEVBQUUsQ0FBQztZQUMxQixNQUFNLElBQUksS0FBSyxDQUFDLG1CQUFtQixPQUFPLEdBQUcsSUFBSSxXQUFXLENBQUMsQ0FBQztRQUNoRSxDQUFDO1FBRUQsNkJBQTZCO1FBQzdCLE1BQU0sSUFBQSxXQUFLLEVBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxDQUFDO0lBQ25DLENBQUM7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGVzY3JpYmVTdGFja1Jlc291cmNlc0NvbW1hbmQgfSBmcm9tICdAYXdzLXNkay9jbGllbnQtY2xvdWRmb3JtYXRpb24nO1xuaW1wb3J0IHsgR2V0RnVuY3Rpb25Db21tYW5kLCBVcGRhdGVGdW5jdGlvbkNvbmZpZ3VyYXRpb25Db21tYW5kIH0gZnJvbSAnQGF3cy1zZGsvY2xpZW50LWxhbWJkYSc7XG5pbXBvcnQgeyBpbnRlZ1Rlc3QsIHNsZWVwLCB3aXRoRGVmYXVsdEZpeHR1cmUgfSBmcm9tICcuLi8uLi8uLi9saWInO1xuXG5qZXN0LnNldFRpbWVvdXQoMiAqIDYwICogNjBfMDAwKTsgLy8gSW5jbHVkZXMgdGhlIHRpbWUgdG8gYWNxdWlyZSBsb2Nrcywgd29yc3QtY2FzZSBzaW5nbGUtdGhyZWFkZWQgcnVudGltZVxuXG5pbnRlZ1Rlc3QoXG4gICdjZGsgZHJpZnQgLS1mYWlsIHRocm93cyB3aGVuIGRyaWZ0IGlzIGRldGVjdGVkJyxcbiAgd2l0aERlZmF1bHRGaXh0dXJlKGFzeW5jIChmaXh0dXJlKSA9PiB7XG4gICAgYXdhaXQgZml4dHVyZS5jZGtEZXBsb3koJ2RyaWZ0YWJsZScsIHt9KTtcblxuICAgIC8vIEFzc2VydCB0aGF0LCByaWdodCBhZnRlciBkZXBsb3lpbmcsIHRoZXJlIGlzIG5vIGRyaWZ0IChiZWNhdXNlIHdlIGp1c3QgZGVwbG95ZWQgaXQpXG4gICAgY29uc3QgZHJpZnQgPSBhd2FpdCBmaXh0dXJlLmNkayhbJ2RyaWZ0JywgJy0tZmFpbCcsIGZpeHR1cmUuZnVsbFN0YWNrTmFtZSgnZHJpZnRhYmxlJyldLCB7IHZlcmJvc2U6IGZhbHNlIH0pO1xuXG4gICAgZXhwZWN0KGRyaWZ0KS50b0NvbnRhaW4oJ05vIGRyaWZ0IGRldGVjdGVkJyk7XG5cbiAgICAvLyBHZXQgdGhlIExhbWJkYSwgd2Ugd2FudCB0byBub3cgbWFrZSBpdCBkcmlmdFxuICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZml4dHVyZS5hd3MuY2xvdWRGb3JtYXRpb24uc2VuZChcbiAgICAgIG5ldyBEZXNjcmliZVN0YWNrUmVzb3VyY2VzQ29tbWFuZCh7XG4gICAgICAgIFN0YWNrTmFtZTogZml4dHVyZS5mdWxsU3RhY2tOYW1lKCdkcmlmdGFibGUnKSxcbiAgICAgIH0pLFxuICAgICk7XG4gICAgY29uc3QgbGFtYmRhUmVzb3VyY2UgPSByZXNwb25zZS5TdGFja1Jlc291cmNlcz8uZmluZChcbiAgICAgIHJlc291cmNlID0+IHJlc291cmNlLlJlc291cmNlVHlwZSA9PT0gJ0FXUzo6TGFtYmRhOjpGdW5jdGlvbicsXG4gICAgKTtcbiAgICBpZiAoIWxhbWJkYVJlc291cmNlIHx8ICFsYW1iZGFSZXNvdXJjZS5QaHlzaWNhbFJlc291cmNlSWQpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignQ291bGQgbm90IGZpbmQgTGFtYmRhIGZ1bmN0aW9uIGluIHN0YWNrIHJlc291cmNlcycpO1xuICAgIH1cbiAgICBjb25zdCBmdW5jdGlvbk5hbWUgPSBsYW1iZGFSZXNvdXJjZS5QaHlzaWNhbFJlc291cmNlSWQ7XG5cbiAgICAvLyBVcGRhdGUgdGhlIExhbWJkYSBmdW5jdGlvbiwgaW50cm9kdWNpbmcgZHJpZnRcbiAgICBhd2FpdCBmaXh0dXJlLmF3cy5sYW1iZGEuc2VuZChcbiAgICAgIG5ldyBVcGRhdGVGdW5jdGlvbkNvbmZpZ3VyYXRpb25Db21tYW5kKHtcbiAgICAgICAgRnVuY3Rpb25OYW1lOiBmdW5jdGlvbk5hbWUsXG4gICAgICAgIERlc2NyaXB0aW9uOiAnSVxcJ20gc2xvd2x5IGRyaWZ0aW5nIChkcmlmdGluZyBhd2F5KScsXG4gICAgICB9KSxcbiAgICApO1xuXG4gICAgLy8gV2FpdCBmb3IgdGhlIHN0YWNrIHVwZGF0ZSB0byBjb21wbGV0ZVxuICAgIGF3YWl0IHdhaXRGb3JMYW1iZGFVcGRhdGVDb21wbGV0ZShmaXh0dXJlLCBmdW5jdGlvbk5hbWUpO1xuXG4gICAgYXdhaXQgZXhwZWN0KFxuICAgICAgZml4dHVyZS5jZGsoWydkcmlmdCcsICctLWZhaWwnLCBmaXh0dXJlLmZ1bGxTdGFja05hbWUoJ2RyaWZ0YWJsZScpXSwgeyB2ZXJib3NlOiBmYWxzZSB9KSxcbiAgICApLnJlamVjdHMudG9UaHJvdygnZXhpdGVkIHdpdGggZXJyb3InKTtcbiAgfSksXG4pO1xuXG5hc3luYyBmdW5jdGlvbiB3YWl0Rm9yTGFtYmRhVXBkYXRlQ29tcGxldGUoZml4dHVyZTogYW55LCBmdW5jdGlvbk5hbWU6IHN0cmluZyk6IFByb21pc2U8dm9pZD4ge1xuICBjb25zdCBkZWxheVNlY29uZHMgPSA1O1xuICBjb25zdCB0aW1lb3V0ID0gMzBfMDAwOyAvLyB0aW1lb3V0IGFmdGVyIDMwc1xuICBjb25zdCBkZWFkbGluZSA9IERhdGUubm93KCkgKyB0aW1lb3V0O1xuXG4gIHdoaWxlICh0cnVlKSB7XG4gICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmaXh0dXJlLmF3cy5sYW1iZGEuc2VuZChcbiAgICAgIG5ldyBHZXRGdW5jdGlvbkNvbW1hbmQoe1xuICAgICAgICBGdW5jdGlvbk5hbWU6IGZ1bmN0aW9uTmFtZSxcbiAgICAgIH0pLFxuICAgICk7XG5cbiAgICBjb25zdCBsYXN0VXBkYXRlU3RhdHVzID0gcmVzcG9uc2UuQ29uZmlndXJhdGlvbj8uTGFzdFVwZGF0ZVN0YXR1cztcblxuICAgIGlmIChsYXN0VXBkYXRlU3RhdHVzID09PSAnU3VjY2Vzc2Z1bCcpIHtcbiAgICAgIHJldHVybjsgLy8gVXBkYXRlIGNvbXBsZXRlZCBzdWNjZXNzZnVsbHlcbiAgICB9XG5cbiAgICBpZiAobGFzdFVwZGF0ZVN0YXR1cyA9PT0gJ0ZhaWxlZCcpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignTGFtYmRhIGZ1bmN0aW9uIHVwZGF0ZSBmYWlsZWQnKTtcbiAgICB9XG5cbiAgICBpZiAoRGF0ZS5ub3coKSA+IGRlYWRsaW5lKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoYFRpbWVkIG91dCBhZnRlciAke3RpbWVvdXQgLyAxMDAwfSBzZWNvbmRzLmApO1xuICAgIH1cblxuICAgIC8vIFdhaXQgYmVmb3JlIGNoZWNraW5nIGFnYWluXG4gICAgYXdhaXQgc2xlZXAoZGVsYXlTZWNvbmRzICogMTAwMCk7XG4gIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLWNkay1kcmlmdC0tLWZhaWwtdGhyb3dzLXdoZW4tZHJpZnQtaXMtZGV0ZWN0ZWQuaW50ZWd0ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY2RrLWNkay1kcmlmdC0tLWZhaWwtdGhyb3dzLXdoZW4tZHJpZnQtaXMtZGV0ZWN0ZWQuaW50ZWd0ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMEVBQStFO0FBQy9FLDBEQUE0RTtBQUM1RSxtREFBOEQ7QUFDOUQsc0NBQTZEO0FBRTdELElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLHlFQUF5RTtBQUUzRyxJQUFBLGVBQVMsRUFDUCxnREFBZ0QsRUFDaEQsSUFBQSx3QkFBa0IsRUFBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUU7SUFDbkMsTUFBTSxPQUFPLENBQUMsU0FBUyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUV6QyxzRkFBc0Y7SUFDdEYsTUFBTSxLQUFLLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUU3RyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsU0FBUyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFFN0MsK0NBQStDO0lBQy9DLE1BQU0sUUFBUSxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUNwRCxJQUFJLHFEQUE2QixDQUFDO1FBQ2hDLFNBQVMsRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQztLQUM5QyxDQUFDLENBQ0gsQ0FBQztJQUNGLE1BQU0sY0FBYyxHQUFHLFFBQVEsQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUNsRCxRQUFRLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxZQUFZLEtBQUssdUJBQXVCLENBQzlELENBQUM7SUFDRixJQUFJLENBQUMsY0FBYyxJQUFJLENBQUMsY0FBYyxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFDMUQsTUFBTSxJQUFJLEtBQUssQ0FBQyxtREFBbUQsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7SUFDRCxNQUFNLFlBQVksR0FBRyxjQUFjLENBQUMsa0JBQWtCLENBQUM7SUFFdkQsZ0RBQWdEO0lBQ2hELE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUMzQixJQUFJLGtEQUFrQyxDQUFDO1FBQ3JDLFlBQVksRUFBRSxZQUFZO1FBQzFCLFdBQVcsRUFBRSxzQ0FBc0M7S0FDcEQsQ0FBQyxDQUNILENBQUM7SUFFRix3Q0FBd0M7SUFDeEMsTUFBTSxJQUFBLDJDQUEyQixFQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQztJQUV6RCxNQUFNLE1BQU0sQ0FDVixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FDekYsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFDekMsQ0FBQyxDQUFDLENBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERlc2NyaWJlU3RhY2tSZXNvdXJjZXNDb21tYW5kIH0gZnJvbSAnQGF3cy1zZGsvY2xpZW50LWNsb3VkZm9ybWF0aW9uJztcbmltcG9ydCB7IFVwZGF0ZUZ1bmN0aW9uQ29uZmlndXJhdGlvbkNvbW1hbmQgfSBmcm9tICdAYXdzLXNkay9jbGllbnQtbGFtYmRhJztcbmltcG9ydCB7IHdhaXRGb3JMYW1iZGFVcGRhdGVDb21wbGV0ZSB9IGZyb20gJy4vZHJpZnRfaGVscGVycyc7XG5pbXBvcnQgeyBpbnRlZ1Rlc3QsIHdpdGhEZWZhdWx0Rml4dHVyZSB9IGZyb20gJy4uLy4uLy4uL2xpYic7XG5cbmplc3Quc2V0VGltZW91dCgyICogNjAgKiA2MF8wMDApOyAvLyBJbmNsdWRlcyB0aGUgdGltZSB0byBhY3F1aXJlIGxvY2tzLCB3b3JzdC1jYXNlIHNpbmdsZS10aHJlYWRlZCBydW50aW1lXG5cbmludGVnVGVzdChcbiAgJ2NkayBkcmlmdCAtLWZhaWwgdGhyb3dzIHdoZW4gZHJpZnQgaXMgZGV0ZWN0ZWQnLFxuICB3aXRoRGVmYXVsdEZpeHR1cmUoYXN5bmMgKGZpeHR1cmUpID0+IHtcbiAgICBhd2FpdCBmaXh0dXJlLmNka0RlcGxveSgnZHJpZnRhYmxlJywge30pO1xuXG4gICAgLy8gQXNzZXJ0IHRoYXQsIHJpZ2h0IGFmdGVyIGRlcGxveWluZywgdGhlcmUgaXMgbm8gZHJpZnQgKGJlY2F1c2Ugd2UganVzdCBkZXBsb3llZCBpdClcbiAgICBjb25zdCBkcmlmdCA9IGF3YWl0IGZpeHR1cmUuY2RrKFsnZHJpZnQnLCAnLS1mYWlsJywgZml4dHVyZS5mdWxsU3RhY2tOYW1lKCdkcmlmdGFibGUnKV0sIHsgdmVyYm9zZTogZmFsc2UgfSk7XG5cbiAgICBleHBlY3QoZHJpZnQpLnRvQ29udGFpbignTm8gZHJpZnQgZGV0ZWN0ZWQnKTtcblxuICAgIC8vIEdldCB0aGUgTGFtYmRhLCB3ZSB3YW50IHRvIG5vdyBtYWtlIGl0IGRyaWZ0XG4gICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmaXh0dXJlLmF3cy5jbG91ZEZvcm1hdGlvbi5zZW5kKFxuICAgICAgbmV3IERlc2NyaWJlU3RhY2tSZXNvdXJjZXNDb21tYW5kKHtcbiAgICAgICAgU3RhY2tOYW1lOiBmaXh0dXJlLmZ1bGxTdGFja05hbWUoJ2RyaWZ0YWJsZScpLFxuICAgICAgfSksXG4gICAgKTtcbiAgICBjb25zdCBsYW1iZGFSZXNvdXJjZSA9IHJlc3BvbnNlLlN0YWNrUmVzb3VyY2VzPy5maW5kKFxuICAgICAgcmVzb3VyY2UgPT4gcmVzb3VyY2UuUmVzb3VyY2VUeXBlID09PSAnQVdTOjpMYW1iZGE6OkZ1bmN0aW9uJyxcbiAgICApO1xuICAgIGlmICghbGFtYmRhUmVzb3VyY2UgfHwgIWxhbWJkYVJlc291cmNlLlBoeXNpY2FsUmVzb3VyY2VJZCkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKCdDb3VsZCBub3QgZmluZCBMYW1iZGEgZnVuY3Rpb24gaW4gc3RhY2sgcmVzb3VyY2VzJyk7XG4gICAgfVxuICAgIGNvbnN0IGZ1bmN0aW9uTmFtZSA9IGxhbWJkYVJlc291cmNlLlBoeXNpY2FsUmVzb3VyY2VJZDtcblxuICAgIC8vIFVwZGF0ZSB0aGUgTGFtYmRhIGZ1bmN0aW9uLCBpbnRyb2R1Y2luZyBkcmlmdFxuICAgIGF3YWl0IGZpeHR1cmUuYXdzLmxhbWJkYS5zZW5kKFxuICAgICAgbmV3IFVwZGF0ZUZ1bmN0aW9uQ29uZmlndXJhdGlvbkNvbW1hbmQoe1xuICAgICAgICBGdW5jdGlvbk5hbWU6IGZ1bmN0aW9uTmFtZSxcbiAgICAgICAgRGVzY3JpcHRpb246ICdJXFwnbSBzbG93bHkgZHJpZnRpbmcgKGRyaWZ0aW5nIGF3YXkpJyxcbiAgICAgIH0pLFxuICAgICk7XG5cbiAgICAvLyBXYWl0IGZvciB0aGUgc3RhY2sgdXBkYXRlIHRvIGNvbXBsZXRlXG4gICAgYXdhaXQgd2FpdEZvckxhbWJkYVVwZGF0ZUNvbXBsZXRlKGZpeHR1cmUsIGZ1bmN0aW9uTmFtZSk7XG5cbiAgICBhd2FpdCBleHBlY3QoXG4gICAgICBmaXh0dXJlLmNkayhbJ2RyaWZ0JywgJy0tZmFpbCcsIGZpeHR1cmUuZnVsbFN0YWNrTmFtZSgnZHJpZnRhYmxlJyldLCB7IHZlcmJvc2U6IGZhbHNlIH0pLFxuICAgICkucmVqZWN0cy50b1Rocm93KCdleGl0ZWQgd2l0aCBlcnJvcicpO1xuICB9KSxcbik7XG4iXX0=

package/tests/cli-integ-tests/drift/cdk-cdk-drift.integtest.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_cloudformation_1 = require("@aws-sdk/client-cloudformation");
 const client_lambda_1 = require("@aws-sdk/client-lambda");
+const drift_helpers_1 = require("./drift_helpers");
 const lib_1 = require("../../../lib");
 jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
 (0, lib_1.integTest)('cdk drift', (0, lib_1.withDefaultFixture)(async (fixture) => {
@@ -27,7 +28,7 @@ jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-c
         Description: 'I\'m slowly drifting (drifting away)',
     }));
     // Wait for the stack update to complete
-    await waitForLambdaUpdateComplete(fixture, functionName);
+    await (0, drift_helpers_1.waitForLambdaUpdateComplete)(fixture, functionName);
     const driftAfterModification = await fixture.cdk(['drift', fixture.fullStackName('driftable')], { verbose: false });
     const expectedMatches = [
         /Stack.*driftable/,
@@ -47,26 +48,4 @@ jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-c
         expect(driftAfterModification).toContain(expectedSubstring);
     }
 }));
-async function waitForLambdaUpdateComplete(fixture, functionName) {
-    const delaySeconds = 5;
-    const timeout = 30_000; // timeout after 30s
-    const deadline = Date.now() + timeout;
-    while (true) {
-        const response = await fixture.aws.lambda.send(new client_lambda_1.GetFunctionCommand({
-            FunctionName: functionName,
-        }));
-        const lastUpdateStatus = response.Configuration?.LastUpdateStatus;
-        if (lastUpdateStatus === 'Successful') {
-            return; // Update completed successfully
-        }
-        if (lastUpdateStatus === 'Failed') {
-            throw new Error('Lambda function update failed');
-        }
-        if (Date.now() > deadline) {
-            throw new Error(`Timed out after ${timeout / 1000} seconds.`);
-        }
-        // Wait before checking again
-        await (0, lib_1.sleep)(delaySeconds * 1000);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cdk-cdk-drift.integtest.js","sourceRoot":"","sources":["cdk-cdk-drift.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import { DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation';\nimport { GetFunctionCommand, UpdateFunctionConfigurationCommand } from '@aws-sdk/client-lambda';\nimport { integTest, sleep, withDefaultFixture } from '../../../lib';\n\njest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime\n\nintegTest(\n  'cdk drift',\n  withDefaultFixture(async (fixture) => {\n    await fixture.cdkDeploy('driftable', {});\n\n    // Assert that, right after deploying, there is no drift (because we just deployed it)\n    const drift = await fixture.cdk(['drift', fixture.fullStackName('driftable')], { verbose: false });\n\n    expect(drift).toMatch(/Stack.*driftable/); // can't just .toContain because of formatting\n    expect(drift).toContain('No drift detected');\n    expect(drift).toContain('✨  Number of resources with drift: 0');\n    expect(drift).not.toContain('unchecked'); // should not see unchecked resources unless verbose\n\n    // Get the Lambda, we want to now make it drift\n    const response = await fixture.aws.cloudFormation.send(\n      new DescribeStackResourcesCommand({\n        StackName: fixture.fullStackName('driftable'),\n      }),\n    );\n    const lambdaResource = response.StackResources?.find(\n      resource => resource.ResourceType === 'AWS::Lambda::Function',\n    );\n    if (!lambdaResource || !lambdaResource.PhysicalResourceId) {\n      throw new Error('Could not find Lambda function in stack resources');\n    }\n    const functionName = lambdaResource.PhysicalResourceId;\n\n    // Update the Lambda function, introducing drift\n    await fixture.aws.lambda.send(\n      new UpdateFunctionConfigurationCommand({\n        FunctionName: functionName,\n        Description: 'I\\'m slowly drifting (drifting away)',\n      }),\n    );\n\n    // Wait for the stack update to complete\n    await waitForLambdaUpdateComplete(fixture, functionName);\n\n    const driftAfterModification = await fixture.cdk(['drift', fixture.fullStackName('driftable')], { verbose: false });\n\n    const expectedMatches = [\n      /Stack.*driftable/,\n      /[-].*This is my function!/m,\n      /[+].*I'm slowly drifting \\(drifting away\\)/m,\n    ];\n    const expectedSubstrings = [\n      '1 resource has drifted', // num resources drifted\n      '✨  Number of resources with drift: 1',\n      'AWS::Lambda::Function', // the lambda should be marked drifted\n      '/Description', // the resources that have drifted\n    ];\n    for (const expectedMatch of expectedMatches) {\n      expect(driftAfterModification).toMatch(expectedMatch);\n    }\n    for (const expectedSubstring of expectedSubstrings) {\n      expect(driftAfterModification).toContain(expectedSubstring);\n    }\n  }),\n);\n\nasync function waitForLambdaUpdateComplete(fixture: any, functionName: string): Promise<void> {\n  const delaySeconds = 5;\n  const timeout = 30_000; // timeout after 30s\n  const deadline = Date.now() + timeout;\n\n  while (true) {\n    const response = await fixture.aws.lambda.send(\n      new GetFunctionCommand({\n        FunctionName: functionName,\n      }),\n    );\n\n    const lastUpdateStatus = response.Configuration?.LastUpdateStatus;\n\n    if (lastUpdateStatus === 'Successful') {\n      return; // Update completed successfully\n    }\n\n    if (lastUpdateStatus === 'Failed') {\n      throw new Error('Lambda function update failed');\n    }\n\n    if (Date.now() > deadline) {\n      throw new Error(`Timed out after ${timeout / 1000} seconds.`);\n    }\n\n    // Wait before checking again\n    await sleep(delaySeconds * 1000);\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLWNkay1kcmlmdC5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjZGstY2RrLWRyaWZ0LmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBFQUErRTtBQUMvRSwwREFBNEU7QUFDNUUsbURBQThEO0FBQzlELHNDQUE2RDtBQUU3RCxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyx5RUFBeUU7QUFFM0csSUFBQSxlQUFTLEVBQ1AsV0FBVyxFQUNYLElBQUEsd0JBQWtCLEVBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFO0lBQ25DLE1BQU0sT0FBTyxDQUFDLFNBQVMsQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFekMsc0ZBQXNGO0lBQ3RGLE1BQU0sS0FBSyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUVuRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyw4Q0FBOEM7SUFDekYsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQzdDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLENBQUMsc0NBQXNDLENBQUMsQ0FBQztJQUNoRSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLG9EQUFvRDtJQUU5RiwrQ0FBK0M7SUFDL0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQ3BELElBQUkscURBQTZCLENBQUM7UUFDaEMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDO0tBQzlDLENBQUMsQ0FDSCxDQUFDO0lBQ0YsTUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQ2xELFFBQVEsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLFlBQVksS0FBSyx1QkFBdUIsQ0FDOUQsQ0FBQztJQUNGLElBQUksQ0FBQyxjQUFjLElBQUksQ0FBQyxjQUFjLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUMxRCxNQUFNLElBQUksS0FBSyxDQUFDLG1EQUFtRCxDQUFDLENBQUM7SUFDdkUsQ0FBQztJQUNELE1BQU0sWUFBWSxHQUFHLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQztJQUV2RCxnREFBZ0Q7SUFDaEQsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQzNCLElBQUksa0RBQWtDLENBQUM7UUFDckMsWUFBWSxFQUFFLFlBQVk7UUFDMUIsV0FBVyxFQUFFLHNDQUFzQztLQUNwRCxDQUFDLENBQ0gsQ0FBQztJQUVGLHdDQUF3QztJQUN4QyxNQUFNLElBQUEsMkNBQTJCLEVBQUMsT0FBTyxFQUFFLFlBQVksQ0FBQyxDQUFDO0lBRXpELE1BQU0sc0JBQXNCLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBRXBILE1BQU0sZUFBZSxHQUFHO1FBQ3RCLGtCQUFrQjtRQUNsQiw0QkFBNEI7UUFDNUIsNkNBQTZDO0tBQzlDLENBQUM7SUFDRixNQUFNLGtCQUFrQixHQUFHO1FBQ3pCLHdCQUF3QixFQUFFLHdCQUF3QjtRQUNsRCxzQ0FBc0M7UUFDdEMsdUJBQXVCLEVBQUUsc0NBQXNDO1FBQy9ELGNBQWMsRUFBRSxrQ0FBa0M7S0FDbkQsQ0FBQztJQUNGLEtBQUssTUFBTSxhQUFhLElBQUksZUFBZSxFQUFFLENBQUM7UUFDNUMsTUFBTSxDQUFDLHNCQUFzQixDQUFDLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFDRCxLQUFLLE1BQU0saUJBQWlCLElBQUksa0JBQWtCLEVBQUUsQ0FBQztRQUNuRCxNQUFNLENBQUMsc0JBQXNCLENBQUMsQ0FBQyxTQUFTLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUM5RCxDQUFDO0FBQ0gsQ0FBQyxDQUFDLENBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERlc2NyaWJlU3RhY2tSZXNvdXJjZXNDb21tYW5kIH0gZnJvbSAnQGF3cy1zZGsvY2xpZW50LWNsb3VkZm9ybWF0aW9uJztcbmltcG9ydCB7IFVwZGF0ZUZ1bmN0aW9uQ29uZmlndXJhdGlvbkNvbW1hbmQgfSBmcm9tICdAYXdzLXNkay9jbGllbnQtbGFtYmRhJztcbmltcG9ydCB7IHdhaXRGb3JMYW1iZGFVcGRhdGVDb21wbGV0ZSB9IGZyb20gJy4vZHJpZnRfaGVscGVycyc7XG5pbXBvcnQgeyBpbnRlZ1Rlc3QsIHdpdGhEZWZhdWx0Rml4dHVyZSB9IGZyb20gJy4uLy4uLy4uL2xpYic7XG5cbmplc3Quc2V0VGltZW91dCgyICogNjAgKiA2MF8wMDApOyAvLyBJbmNsdWRlcyB0aGUgdGltZSB0byBhY3F1aXJlIGxvY2tzLCB3b3JzdC1jYXNlIHNpbmdsZS10aHJlYWRlZCBydW50aW1lXG5cbmludGVnVGVzdChcbiAgJ2NkayBkcmlmdCcsXG4gIHdpdGhEZWZhdWx0Rml4dHVyZShhc3luYyAoZml4dHVyZSkgPT4ge1xuICAgIGF3YWl0IGZpeHR1cmUuY2RrRGVwbG95KCdkcmlmdGFibGUnLCB7fSk7XG5cbiAgICAvLyBBc3NlcnQgdGhhdCwgcmlnaHQgYWZ0ZXIgZGVwbG95aW5nLCB0aGVyZSBpcyBubyBkcmlmdCAoYmVjYXVzZSB3ZSBqdXN0IGRlcGxveWVkIGl0KVxuICAgIGNvbnN0IGRyaWZ0ID0gYXdhaXQgZml4dHVyZS5jZGsoWydkcmlmdCcsIGZpeHR1cmUuZnVsbFN0YWNrTmFtZSgnZHJpZnRhYmxlJyldLCB7IHZlcmJvc2U6IGZhbHNlIH0pO1xuXG4gICAgZXhwZWN0KGRyaWZ0KS50b01hdGNoKC9TdGFjay4qZHJpZnRhYmxlLyk7IC8vIGNhbid0IGp1c3QgLnRvQ29udGFpbiBiZWNhdXNlIG9mIGZvcm1hdHRpbmdcbiAgICBleHBlY3QoZHJpZnQpLnRvQ29udGFpbignTm8gZHJpZnQgZGV0ZWN0ZWQnKTtcbiAgICBleHBlY3QoZHJpZnQpLnRvQ29udGFpbign4pyoICBOdW1iZXIgb2YgcmVzb3VyY2VzIHdpdGggZHJpZnQ6IDAnKTtcbiAgICBleHBlY3QoZHJpZnQpLm5vdC50b0NvbnRhaW4oJ3VuY2hlY2tlZCcpOyAvLyBzaG91bGQgbm90IHNlZSB1bmNoZWNrZWQgcmVzb3VyY2VzIHVubGVzcyB2ZXJib3NlXG5cbiAgICAvLyBHZXQgdGhlIExhbWJkYSwgd2Ugd2FudCB0byBub3cgbWFrZSBpdCBkcmlmdFxuICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZml4dHVyZS5hd3MuY2xvdWRGb3JtYXRpb24uc2VuZChcbiAgICAgIG5ldyBEZXNjcmliZVN0YWNrUmVzb3VyY2VzQ29tbWFuZCh7XG4gICAgICAgIFN0YWNrTmFtZTogZml4dHVyZS5mdWxsU3RhY2tOYW1lKCdkcmlmdGFibGUnKSxcbiAgICAgIH0pLFxuICAgICk7XG4gICAgY29uc3QgbGFtYmRhUmVzb3VyY2UgPSByZXNwb25zZS5TdGFja1Jlc291cmNlcz8uZmluZChcbiAgICAgIHJlc291cmNlID0+IHJlc291cmNlLlJlc291cmNlVHlwZSA9PT0gJ0FXUzo6TGFtYmRhOjpGdW5jdGlvbicsXG4gICAgKTtcbiAgICBpZiAoIWxhbWJkYVJlc291cmNlIHx8ICFsYW1iZGFSZXNvdXJjZS5QaHlzaWNhbFJlc291cmNlSWQpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignQ291bGQgbm90IGZpbmQgTGFtYmRhIGZ1bmN0aW9uIGluIHN0YWNrIHJlc291cmNlcycpO1xuICAgIH1cbiAgICBjb25zdCBmdW5jdGlvbk5hbWUgPSBsYW1iZGFSZXNvdXJjZS5QaHlzaWNhbFJlc291cmNlSWQ7XG5cbiAgICAvLyBVcGRhdGUgdGhlIExhbWJkYSBmdW5jdGlvbiwgaW50cm9kdWNpbmcgZHJpZnRcbiAgICBhd2FpdCBmaXh0dXJlLmF3cy5sYW1iZGEuc2VuZChcbiAgICAgIG5ldyBVcGRhdGVGdW5jdGlvbkNvbmZpZ3VyYXRpb25Db21tYW5kKHtcbiAgICAgICAgRnVuY3Rpb25OYW1lOiBmdW5jdGlvbk5hbWUsXG4gICAgICAgIERlc2NyaXB0aW9uOiAnSVxcJ20gc2xvd2x5IGRyaWZ0aW5nIChkcmlmdGluZyBhd2F5KScsXG4gICAgICB9KSxcbiAgICApO1xuXG4gICAgLy8gV2FpdCBmb3IgdGhlIHN0YWNrIHVwZGF0ZSB0byBjb21wbGV0ZVxuICAgIGF3YWl0IHdhaXRGb3JMYW1iZGFVcGRhdGVDb21wbGV0ZShmaXh0dXJlLCBmdW5jdGlvbk5hbWUpO1xuXG4gICAgY29uc3QgZHJpZnRBZnRlck1vZGlmaWNhdGlvbiA9IGF3YWl0IGZpeHR1cmUuY2RrKFsnZHJpZnQnLCBmaXh0dXJlLmZ1bGxTdGFja05hbWUoJ2RyaWZ0YWJsZScpXSwgeyB2ZXJib3NlOiBmYWxzZSB9KTtcblxuICAgIGNvbnN0IGV4cGVjdGVkTWF0Y2hlcyA9IFtcbiAgICAgIC9TdGFjay4qZHJpZnRhYmxlLyxcbiAgICAgIC9bLV0uKlRoaXMgaXMgbXkgZnVuY3Rpb24hL20sXG4gICAgICAvWytdLipJJ20gc2xvd2x5IGRyaWZ0aW5nIFxcKGRyaWZ0aW5nIGF3YXlcXCkvbSxcbiAgICBdO1xuICAgIGNvbnN0IGV4cGVjdGVkU3Vic3RyaW5ncyA9IFtcbiAgICAgICcxIHJlc291cmNlIGhhcyBkcmlmdGVkJywgLy8gbnVtIHJlc291cmNlcyBkcmlmdGVkXG4gICAgICAn4pyoICBOdW1iZXIgb2YgcmVzb3VyY2VzIHdpdGggZHJpZnQ6IDEnLFxuICAgICAgJ0FXUzo6TGFtYmRhOjpGdW5jdGlvbicsIC8vIHRoZSBsYW1iZGEgc2hvdWxkIGJlIG1hcmtlZCBkcmlmdGVkXG4gICAgICAnL0Rlc2NyaXB0aW9uJywgLy8gdGhlIHJlc291cmNlcyB0aGF0IGhhdmUgZHJpZnRlZFxuICAgIF07XG4gICAgZm9yIChjb25zdCBleHBlY3RlZE1hdGNoIG9mIGV4cGVjdGVkTWF0Y2hlcykge1xuICAgICAgZXhwZWN0KGRyaWZ0QWZ0ZXJNb2RpZmljYXRpb24pLnRvTWF0Y2goZXhwZWN0ZWRNYXRjaCk7XG4gICAgfVxuICAgIGZvciAoY29uc3QgZXhwZWN0ZWRTdWJzdHJpbmcgb2YgZXhwZWN0ZWRTdWJzdHJpbmdzKSB7XG4gICAgICBleHBlY3QoZHJpZnRBZnRlck1vZGlmaWNhdGlvbikudG9Db250YWluKGV4cGVjdGVkU3Vic3RyaW5nKTtcbiAgICB9XG4gIH0pLFxuKTtcbiJdfQ==

package/tests/cli-integ-tests/drift/drift_helpers.d.ts

@@ -0,0 +1 @@
+export declare function waitForLambdaUpdateComplete(fixture: any, functionName: string): Promise<void>;

package/tests/cli-integ-tests/drift/drift_helpers.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForLambdaUpdateComplete = waitForLambdaUpdateComplete;
+const client_lambda_1 = require("@aws-sdk/client-lambda");
+const lib_1 = require("../../../lib");
+async function waitForLambdaUpdateComplete(fixture, functionName) {
+    const delaySeconds = 5;
+    const timeout = 30_000; // timeout after 30s
+    const deadline = Date.now() + timeout;
+    while (true) {
+        const response = await fixture.aws.lambda.send(new client_lambda_1.GetFunctionCommand({
+            FunctionName: functionName,
+        }));
+        const lastUpdateStatus = response.Configuration?.LastUpdateStatus;
+        if (lastUpdateStatus === 'Successful') {
+            return; // Update completed successfully
+        }
+        if (lastUpdateStatus === 'Failed') {
+            throw new Error('Lambda function update failed');
+        }
+        if (Date.now() > deadline) {
+            throw new Error(`Timed out after ${timeout / 1000} seconds.`);
+        }
+        // Wait before checking again
+        await (0, lib_1.sleep)(delaySeconds * 1000);
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHJpZnRfaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImRyaWZ0X2hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFHQSxrRUE2QkM7QUFoQ0QsMERBQTREO0FBQzVELHNDQUFxQztBQUU5QixLQUFLLFVBQVUsMkJBQTJCLENBQUMsT0FBWSxFQUFFLFlBQW9CO0lBQ2xGLE1BQU0sWUFBWSxHQUFHLENBQUMsQ0FBQztJQUN2QixNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsQ0FBQyxvQkFBb0I7SUFDNUMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQztJQUV0QyxPQUFPLElBQUksRUFBRSxDQUFDO1FBQ1osTUFBTSxRQUFRLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQzVDLElBQUksa0NBQWtCLENBQUM7WUFDckIsWUFBWSxFQUFFLFlBQVk7U0FDM0IsQ0FBQyxDQUNILENBQUM7UUFFRixNQUFNLGdCQUFnQixHQUFHLFFBQVEsQ0FBQyxhQUFhLEVBQUUsZ0JBQWdCLENBQUM7UUFFbEUsSUFBSSxnQkFBZ0IsS0FBSyxZQUFZLEVBQUUsQ0FBQztZQUN0QyxPQUFPLENBQUMsZ0NBQWdDO1FBQzFDLENBQUM7UUFFRCxJQUFJLGdCQUFnQixLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQ2xDLE1BQU0sSUFBSSxLQUFLLENBQUMsK0JBQStCLENBQUMsQ0FBQztRQUNuRCxDQUFDO1FBRUQsSUFBSSxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsUUFBUSxFQUFFLENBQUM7WUFDMUIsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsT0FBTyxHQUFHLElBQUksV0FBVyxDQUFDLENBQUM7UUFDaEUsQ0FBQztRQUVELDZCQUE2QjtRQUM3QixNQUFNLElBQUEsV0FBSyxFQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsQ0FBQztJQUNuQyxDQUFDO0FBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEdldEZ1bmN0aW9uQ29tbWFuZCB9IGZyb20gJ0Bhd3Mtc2RrL2NsaWVudC1sYW1iZGEnO1xuaW1wb3J0IHsgc2xlZXAgfSBmcm9tICcuLi8uLi8uLi9saWInO1xuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gd2FpdEZvckxhbWJkYVVwZGF0ZUNvbXBsZXRlKGZpeHR1cmU6IGFueSwgZnVuY3Rpb25OYW1lOiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+IHtcbiAgY29uc3QgZGVsYXlTZWNvbmRzID0gNTtcbiAgY29uc3QgdGltZW91dCA9IDMwXzAwMDsgLy8gdGltZW91dCBhZnRlciAzMHNcbiAgY29uc3QgZGVhZGxpbmUgPSBEYXRlLm5vdygpICsgdGltZW91dDtcblxuICB3aGlsZSAodHJ1ZSkge1xuICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZml4dHVyZS5hd3MubGFtYmRhLnNlbmQoXG4gICAgICBuZXcgR2V0RnVuY3Rpb25Db21tYW5kKHtcbiAgICAgICAgRnVuY3Rpb25OYW1lOiBmdW5jdGlvbk5hbWUsXG4gICAgICB9KSxcbiAgICApO1xuXG4gICAgY29uc3QgbGFzdFVwZGF0ZVN0YXR1cyA9IHJlc3BvbnNlLkNvbmZpZ3VyYXRpb24/Lkxhc3RVcGRhdGVTdGF0dXM7XG5cbiAgICBpZiAobGFzdFVwZGF0ZVN0YXR1cyA9PT0gJ1N1Y2Nlc3NmdWwnKSB7XG4gICAgICByZXR1cm47IC8vIFVwZGF0ZSBjb21wbGV0ZWQgc3VjY2Vzc2Z1bGx5XG4gICAgfVxuXG4gICAgaWYgKGxhc3RVcGRhdGVTdGF0dXMgPT09ICdGYWlsZWQnKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoJ0xhbWJkYSBmdW5jdGlvbiB1cGRhdGUgZmFpbGVkJyk7XG4gICAgfVxuXG4gICAgaWYgKERhdGUubm93KCkgPiBkZWFkbGluZSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKGBUaW1lZCBvdXQgYWZ0ZXIgJHt0aW1lb3V0IC8gMTAwMH0gc2Vjb25kcy5gKTtcbiAgICB9XG5cbiAgICAvLyBXYWl0IGJlZm9yZSBjaGVja2luZyBhZ2FpblxuICAgIGF3YWl0IHNsZWVwKGRlbGF5U2Vjb25kcyAqIDEwMDApO1xuICB9XG59XG4iXX0=

package/tests/cli-integ-tests/metadata/cdk-metadata.integtest.d.ts

@@ -0,0 +1 @@
+export {};

package/tests/cli-integ-tests/metadata/cdk-metadata.integtest.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lib_1 = require("../../../lib");
+jest.setTimeout(2 * 60 * 60_000);
+(0, lib_1.integTest)('cdk metadata displays stack metadata', (0, lib_1.withDefaultFixture)(async (fixture) => {
+    await fixture.cdk(['synth', fixture.fullStackName('test-2')]);
+    const output = await fixture.cdk(['metadata', fixture.fullStackName('test-2')]);
+    // Most basic metadata type
+    expect(output).toContain('aws:cdk:logicalId');
+}));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLW1ldGFkYXRhLmludGVndGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNkay1tZXRhZGF0YS5pbnRlZ3Rlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxzQ0FBNkQ7QUFFN0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLE1BQU0sQ0FBQyxDQUFDO0FBRWpDLElBQUEsZUFBUyxFQUNQLHNDQUFzQyxFQUN0QyxJQUFBLHdCQUFrQixFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUNuQyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDOUQsTUFBTSxNQUFNLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRWhGLDJCQUEyQjtJQUMzQixNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsU0FBUyxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFDaEQsQ0FBQyxDQUFDLENBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGludGVnVGVzdCwgd2l0aERlZmF1bHRGaXh0dXJlIH0gZnJvbSAnLi4vLi4vLi4vbGliJztcblxuamVzdC5zZXRUaW1lb3V0KDIgKiA2MCAqIDYwXzAwMCk7XG5cbmludGVnVGVzdChcbiAgJ2NkayBtZXRhZGF0YSBkaXNwbGF5cyBzdGFjayBtZXRhZGF0YScsXG4gIHdpdGhEZWZhdWx0Rml4dHVyZShhc3luYyAoZml4dHVyZSkgPT4ge1xuICAgIGF3YWl0IGZpeHR1cmUuY2RrKFsnc3ludGgnLCBmaXh0dXJlLmZ1bGxTdGFja05hbWUoJ3Rlc3QtMicpXSk7XG4gICAgY29uc3Qgb3V0cHV0ID0gYXdhaXQgZml4dHVyZS5jZGsoWydtZXRhZGF0YScsIGZpeHR1cmUuZnVsbFN0YWNrTmFtZSgndGVzdC0yJyldKTtcblxuICAgIC8vIE1vc3QgYmFzaWMgbWV0YWRhdGEgdHlwZVxuICAgIGV4cGVjdChvdXRwdXQpLnRvQ29udGFpbignYXdzOmNkazpsb2dpY2FsSWQnKTtcbiAgfSksXG4pO1xuIl19

package/tests/cli-integ-tests/watch/cdk-watch-detects-file-changes-with-glob-patterns-negative.integtest.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 const path = require("path");
 const watch_helpers_1 = require("./watch-helpers");
 const lib_1 = require("../../../lib");
-jest.setTimeout(3 * 60 * 1000); // 3 minutes for watch tests
+jest.setTimeout(5 * 60 * 1000); // 5 minutes for watch tests
 (0, lib_1.integTest)('cdk watch does NOT detect file changes for excluded patterns', (0, lib_1.withDefaultFixture)(async (fixture) => {
     // Create a test file that will be watched (for initial deploy)
     const watchedFile = path.join(fixture.integTestDir, 'watched-file.ts');
@@ -20,13 +20,12 @@ jest.setTimeout(3 * 60 * 1000); // 3 minutes for watch tests
     fs.writeFileSync(cdkJsonPath, JSON.stringify(cdkJson, null, 2));
     await fixture.cli.makeCliAvailable();
     let output = '';
-    // Start cdk watch with detached process group for clean termination
+    // Start cdk watch
     const watchProcess = child_process.spawn('cdk', [
         'watch', '--hotswap', '-v', fixture.fullStackName('test-1'),
     ], {
         cwd: fixture.integTestDir,
-        shell: true,
-        detached: true,
+        stdio: 'pipe',
         env: { ...process.env, ...fixture.cdkShellEnv() },
     });
     try {
@@ -63,10 +62,8 @@ jest.setTimeout(3 * 60 * 1000); // 3 minutes for watch tests
         fixture.log('✓ Watch still detects changes to included files');
     }
     finally {
-        // Kill the entire process group (negative PID)
-        if (watchProcess.pid) {
-            process.kill(-watchProcess.pid, 'SIGTERM');
-        }
+        (0, watch_helpers_1.safeKillProcess)(watchProcess);
     }
+    expect.assertions(5);
 }));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cdk-watch-detects-file-changes-with-glob-patterns-negative.integtest.js","sourceRoot":"","sources":["cdk-watch-detects-file-changes-with-glob-patterns-negative.integtest.ts"],"names":[],"mappings":";;AAAA,+CAA+C;AAC/C,yBAAyB;AACzB,6BAA6B;AAC7B,mDAAgD;AAChD,sCAAoE;AAEpE,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,4BAA4B;AAE5D,IAAA,eAAS,EACP,8DAA8D,EAC9D,IAAA,wBAAkB,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACnC,+DAA+D;IAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IACvE,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,8BAA8B,CAAC,CAAC;IAE9D,uEAAuE;IACvE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAClE,OAAO,CAAC,KAAK,GAAG;QACd,OAAO,EAAE,CAAC,SAAS,CAAC;QACpB,OAAO,EAAE,CAAC,kBAAkB,CAAC;KAC9B,CAAC;IACF,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAEhE,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAErC,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,oEAAoE;IACpE,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE;QAC9C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;KAC5D,EAAE;QACD,GAAG,EAAE,OAAO,CAAC,YAAY;QACzB,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,IAAI;QACd,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,EAAE;KAClD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACvC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACvC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,6BAAa,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,iCAAiC,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QAEtC,MAAM,IAAA,6BAAa,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAE9C,kDAAkD;QAClD,MAAM,iBAAiB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QAE1E,kEAAkE;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,+BAA+B,CAAC,CAAC;QACtF,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,+BAA+B,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;QAEpE,gEAAgE;QAChE,MAAM,IAAA,WAAK,EAAC,IAAI,CAAC,CAAC;QAElB,4DAA4D;QAC5D,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC9F,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAErC,2CAA2C;QAC3C,MAAM,gBAAgB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACzE,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAEjD,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;QAEvD,8DAA8D;QAC9D,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,+BAA+B,CAAC,CAAC;QAE/D,MAAM,IAAA,6BAAa,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;IACjE,CAAC;YAAS,CAAC;QACT,+CAA+C;QAC/C,IAAI,YAAY,CAAC,GAAG,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;AACH,CAAC,CAAC,CACH,CAAC","sourcesContent":["import * as child_process from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { waitForOutput } from './watch-helpers';\nimport { integTest, withDefaultFixture, sleep } from '../../../lib';\n\njest.setTimeout(3 * 60 * 1000); // 3 minutes for watch tests\n\nintegTest(\n  'cdk watch does NOT detect file changes for excluded patterns',\n  withDefaultFixture(async (fixture) => {\n    // Create a test file that will be watched (for initial deploy)\n    const watchedFile = path.join(fixture.integTestDir, 'watched-file.ts');\n    fs.writeFileSync(watchedFile, 'export const initial = true;');\n\n    // Update cdk.json to include watch configuration with specific exclude\n    const cdkJsonPath = path.join(fixture.integTestDir, 'cdk.json');\n    const cdkJson = JSON.parse(fs.readFileSync(cdkJsonPath, 'utf-8'));\n    cdkJson.watch = {\n      include: ['**/*.ts'],\n      exclude: ['**/*.excluded.ts'],\n    };\n    fs.writeFileSync(cdkJsonPath, JSON.stringify(cdkJson, null, 2));\n\n    await fixture.cli.makeCliAvailable();\n\n    let output = '';\n\n    // Start cdk watch with detached process group for clean termination\n    const watchProcess = child_process.spawn('cdk', [\n      'watch', '--hotswap', '-v', fixture.fullStackName('test-1'),\n    ], {\n      cwd: fixture.integTestDir,\n      shell: true,\n      detached: true,\n      env: { ...process.env, ...fixture.cdkShellEnv() },\n    });\n\n    try {\n      watchProcess.stdout?.on('data', (data) => {\n        output += data.toString();\n        fixture.log(data.toString());\n      });\n      watchProcess.stderr?.on('data', (data) => {\n        output += data.toString();\n        fixture.log(data.toString());\n      });\n\n      await waitForOutput(() => output, \"Triggering initial 'cdk deploy'\");\n      fixture.log('✓ Watch start detected');\n\n      await waitForOutput(() => output, 'deployment time');\n      fixture.log('✓ Initial deployment completed');\n\n      // Count deployments before creating excluded file\n      const deploymentsBefore = (output.match(/deployment time/g) || []).length;\n\n      // Create an excluded file - this should NOT trigger a watch event\n      const excludedFile = path.join(fixture.integTestDir, 'should-be-ignored.excluded.ts');\n      fs.writeFileSync(excludedFile, 'export const excluded = true;');\n      fixture.log('Created excluded file: should-be-ignored.excluded.ts');\n\n      // Wait a reasonable time for any potential (unwanted) detection\n      await sleep(5000);\n\n      // Verify no \"Detected change\" message for the excluded file\n      const detectedExcluded = output.includes('Detected change to') && output.includes('excluded');\n      expect(detectedExcluded).toBe(false);\n\n      // Verify deployment count hasn't increased\n      const deploymentsAfter = (output.match(/deployment time/g) || []).length;\n      expect(deploymentsAfter).toBe(deploymentsBefore);\n\n      fixture.log('✓ Watch correctly ignored excluded file');\n\n      // Now modify a watched file to confirm watch is still working\n      fs.writeFileSync(watchedFile, 'export const modified = true;');\n\n      await waitForOutput(() => output, 'Detected change to');\n      fixture.log('✓ Watch still detects changes to included files');\n    } finally {\n      // Kill the entire process group (negative PID)\n      if (watchProcess.pid) {\n        process.kill(-watchProcess.pid, 'SIGTERM');\n      }\n    }\n  }),\n);\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cdk-watch-detects-file-changes-with-glob-patterns-negative.integtest.js","sourceRoot":"","sources":["cdk-watch-detects-file-changes-with-glob-patterns-negative.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import * as child_process from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { waitForOutput, safeKillProcess } from './watch-helpers';\nimport { integTest, withDefaultFixture, sleep } from '../../../lib';\n\njest.setTimeout(5 * 60 * 1000); // 5 minutes for watch tests\n\nintegTest(\n  'cdk watch does NOT detect file changes for excluded patterns',\n  withDefaultFixture(async (fixture) => {\n    // Create a test file that will be watched (for initial deploy)\n    const watchedFile = path.join(fixture.integTestDir, 'watched-file.ts');\n    fs.writeFileSync(watchedFile, 'export const initial = true;');\n\n    // Update cdk.json to include watch configuration with specific exclude\n    const cdkJsonPath = path.join(fixture.integTestDir, 'cdk.json');\n    const cdkJson = JSON.parse(fs.readFileSync(cdkJsonPath, 'utf-8'));\n    cdkJson.watch = {\n      include: ['**/*.ts'],\n      exclude: ['**/*.excluded.ts'],\n    };\n    fs.writeFileSync(cdkJsonPath, JSON.stringify(cdkJson, null, 2));\n\n    await fixture.cli.makeCliAvailable();\n\n    let output = '';\n\n    // Start cdk watch\n    const watchProcess = child_process.spawn('cdk', [\n      'watch', '--hotswap', '-v', fixture.fullStackName('test-1'),\n    ], {\n      cwd: fixture.integTestDir,\n      stdio: 'pipe',\n      env: { ...process.env, ...fixture.cdkShellEnv() },\n    });\n\n    try {\n      watchProcess.stdout?.on('data', (data) => {\n        output += data.toString();\n        fixture.log(data.toString());\n      });\n      watchProcess.stderr?.on('data', (data) => {\n        output += data.toString();\n        fixture.log(data.toString());\n      });\n\n      await waitForOutput(() => output, \"Triggering initial 'cdk deploy'\");\n      fixture.log('✓ Watch start detected');\n\n      await waitForOutput(() => output, 'deployment time');\n      fixture.log('✓ Initial deployment completed');\n\n      // Count deployments before creating excluded file\n      const deploymentsBefore = (output.match(/deployment time/g) || []).length;\n\n      // Create an excluded file - this should NOT trigger a watch event\n      const excludedFile = path.join(fixture.integTestDir, 'should-be-ignored.excluded.ts');\n      fs.writeFileSync(excludedFile, 'export const excluded = true;');\n      fixture.log('Created excluded file: should-be-ignored.excluded.ts');\n\n      // Wait a reasonable time for any potential (unwanted) detection\n      await sleep(5000);\n\n      // Verify no \"Detected change\" message for the excluded file\n      const detectedExcluded = output.includes('Detected change to') && output.includes('excluded');\n      expect(detectedExcluded).toBe(false);\n\n      // Verify deployment count hasn't increased\n      const deploymentsAfter = (output.match(/deployment time/g) || []).length;\n      expect(deploymentsAfter).toBe(deploymentsBefore);\n\n      fixture.log('✓ Watch correctly ignored excluded file');\n\n      // Now modify a watched file to confirm watch is still working\n      fs.writeFileSync(watchedFile, 'export const modified = true;');\n\n      await waitForOutput(() => output, 'Detected change to');\n      fixture.log('✓ Watch still detects changes to included files');\n    } finally {\n      safeKillProcess(watchProcess);\n    }\n\n    expect.assertions(5);\n  }),\n);\n"]}

package/tests/cli-integ-tests/watch/cdk-watch-detects-file-changes-with-glob-patterns.integtest.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 const path = require("path");
 const watch_helpers_1 = require("./watch-helpers");
 const lib_1 = require("../../../lib");
-jest.setTimeout(3 * 60 * 1000); // 3 minutes for watch tests
+jest.setTimeout(5 * 60 * 1000); // 5 minutes for watch tests
 (0, lib_1.integTest)('cdk watch detects file changes with glob patterns', (0, lib_1.withDefaultFixture)(async (fixture) => {
     // Create a test file that will be watched
     const testFile = path.join(fixture.integTestDir, 'watch-test-file.ts');
@@ -19,13 +19,12 @@ jest.setTimeout(3 * 60 * 1000); // 3 minutes for watch tests
     fs.writeFileSync(cdkJsonPath, JSON.stringify(cdkJson, null, 2));
     await fixture.cli.makeCliAvailable();
     let output = '';
-    // Start cdk watch with detached process group for clean termination
+    // Start cdk watch
     const watchProcess = child_process.spawn('cdk', [
         'watch', '--hotswap', '-v', fixture.fullStackName('test-1'),
     ], {
         cwd: fixture.integTestDir,
-        shell: true,
-        detached: true,
+        stdio: 'pipe',
         env: { ...process.env, ...fixture.cdkShellEnv() },
     });
     try {
@@ -42,7 +41,7 @@ jest.setTimeout(3 * 60 * 1000); // 3 minutes for watch tests
         await (0, watch_helpers_1.waitForOutput)(() => output, 'deployment time');
         fixture.log('✓ Initial deployment completed');
         // Update the test file timestamp to trigger a watch event
-        child_process.spawn('touch', [testFile]);
+        child_process.spawnSync('touch', [testFile]);
         await (0, watch_helpers_1.waitForOutput)(() => output, 'Detected change to');
         fixture.log('✓ Watch detected file change');
         // Wait for the second deployment to complete (2 occurrences of 'deployment time')
@@ -50,10 +49,8 @@ jest.setTimeout(3 * 60 * 1000); // 3 minutes for watch tests
         fixture.log('✓ Second deployment completed');
     }
     finally {
-        // Kill the entire process group (negative PID)
-        if (watchProcess.pid) {
-            process.kill(-watchProcess.pid, 'SIGTERM');
-        }
+        (0, watch_helpers_1.safeKillProcess)(watchProcess);
     }
+    expect.assertions(4);
 }));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLXdhdGNoLWRldGVjdHMtZmlsZS1jaGFuZ2VzLXdpdGgtZ2xvYi1wYXR0ZXJucy5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjZGstd2F0Y2gtZGV0ZWN0cy1maWxlLWNoYW5nZXMtd2l0aC1nbG9iLXBhdHRlcm5zLmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLCtDQUErQztBQUMvQyx5QkFBeUI7QUFDekIsNkJBQTZCO0FBQzdCLG1EQUFrRTtBQUNsRSxzQ0FBNkQ7QUFFN0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsNEJBQTRCO0FBRTVELElBQUEsZUFBUyxFQUNQLG1EQUFtRCxFQUNuRCxJQUFBLHdCQUFrQixFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUNuQywwQ0FBMEM7SUFDMUMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLG9CQUFvQixDQUFDLENBQUM7SUFDdkUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUUsOEJBQThCLENBQUMsQ0FBQztJQUUzRCxpREFBaUQ7SUFDakQsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2hFLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUNsRSxPQUFPLENBQUMsS0FBSyxHQUFHO1FBQ2QsT0FBTyxFQUFFLENBQUMsU0FBUyxDQUFDO0tBQ3JCLENBQUM7SUFDRixFQUFFLENBQUMsYUFBYSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUVoRSxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUVyQyxJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFFaEIsb0VBQW9FO0lBQ3BFLE1BQU0sWUFBWSxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFO1FBQzlDLE9BQU8sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDO0tBQzVELEVBQUU7UUFDRCxHQUFHLEVBQUUsT0FBTyxDQUFDLFlBQVk7UUFDekIsS0FBSyxFQUFFLElBQUk7UUFDWCxRQUFRLEVBQUUsSUFBSTtRQUNkLEdBQUcsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQyxXQUFXLEVBQUUsRUFBRTtLQUNsRCxDQUFDLENBQUM7SUFFSCxJQUFJLENBQUM7UUFDSCxZQUFZLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUN2QyxNQUFNLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDL0IsQ0FBQyxDQUFDLENBQUM7UUFDSCxZQUFZLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUN2QyxNQUFNLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDL0IsQ0FBQyxDQUFDLENBQUM7UUFFSCxNQUFNLElBQUEsNkJBQWEsRUFBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLEVBQUUsaUNBQWlDLENBQUMsQ0FBQztRQUNyRSxPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFFdEMsTUFBTSxJQUFBLDZCQUFhLEVBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDckQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBRTlDLDBEQUEwRDtRQUMxRCxhQUFhLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFFekMsTUFBTSxJQUFBLDZCQUFhLEVBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLG9CQUFvQixDQUFDLENBQUM7UUFDeEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO1FBRTVDLGtGQUFrRjtRQUNsRixNQUFNLElBQUEsZ0NBQWdCLEVBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGtCQUFrQixDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ25GLE9BQU8sQ0FBQyxHQUFHLENBQUMsK0JBQStCLENBQUMsQ0FBQztJQUMvQyxDQUFDO1lBQVMsQ0FBQztRQUNULCtDQUErQztRQUMvQyxJQUFJLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUNyQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsWUFBWSxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUM3QyxDQUFDO0lBQ0gsQ0FBQztBQUNILENBQUMsQ0FBQyxDQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBjaGlsZF9wcm9jZXNzIGZyb20gJ2NoaWxkX3Byb2Nlc3MnO1xuaW1wb3J0ICogYXMgZnMgZnJvbSAnZnMnO1xuaW1wb3J0ICogYXMgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCB7IHdhaXRGb3JPdXRwdXQsIHdhaXRGb3JDb25kaXRpb24gfSBmcm9tICcuL3dhdGNoLWhlbHBlcnMnO1xuaW1wb3J0IHsgaW50ZWdUZXN0LCB3aXRoRGVmYXVsdEZpeHR1cmUgfSBmcm9tICcuLi8uLi8uLi9saWInO1xuXG5qZXN0LnNldFRpbWVvdXQoMyAqIDYwICogMTAwMCk7IC8vIDMgbWludXRlcyBmb3Igd2F0Y2ggdGVzdHNcblxuaW50ZWdUZXN0KFxuICAnY2RrIHdhdGNoIGRldGVjdHMgZmlsZSBjaGFuZ2VzIHdpdGggZ2xvYiBwYXR0ZXJucycsXG4gIHdpdGhEZWZhdWx0Rml4dHVyZShhc3luYyAoZml4dHVyZSkgPT4ge1xuICAgIC8vIENyZWF0ZSBhIHRlc3QgZmlsZSB0aGF0IHdpbGwgYmUgd2F0Y2hlZFxuICAgIGNvbnN0IHRlc3RGaWxlID0gcGF0aC5qb2luKGZpeHR1cmUuaW50ZWdUZXN0RGlyLCAnd2F0Y2gtdGVzdC1maWxlLnRzJyk7XG4gICAgZnMud3JpdGVGaWxlU3luYyh0ZXN0RmlsZSwgJ2V4cG9ydCBjb25zdCBpbml0aWFsID0gdHJ1ZTsnKTtcblxuICAgIC8vIFVwZGF0ZSBjZGsuanNvbiB0byBpbmNsdWRlIHdhdGNoIGNvbmZpZ3VyYXRpb25cbiAgICBjb25zdCBjZGtKc29uUGF0aCA9IHBhdGguam9pbihmaXh0dXJlLmludGVnVGVzdERpciwgJ2Nkay5qc29uJyk7XG4gICAgY29uc3QgY2RrSnNvbiA9IEpTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGNka0pzb25QYXRoLCAndXRmLTgnKSk7XG4gICAgY2RrSnNvbi53YXRjaCA9IHtcbiAgICAgIGluY2x1ZGU6IFsnKiovKi50cyddLFxuICAgIH07XG4gICAgZnMud3JpdGVGaWxlU3luYyhjZGtKc29uUGF0aCwgSlNPTi5zdHJpbmdpZnkoY2RrSnNvbiwgbnVsbCwgMikpO1xuXG4gICAgYXdhaXQgZml4dHVyZS5jbGkubWFrZUNsaUF2YWlsYWJsZSgpO1xuXG4gICAgbGV0IG91dHB1dCA9ICcnO1xuXG4gICAgLy8gU3RhcnQgY2RrIHdhdGNoIHdpdGggZGV0YWNoZWQgcHJvY2VzcyBncm91cCBmb3IgY2xlYW4gdGVybWluYXRpb25cbiAgICBjb25zdCB3YXRjaFByb2Nlc3MgPSBjaGlsZF9wcm9jZXNzLnNwYXduKCdjZGsnLCBbXG4gICAgICAnd2F0Y2gnLCAnLS1ob3Rzd2FwJywgJy12JywgZml4dHVyZS5mdWxsU3RhY2tOYW1lKCd0ZXN0LTEnKSxcbiAgICBdLCB7XG4gICAgICBjd2Q6IGZpeHR1cmUuaW50ZWdUZXN0RGlyLFxuICAgICAgc2hlbGw6IHRydWUsXG4gICAgICBkZXRhY2hlZDogdHJ1ZSxcbiAgICAgIGVudjogeyAuLi5wcm9jZXNzLmVudiwgLi4uZml4dHVyZS5jZGtTaGVsbEVudigpIH0sXG4gICAgfSk7XG5cbiAgICB0cnkge1xuICAgICAgd2F0Y2hQcm9jZXNzLnN0ZG91dD8ub24oJ2RhdGEnLCAoZGF0YSkgPT4ge1xuICAgICAgICBvdXRwdXQgKz0gZGF0YS50b1N0cmluZygpO1xuICAgICAgICBmaXh0dXJlLmxvZyhkYXRhLnRvU3RyaW5nKCkpO1xuICAgICAgfSk7XG4gICAgICB3YXRjaFByb2Nlc3Muc3RkZXJyPy5vbignZGF0YScsIChkYXRhKSA9PiB7XG4gICAgICAgIG91dHB1dCArPSBkYXRhLnRvU3RyaW5nKCk7XG4gICAgICAgIGZpeHR1cmUubG9nKGRhdGEudG9TdHJpbmcoKSk7XG4gICAgICB9KTtcblxuICAgICAgYXdhaXQgd2FpdEZvck91dHB1dCgoKSA9PiBvdXRwdXQsIFwiVHJpZ2dlcmluZyBpbml0aWFsICdjZGsgZGVwbG95J1wiKTtcbiAgICAgIGZpeHR1cmUubG9nKCfinJMgV2F0Y2ggc3RhcnQgZGV0ZWN0ZWQnKTtcblxuICAgICAgYXdhaXQgd2FpdEZvck91dHB1dCgoKSA9PiBvdXRwdXQsICdkZXBsb3ltZW50IHRpbWUnKTtcbiAgICAgIGZpeHR1cmUubG9nKCfinJMgSW5pdGlhbCBkZXBsb3ltZW50IGNvbXBsZXRlZCcpO1xuXG4gICAgICAvLyBVcGRhdGUgdGhlIHRlc3QgZmlsZSB0aW1lc3RhbXAgdG8gdHJpZ2dlciBhIHdhdGNoIGV2ZW50XG4gICAgICBjaGlsZF9wcm9jZXNzLnNwYXduKCd0b3VjaCcsIFt0ZXN0RmlsZV0pO1xuXG4gICAgICBhd2FpdCB3YWl0Rm9yT3V0cHV0KCgpID0+IG91dHB1dCwgJ0RldGVjdGVkIGNoYW5nZSB0bycpO1xuICAgICAgZml4dHVyZS5sb2coJ+KckyBXYXRjaCBkZXRlY3RlZCBmaWxlIGNoYW5nZScpO1xuXG4gICAgICAvLyBXYWl0IGZvciB0aGUgc2Vjb25kIGRlcGxveW1lbnQgdG8gY29tcGxldGUgKDIgb2NjdXJyZW5jZXMgb2YgJ2RlcGxveW1lbnQgdGltZScpXG4gICAgICBhd2FpdCB3YWl0Rm9yQ29uZGl0aW9uKCgpID0+IChvdXRwdXQubWF0Y2goL2RlcGxveW1lbnQgdGltZS9nKSB8fCBbXSkubGVuZ3RoID49IDIpO1xuICAgICAgZml4dHVyZS5sb2coJ+KckyBTZWNvbmQgZGVwbG95bWVudCBjb21wbGV0ZWQnKTtcbiAgICB9IGZpbmFsbHkge1xuICAgICAgLy8gS2lsbCB0aGUgZW50aXJlIHByb2Nlc3MgZ3JvdXAgKG5lZ2F0aXZlIFBJRClcbiAgICAgIGlmICh3YXRjaFByb2Nlc3MucGlkKSB7XG4gICAgICAgIHByb2Nlc3Mua2lsbCgtd2F0Y2hQcm9jZXNzLnBpZCwgJ1NJR1RFUk0nKTtcbiAgICAgIH1cbiAgICB9XG4gIH0pLFxuKTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLXdhdGNoLWRldGVjdHMtZmlsZS1jaGFuZ2VzLXdpdGgtZ2xvYi1wYXR0ZXJucy5pbnRlZ3Rlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjZGstd2F0Y2gtZGV0ZWN0cy1maWxlLWNoYW5nZXMtd2l0aC1nbG9iLXBhdHRlcm5zLmludGVndGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLCtDQUErQztBQUMvQyx5QkFBeUI7QUFDekIsNkJBQTZCO0FBQzdCLG1EQUFtRjtBQUNuRixzQ0FBNkQ7QUFFN0QsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsNEJBQTRCO0FBRTVELElBQUEsZUFBUyxFQUNQLG1EQUFtRCxFQUNuRCxJQUFBLHdCQUFrQixFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRTtJQUNuQywwQ0FBMEM7SUFDMUMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLG9CQUFvQixDQUFDLENBQUM7SUFDdkUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUUsOEJBQThCLENBQUMsQ0FBQztJQUUzRCxpREFBaUQ7SUFDakQsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBQ2hFLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUNsRSxPQUFPLENBQUMsS0FBSyxHQUFHO1FBQ2QsT0FBTyxFQUFFLENBQUMsU0FBUyxDQUFDO0tBQ3JCLENBQUM7SUFDRixFQUFFLENBQUMsYUFBYSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUVoRSxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztJQUVyQyxJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFFaEIsa0JBQWtCO0lBQ2xCLE1BQU0sWUFBWSxHQUFHLGFBQWEsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFO1FBQzlDLE9BQU8sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDO0tBQzVELEVBQUU7UUFDRCxHQUFHLEVBQUUsT0FBTyxDQUFDLFlBQVk7UUFDekIsS0FBSyxFQUFFLE1BQU07UUFDYixHQUFHLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUMsV0FBVyxFQUFFLEVBQUU7S0FDbEQsQ0FBQyxDQUFDO0lBRUgsSUFBSSxDQUFDO1FBQ0gsWUFBWSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDdkMsTUFBTSxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQy9CLENBQUMsQ0FBQyxDQUFDO1FBQ0gsWUFBWSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDdkMsTUFBTSxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQy9CLENBQUMsQ0FBQyxDQUFDO1FBRUgsTUFBTSxJQUFBLDZCQUFhLEVBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLGlDQUFpQyxDQUFDLENBQUM7UUFDckUsT0FBTyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1FBRXRDLE1BQU0sSUFBQSw2QkFBYSxFQUFDLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3JELE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztRQUU5QywwREFBMEQ7UUFDMUQsYUFBYSxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBRTdDLE1BQU0sSUFBQSw2QkFBYSxFQUFDLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3hELE9BQU8sQ0FBQyxHQUFHLENBQUMsOEJBQThCLENBQUMsQ0FBQztRQUU1QyxrRkFBa0Y7UUFDbEYsTUFBTSxJQUFBLGdDQUFnQixFQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLE1BQU0sSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNuRixPQUFPLENBQUMsR0FBRyxDQUFDLCtCQUErQixDQUFDLENBQUM7SUFDL0MsQ0FBQztZQUFTLENBQUM7UUFDVCxJQUFBLCtCQUFlLEVBQUMsWUFBWSxDQUFDLENBQUM7SUFDaEMsQ0FBQztJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDdkIsQ0FBQyxDQUFDLENBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIGNoaWxkX3Byb2Nlc3MgZnJvbSAnY2hpbGRfcHJvY2Vzcyc7XG5pbXBvcnQgKiBhcyBmcyBmcm9tICdmcyc7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0IHsgd2FpdEZvck91dHB1dCwgd2FpdEZvckNvbmRpdGlvbiwgc2FmZUtpbGxQcm9jZXNzIH0gZnJvbSAnLi93YXRjaC1oZWxwZXJzJztcbmltcG9ydCB7IGludGVnVGVzdCwgd2l0aERlZmF1bHRGaXh0dXJlIH0gZnJvbSAnLi4vLi4vLi4vbGliJztcblxuamVzdC5zZXRUaW1lb3V0KDUgKiA2MCAqIDEwMDApOyAvLyA1IG1pbnV0ZXMgZm9yIHdhdGNoIHRlc3RzXG5cbmludGVnVGVzdChcbiAgJ2NkayB3YXRjaCBkZXRlY3RzIGZpbGUgY2hhbmdlcyB3aXRoIGdsb2IgcGF0dGVybnMnLFxuICB3aXRoRGVmYXVsdEZpeHR1cmUoYXN5bmMgKGZpeHR1cmUpID0+IHtcbiAgICAvLyBDcmVhdGUgYSB0ZXN0IGZpbGUgdGhhdCB3aWxsIGJlIHdhdGNoZWRcbiAgICBjb25zdCB0ZXN0RmlsZSA9IHBhdGguam9pbihmaXh0dXJlLmludGVnVGVzdERpciwgJ3dhdGNoLXRlc3QtZmlsZS50cycpO1xuICAgIGZzLndyaXRlRmlsZVN5bmModGVzdEZpbGUsICdleHBvcnQgY29uc3QgaW5pdGlhbCA9IHRydWU7Jyk7XG5cbiAgICAvLyBVcGRhdGUgY2RrLmpzb24gdG8gaW5jbHVkZSB3YXRjaCBjb25maWd1cmF0aW9uXG4gICAgY29uc3QgY2RrSnNvblBhdGggPSBwYXRoLmpvaW4oZml4dHVyZS5pbnRlZ1Rlc3REaXIsICdjZGsuanNvbicpO1xuICAgIGNvbnN0IGNka0pzb24gPSBKU09OLnBhcnNlKGZzLnJlYWRGaWxlU3luYyhjZGtKc29uUGF0aCwgJ3V0Zi04JykpO1xuICAgIGNka0pzb24ud2F0Y2ggPSB7XG4gICAgICBpbmNsdWRlOiBbJyoqLyoudHMnXSxcbiAgICB9O1xuICAgIGZzLndyaXRlRmlsZVN5bmMoY2RrSnNvblBhdGgsIEpTT04uc3RyaW5naWZ5KGNka0pzb24sIG51bGwsIDIpKTtcblxuICAgIGF3YWl0IGZpeHR1cmUuY2xpLm1ha2VDbGlBdmFpbGFibGUoKTtcblxuICAgIGxldCBvdXRwdXQgPSAnJztcblxuICAgIC8vIFN0YXJ0IGNkayB3YXRjaFxuICAgIGNvbnN0IHdhdGNoUHJvY2VzcyA9IGNoaWxkX3Byb2Nlc3Muc3Bhd24oJ2NkaycsIFtcbiAgICAgICd3YXRjaCcsICctLWhvdHN3YXAnLCAnLXYnLCBmaXh0dXJlLmZ1bGxTdGFja05hbWUoJ3Rlc3QtMScpLFxuICAgIF0sIHtcbiAgICAgIGN3ZDogZml4dHVyZS5pbnRlZ1Rlc3REaXIsXG4gICAgICBzdGRpbzogJ3BpcGUnLFxuICAgICAgZW52OiB7IC4uLnByb2Nlc3MuZW52LCAuLi5maXh0dXJlLmNka1NoZWxsRW52KCkgfSxcbiAgICB9KTtcblxuICAgIHRyeSB7XG4gICAgICB3YXRjaFByb2Nlc3Muc3Rkb3V0Py5vbignZGF0YScsIChkYXRhKSA9PiB7XG4gICAgICAgIG91dHB1dCArPSBkYXRhLnRvU3RyaW5nKCk7XG4gICAgICAgIGZpeHR1cmUubG9nKGRhdGEudG9TdHJpbmcoKSk7XG4gICAgICB9KTtcbiAgICAgIHdhdGNoUHJvY2Vzcy5zdGRlcnI/Lm9uKCdkYXRhJywgKGRhdGEpID0+IHtcbiAgICAgICAgb3V0cHV0ICs9IGRhdGEudG9TdHJpbmcoKTtcbiAgICAgICAgZml4dHVyZS5sb2coZGF0YS50b1N0cmluZygpKTtcbiAgICAgIH0pO1xuXG4gICAgICBhd2FpdCB3YWl0Rm9yT3V0cHV0KCgpID0+IG91dHB1dCwgXCJUcmlnZ2VyaW5nIGluaXRpYWwgJ2NkayBkZXBsb3knXCIpO1xuICAgICAgZml4dHVyZS5sb2coJ+KckyBXYXRjaCBzdGFydCBkZXRlY3RlZCcpO1xuXG4gICAgICBhd2FpdCB3YWl0Rm9yT3V0cHV0KCgpID0+IG91dHB1dCwgJ2RlcGxveW1lbnQgdGltZScpO1xuICAgICAgZml4dHVyZS5sb2coJ+KckyBJbml0aWFsIGRlcGxveW1lbnQgY29tcGxldGVkJyk7XG5cbiAgICAgIC8vIFVwZGF0ZSB0aGUgdGVzdCBmaWxlIHRpbWVzdGFtcCB0byB0cmlnZ2VyIGEgd2F0Y2ggZXZlbnRcbiAgICAgIGNoaWxkX3Byb2Nlc3Muc3Bhd25TeW5jKCd0b3VjaCcsIFt0ZXN0RmlsZV0pO1xuXG4gICAgICBhd2FpdCB3YWl0Rm9yT3V0cHV0KCgpID0+IG91dHB1dCwgJ0RldGVjdGVkIGNoYW5nZSB0bycpO1xuICAgICAgZml4dHVyZS5sb2coJ+KckyBXYXRjaCBkZXRlY3RlZCBmaWxlIGNoYW5nZScpO1xuXG4gICAgICAvLyBXYWl0IGZvciB0aGUgc2Vjb25kIGRlcGxveW1lbnQgdG8gY29tcGxldGUgKDIgb2NjdXJyZW5jZXMgb2YgJ2RlcGxveW1lbnQgdGltZScpXG4gICAgICBhd2FpdCB3YWl0Rm9yQ29uZGl0aW9uKCgpID0+IChvdXRwdXQubWF0Y2goL2RlcGxveW1lbnQgdGltZS9nKSB8fCBbXSkubGVuZ3RoID49IDIpO1xuICAgICAgZml4dHVyZS5sb2coJ+KckyBTZWNvbmQgZGVwbG95bWVudCBjb21wbGV0ZWQnKTtcbiAgICB9IGZpbmFsbHkge1xuICAgICAgc2FmZUtpbGxQcm9jZXNzKHdhdGNoUHJvY2Vzcyk7XG4gICAgfVxuXG4gICAgZXhwZWN0LmFzc2VydGlvbnMoNCk7XG4gIH0pLFxuKTtcbiJdfQ==

package/tests/cli-integ-tests/watch/watch-helpers.d.ts

@@ -1,6 +1,4 @@
-/**
- * Shared helper functions for watch integration tests.
- */
+import type { ChildProcess } from 'node:child_process';
 /**
  * Wait for a specific string to appear in the output.
  */
@@ -9,3 +7,7 @@ export declare function waitForOutput(getOutput: () => string, searchString: str
  * Wait for a condition to become true.
  */
 export declare function waitForCondition(condition: () => boolean): Promise<void>;
+/**
+ * Kill a spawned process.
+ */
+export declare function safeKillProcess(proc: ChildProcess): void;

package/tests/cli-integ-tests/watch/watch-helpers.js

@@ -1,18 +1,20 @@
 "use strict";
-/**
- * Shared helper functions for watch integration tests.
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForOutput = waitForOutput;
 exports.waitForCondition = waitForCondition;
+exports.safeKillProcess = safeKillProcess;
+const DEFAULT_POLL_TIMEOUT = 120_000; // 2 minutes
 /**
- * Poll a condition until we see it.
+ * Poll a condition until we see it, with a timeout.
  */
-async function poll(condition) {
-    return new Promise((resolve) => {
+async function poll(condition, timeoutMs = DEFAULT_POLL_TIMEOUT) {
+    return new Promise((resolve, reject) => {
+        const deadline = Date.now() + timeoutMs;
         const check = () => {
             if (condition())
                 return resolve();
+            if (Date.now() >= deadline)
+                return reject(new Error(`poll timed out after ${timeoutMs}ms`));
             setTimeout(check, 1000);
         };
         check();
@@ -22,12 +24,25 @@ async function poll(condition) {
  * Wait for a specific string to appear in the output.
  */
 async function waitForOutput(getOutput, searchString) {
-    return poll(() => getOutput().includes(searchString));
+    await poll(() => getOutput().includes(searchString));
+    expect(getOutput()).toContain(searchString);
 }
 /**
  * Wait for a condition to become true.
  */
 async function waitForCondition(condition) {
-    return poll(condition);
+    await poll(condition);
+    expect(condition()).toBe(true);
+}
+/**
+ * Kill a spawned process.
+ */
+function safeKillProcess(proc) {
+    try {
+        proc.kill('SIGKILL');
+    }
+    catch {
+        // process may have already exited
+    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0Y2gtaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIndhdGNoLWhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOztHQUVHOztBQWtCSCxzQ0FFQztBQUtELDRDQUVDO0FBekJEOztHQUVHO0FBQ0gsS0FBSyxVQUFVLElBQUksQ0FBQyxTQUF3QjtJQUMxQyxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUU7UUFDN0IsTUFBTSxLQUFLLEdBQUcsR0FBRyxFQUFFO1lBQ2pCLElBQUksU0FBUyxFQUFFO2dCQUFFLE9BQU8sT0FBTyxFQUFFLENBQUM7WUFDbEMsVUFBVSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQztRQUMxQixDQUFDLENBQUM7UUFDRixLQUFLLEVBQUUsQ0FBQztJQUNWLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUVEOztHQUVHO0FBQ0ksS0FBSyxVQUFVLGFBQWEsQ0FBQyxTQUF1QixFQUFFLFlBQW9CO0lBQy9FLE9BQU8sSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLFNBQVMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO0FBQ3hELENBQUM7QUFFRDs7R0FFRztBQUNJLEtBQUssVUFBVSxnQkFBZ0IsQ0FBQyxTQUF3QjtJQUM3RCxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUN6QixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBTaGFyZWQgaGVscGVyIGZ1bmN0aW9ucyBmb3Igd2F0Y2ggaW50ZWdyYXRpb24gdGVzdHMuXG4gKi9cblxuLyoqXG4gKiBQb2xsIGEgY29uZGl0aW9uIHVudGlsIHdlIHNlZSBpdC5cbiAqL1xuYXN5bmMgZnVuY3Rpb24gcG9sbChjb25kaXRpb246ICgpID0+IGJvb2xlYW4pOiBQcm9taXNlPHZvaWQ+IHtcbiAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PiB7XG4gICAgY29uc3QgY2hlY2sgPSAoKSA9PiB7XG4gICAgICBpZiAoY29uZGl0aW9uKCkpIHJldHVybiByZXNvbHZlKCk7XG4gICAgICBzZXRUaW1lb3V0KGNoZWNrLCAxMDAwKTtcbiAgICB9O1xuICAgIGNoZWNrKCk7XG4gIH0pO1xufVxuXG4vKipcbiAqIFdhaXQgZm9yIGEgc3BlY2lmaWMgc3RyaW5nIHRvIGFwcGVhciBpbiB0aGUgb3V0cHV0LlxuICovXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gd2FpdEZvck91dHB1dChnZXRPdXRwdXQ6ICgpID0+IHN0cmluZywgc2VhcmNoU3RyaW5nOiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+IHtcbiAgcmV0dXJuIHBvbGwoKCkgPT4gZ2V0T3V0cHV0KCkuaW5jbHVkZXMoc2VhcmNoU3RyaW5nKSk7XG59XG5cbi8qKlxuICogV2FpdCBmb3IgYSBjb25kaXRpb24gdG8gYmVjb21lIHRydWUuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiB3YWl0Rm9yQ29uZGl0aW9uKGNvbmRpdGlvbjogKCkgPT4gYm9vbGVhbik6IFByb21pc2U8dm9pZD4ge1xuICByZXR1cm4gcG9sbChjb25kaXRpb24pO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0Y2gtaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIndhdGNoLWhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFzQkEsc0NBR0M7QUFLRCw0Q0FHQztBQUtELDBDQU1DO0FBMUNELE1BQU0sb0JBQW9CLEdBQUcsT0FBTyxDQUFDLENBQUMsWUFBWTtBQUVsRDs7R0FFRztBQUNILEtBQUssVUFBVSxJQUFJLENBQUMsU0FBd0IsRUFBRSxTQUFTLEdBQUcsb0JBQW9CO0lBQzVFLE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDckMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FBQztRQUN4QyxNQUFNLEtBQUssR0FBRyxHQUFHLEVBQUU7WUFDakIsSUFBSSxTQUFTLEVBQUU7Z0JBQUUsT0FBTyxPQUFPLEVBQUUsQ0FBQztZQUNsQyxJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxRQUFRO2dCQUFFLE9BQU8sTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLHdCQUF3QixTQUFTLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDNUYsVUFBVSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQztRQUMxQixDQUFDLENBQUM7UUFDRixLQUFLLEVBQUUsQ0FBQztJQUNWLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUVEOztHQUVHO0FBQ0ksS0FBSyxVQUFVLGFBQWEsQ0FBQyxTQUF1QixFQUFFLFlBQW9CO0lBQy9FLE1BQU0sSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLFNBQVMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQ3JELE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUM5QyxDQUFDO0FBRUQ7O0dBRUc7QUFDSSxLQUFLLFVBQVUsZ0JBQWdCLENBQUMsU0FBd0I7SUFDN0QsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDdEIsTUFBTSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQ2pDLENBQUM7QUFFRDs7R0FFRztBQUNILFNBQWdCLGVBQWUsQ0FBQyxJQUFrQjtJQUNoRCxJQUFJLENBQUM7UUFDSCxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZCLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxrQ0FBa0M7SUFDcEMsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IENoaWxkUHJvY2VzcyB9IGZyb20gJ25vZGU6Y2hpbGRfcHJvY2Vzcyc7XG5cbmNvbnN0IERFRkFVTFRfUE9MTF9USU1FT1VUID0gMTIwXzAwMDsgLy8gMiBtaW51dGVzXG5cbi8qKlxuICogUG9sbCBhIGNvbmRpdGlvbiB1bnRpbCB3ZSBzZWUgaXQsIHdpdGggYSB0aW1lb3V0LlxuICovXG5hc3luYyBmdW5jdGlvbiBwb2xsKGNvbmRpdGlvbjogKCkgPT4gYm9vbGVhbiwgdGltZW91dE1zID0gREVGQVVMVF9QT0xMX1RJTUVPVVQpOiBQcm9taXNlPHZvaWQ+IHtcbiAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHtcbiAgICBjb25zdCBkZWFkbGluZSA9IERhdGUubm93KCkgKyB0aW1lb3V0TXM7XG4gICAgY29uc3QgY2hlY2sgPSAoKSA9PiB7XG4gICAgICBpZiAoY29uZGl0aW9uKCkpIHJldHVybiByZXNvbHZlKCk7XG4gICAgICBpZiAoRGF0ZS5ub3coKSA+PSBkZWFkbGluZSkgcmV0dXJuIHJlamVjdChuZXcgRXJyb3IoYHBvbGwgdGltZWQgb3V0IGFmdGVyICR7dGltZW91dE1zfW1zYCkpO1xuICAgICAgc2V0VGltZW91dChjaGVjaywgMTAwMCk7XG4gICAgfTtcbiAgICBjaGVjaygpO1xuICB9KTtcbn1cblxuLyoqXG4gKiBXYWl0IGZvciBhIHNwZWNpZmljIHN0cmluZyB0byBhcHBlYXIgaW4gdGhlIG91dHB1dC5cbiAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIHdhaXRGb3JPdXRwdXQoZ2V0T3V0cHV0OiAoKSA9PiBzdHJpbmcsIHNlYXJjaFN0cmluZzogc3RyaW5nKTogUHJvbWlzZTx2b2lkPiB7XG4gIGF3YWl0IHBvbGwoKCkgPT4gZ2V0T3V0cHV0KCkuaW5jbHVkZXMoc2VhcmNoU3RyaW5nKSk7XG4gIGV4cGVjdChnZXRPdXRwdXQoKSkudG9Db250YWluKHNlYXJjaFN0cmluZyk7XG59XG5cbi8qKlxuICogV2FpdCBmb3IgYSBjb25kaXRpb24gdG8gYmVjb21lIHRydWUuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiB3YWl0Rm9yQ29uZGl0aW9uKGNvbmRpdGlvbjogKCkgPT4gYm9vbGVhbik6IFByb21pc2U8dm9pZD4ge1xuICBhd2FpdCBwb2xsKGNvbmRpdGlvbik7XG4gIGV4cGVjdChjb25kaXRpb24oKSkudG9CZSh0cnVlKTtcbn1cblxuLyoqXG4gKiBLaWxsIGEgc3Bhd25lZCBwcm9jZXNzLlxuICovXG5leHBvcnQgZnVuY3Rpb24gc2FmZUtpbGxQcm9jZXNzKHByb2M6IENoaWxkUHJvY2Vzcyk6IHZvaWQge1xuICB0cnkge1xuICAgIHByb2Mua2lsbCgnU0lHS0lMTCcpO1xuICB9IGNhdGNoIHtcbiAgICAvLyBwcm9jZXNzIG1heSBoYXZlIGFscmVhZHkgZXhpdGVkXG4gIH1cbn1cbiJdfQ==