@aws-cdk/integ-runner 2.203.0 → 2.203.1

package/lib/workers/extract/index.js

@@ -4766,7 +4766,7 @@ var require_semver2 = __commonJS({
 // ../cloud-assembly-schema/cli-version.json
 var require_cli_version = __commonJS({
   "../cloud-assembly-schema/cli-version.json"(exports2, module2) {
-    module2.exports = { version: "2.1132.0" };
+    module2.exports = { version: "2.1132.1" };
   }
 });
 
@@ -289953,7 +289953,7 @@ function ensureNonEmptyResources(template) {
     };
   }
 }
-function parseAndValidateConstructPaths(paths) {
+function resolveStackAndConstructPaths(paths, availableStackIds) {
   if (paths.length === 0) {
     throw new ToolkitError("MissingConstructPath", "At least one construct path is required (e.g. cdk orphan MyStack/MyTable)");
   }
@@ -289961,25 +289961,31 @@ function parseAndValidateConstructPaths(paths) {
   let stackId;
   for (const raw of paths) {
     const p3 = raw.replace(/^\//, "");
-    const slashIdx = p3.indexOf("/");
-    if (slashIdx < 0) {
-      throw new ToolkitError("InvalidConstructPath", `Construct path '${raw}' must include both a stack name and a construct path separated by '/' (e.g. MyStack/MyTable)`);
+    const matchedStack = availableStackIds.filter((id) => p3 === id || p3.startsWith(`${id}/`)).sort((a6, b6) => b6.length - a6.length)[0];
+    if (!matchedStack) {
+      throw new ToolkitError(
+        "StackNotFound",
+        `No stack found for construct path '${raw}'. Available stacks: ${availableStackIds.join(", ")}`
+      );
+    }
+    const constructPath = p3.substring(matchedStack.length + 1);
+    if (constructPath === "") {
+      throw new ToolkitError(
+        "InvalidConstructPath",
+        `Construct path '${raw}' must include a construct path within the stack (e.g. ${matchedStack}/MyTable)`
+      );
     }
-    const thisStack = p3.substring(0, slashIdx);
-    const constructPath = p3.substring(slashIdx + 1);
-    if (stackId && thisStack !== stackId) {
-      throw new ToolkitError("MultipleStacks", `All construct paths must reference the same stack, but got '${stackId}' and '${thisStack}'`);
+    if (stackId && matchedStack !== stackId) {
+      throw new ToolkitError("MultipleStacks", `All construct paths must reference the same stack, but got '${stackId}' and '${matchedStack}'`);
     }
-    stackId = thisStack;
+    stackId = matchedStack;
     constructPaths.push(constructPath);
   }
   return { stackId, constructPaths };
 }
-var import_cloud_assembly_api16;
 var init_helpers6 = __esm({
   "../toolkit-lib/lib/api/orphan/private/helpers.ts"() {
     "use strict";
-    import_cloud_assembly_api16 = __toESM(require_lib3());
     init_toolkit_error();
     __name(walkObject, "walkObject");
     __name(replaceInObject, "replaceInObject");
@@ -289987,7 +289993,7 @@ var init_helpers6 = __esm({
     __name(removeDependsOn, "removeDependsOn");
     __name(assertDeploySucceeded, "assertDeploySucceeded");
     __name(ensureNonEmptyResources, "ensureNonEmptyResources");
-    __name(parseAndValidateConstructPaths, "parseAndValidateConstructPaths");
+    __name(resolveStackAndConstructPaths, "resolveStackAndConstructPaths");
   }
 });
 
@@ -290376,6 +290382,7 @@ function formatValidationReports(fileRoot, reports) {
   });
   return [
     ...pluginFailures.map(formatPluginFailure),
+    ...successfullyExecutedPlugins.flatMap((r6) => r6.preamble ? [`${import_chalk27.default.underline(sanitize(r6.pluginName))}: ${sanitize(r6.preamble)}`] : []),
     ...violations.map((v) => formatViolationBlock(fileRoot, v))
   ];
 }
@@ -290452,7 +290459,7 @@ function formatConstructInfo(fileRoot, construct) {
   const logicalId = sanitize(construct.cloudFormationResource?.logicalId);
   if (construct.constructPath) {
     const cPath = sanitize(construct.constructPath);
-    parts.push(logicalId ? `${import_chalk27.default.bold(cPath)} (${logicalId})` : import_chalk27.default.bold(cPath));
+    parts.push(logicalId ? `${cPath} (${logicalId})` : cPath);
   } else {
     if (construct.cloudFormationResource?.templatePath) {
       parts.push(humanFriendlyFilename(fileRoot, sanitize(construct.cloudFormationResource.templatePath)));
@@ -291815,16 +291822,13 @@ ${deployResult.stackArn}`));
         try {
           this.requireUnstableFeature("orphan");
           const ioHelper = asIoHelper(this.ioHost, "orphan");
-          const parsed = parseAndValidateConstructPaths(options.constructPaths);
           const assembly = __using(_stack, await synthAndMeasure(ioHelper, cx, ALL_STACKS), true);
           const allStacks = await assembly.selectStacksV2(ALL_STACKS);
+          const parsed = resolveStackAndConstructPaths(
+            options.constructPaths,
+            allStacks.stackArtifacts.map((s) => s.hierarchicalId)
+          );
           const stack = allStacks.stackArtifacts.find((s) => s.hierarchicalId === parsed.stackId);
-          if (!stack) {
-            throw new ToolkitError(
-              "StackNotFound",
-              `No stack found with construct ID '${parsed.stackId}'. Available stacks: ${allStacks.stackArtifacts.map((s) => s.hierarchicalId).join(", ")}`
-            );
-          }
           const deployments = await this.deploymentsForAction("orphan");
           const orphaner = new ResourceOrphaner({
             deployments,
@@ -321423,12 +321427,12 @@ var init_proxy_agent = __esm({
 });
 
 // lib/engines/toolkit-lib.ts
-var path38, import_cloud_assembly_api17, import_toolkit_lib, import_chalk29, fs41, ToolkitLibRunnerEngine, IntegRunnerIoHost, NoopIoHost;
+var path38, import_cloud_assembly_api16, import_toolkit_lib, import_chalk29, fs41, ToolkitLibRunnerEngine, IntegRunnerIoHost, NoopIoHost;
 var init_toolkit_lib = __esm({
   "lib/engines/toolkit-lib.ts"() {
     "use strict";
     path38 = __toESM(require("node:path"));
-    import_cloud_assembly_api17 = __toESM(require_lib3());
+    import_cloud_assembly_api16 = __toESM(require_lib3());
     import_toolkit_lib = __toESM(require_lib11());
     import_chalk29 = __toESM(require_source());
     fs41 = __toESM(require_lib4());
@@ -321655,11 +321659,11 @@ var init_toolkit_lib = __esm({
        * This catches that misconfiguration.
        */
       async validateRegion(asm) {
-        if (this.options.region === import_cloud_assembly_api17.UNKNOWN_REGION) {
+        if (this.options.region === import_cloud_assembly_api16.UNKNOWN_REGION) {
           return;
         }
         for (const stack of asm.cloudAssembly.stacksRecursively) {
-          if (stack.environment.region !== this.options.region && stack.environment.region !== import_cloud_assembly_api17.UNKNOWN_REGION) {
+          if (stack.environment.region !== this.options.region && stack.environment.region !== import_cloud_assembly_api16.UNKNOWN_REGION) {
             this.ioHost.notify({
               action: "deploy",
               code: "CDK_RUNNER_W0000",
@@ -321741,12 +321745,12 @@ var init_files2 = __esm({
 function currentlyRecommendedAwsCdkLibFlags() {
   return recommended_feature_flags_exports;
 }
-var path40, import_cloud_assembly_api18, import_cloud_assembly_schema11, fs42, DESTRUCTIVE_CHANGES, CdkTestApp, DEFAULT_SYNTH_OPTIONS, DEFAULT_ARGS;
+var path40, import_cloud_assembly_api17, import_cloud_assembly_schema11, fs42, DESTRUCTIVE_CHANGES, CdkTestApp, DEFAULT_SYNTH_OPTIONS, DEFAULT_ARGS;
 var init_cdk_test_app = __esm({
   "lib/runner/cdk-test-app.ts"() {
     "use strict";
     path40 = __toESM(require("path"));
-    import_cloud_assembly_api18 = __toESM(require_lib3());
+    import_cloud_assembly_api17 = __toESM(require_lib3());
     import_cloud_assembly_schema11 = __toESM(require_lib2());
     fs42 = __toESM(require_lib4());
     init_integ_test_suite();
@@ -321763,7 +321767,7 @@ var init_cdk_test_app = __esm({
       constructor(options, testSpecificContext) {
         this.options = options;
         this.testSpecificContext = testSpecificContext;
-        this.hasValidRegion = options.region !== import_cloud_assembly_api18.UNKNOWN_REGION;
+        this.hasValidRegion = options.region !== import_cloud_assembly_api17.UNKNOWN_REGION;
         this.test = options.test;
         const outputDirectoryNameTemplate = options.outputDirectoryNameTemplate;
         this.outputDirectory = absAwareJoin(this.test.testDirectory, this.test.specializeTemplate(outputDirectoryNameTemplate));
@@ -322197,7 +322201,7 @@ var init_cdk_test_app = __esm({
       context: {
         // We have traditionally set this, but it's quite a bad idea. It makes region-agnostic stacks undeployable, and there's really no reason for that.
         // However, if we unset this, we will break many existing snapshots so we keep it for now.
-        [import_cloud_assembly_api18.AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY]: ["test-region-1a", "test-region-1b", "test-region-1c"],
+        [import_cloud_assembly_api17.AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY]: ["test-region-1a", "test-region-1b", "test-region-1c"],
         "availability-zones:account=12345678:region=test-region": ["test-region-1a", "test-region-1b", "test-region-1c"],
         "ssm:account=12345678:parameterName=/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2:region=test-region": "ami-1234",
         "ssm:account=12345678:parameterName=/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2:region=test-region": "ami-1234",

package/package.json

@@ -64,11 +64,11 @@
     "ts-jest": "^29.4.11",
     "typescript": "5.9",
     "@aws-cdk/aws-service-spec": "^0.1.190",
-    "@aws-cdk/cdk-assets-lib": "1.4.14",
+    "@aws-cdk/cdk-assets-lib": "1.4.15",
     "@aws-cdk/cloud-assembly-api": "2.3.0",
-    "@aws-cdk/cloud-assembly-schema": ">=54.12.0",
+    "@aws-cdk/cloud-assembly-schema": ">=54.13.0",
     "@aws-cdk/cloudformation-diff": "2.187.2",
-    "@aws-cdk/toolkit-lib": "1.35.0",
+    "@aws-cdk/toolkit-lib": "1.36.0",
     "@aws-sdk/client-cloudformation": "^3",
     "chalk": "^4",
     "chokidar": "^4",
@@ -100,7 +100,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.203.0",
+  "version": "2.203.1",
   "packageManager": "yarn@4.13.0",
   "types": "lib/index.d.ts",
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"yarn projen\"."