@aws-cdk/integ-runner 2.190.3 → 2.190.4

package/lib/workers/extract/index.js

@@ -4878,7 +4878,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.1028.0" };
+    module2.exports = { version: "2.1029.0" };
   }
 });
 
@@ -9830,7 +9830,7 @@ var require_placeholders = __commonJS({
     exports2.EnvironmentPlaceholders = void 0;
     var jsiiDeprecationWarnings = require_warnings_jsii();
     var JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
-    var EnvironmentPlaceholders4 = class _EnvironmentPlaceholders {
+    var EnvironmentPlaceholders5 = class _EnvironmentPlaceholders {
       static {
         __name(this, "EnvironmentPlaceholders");
       }
@@ -9910,12 +9910,12 @@ var require_placeholders = __commonJS({
         return ret;
       }
     };
-    exports2.EnvironmentPlaceholders = EnvironmentPlaceholders4;
+    exports2.EnvironmentPlaceholders = EnvironmentPlaceholders5;
     _a2 = JSII_RTTI_SYMBOL_1;
-    EnvironmentPlaceholders4[_a2] = { fqn: "@aws-cdk/cx-api.EnvironmentPlaceholders", version: "2.213.0" };
-    EnvironmentPlaceholders4.CURRENT_REGION = "${AWS::Region}";
-    EnvironmentPlaceholders4.CURRENT_ACCOUNT = "${AWS::AccountId}";
-    EnvironmentPlaceholders4.CURRENT_PARTITION = "${AWS::Partition}";
+    EnvironmentPlaceholders5[_a2] = { fqn: "@aws-cdk/cx-api.EnvironmentPlaceholders", version: "2.213.0" };
+    EnvironmentPlaceholders5.CURRENT_REGION = "${AWS::Region}";
+    EnvironmentPlaceholders5.CURRENT_ACCOUNT = "${AWS::AccountId}";
+    EnvironmentPlaceholders5.CURRENT_PARTITION = "${AWS::Partition}";
     function replaceAll(s3, search, replace) {
       return s3.split(search).join(replace);
     }
@@ -80205,6 +80205,11 @@ var init_messages = __esm({
         description: "Refactor result",
         interface: "RefactorResult"
       }),
+      CDK_TOOLKIT_I8910: question({
+        code: "CDK_TOOLKIT_I8910",
+        description: "Confirm refactor",
+        interface: "ConfirmationRequest"
+      }),
       CDK_TOOLKIT_W8010: warn({
         code: "CDK_TOOLKIT_W8010",
         description: "Refactor execution not yet supported"
@@ -110311,7 +110316,7 @@ var require_dist_cjs56 = __commonJS({
       CreateGeneratedTemplateCommand: /* @__PURE__ */ __name(() => CreateGeneratedTemplateCommand2, "CreateGeneratedTemplateCommand"),
       CreateStackCommand: /* @__PURE__ */ __name(() => CreateStackCommand2, "CreateStackCommand"),
       CreateStackInstancesCommand: /* @__PURE__ */ __name(() => CreateStackInstancesCommand, "CreateStackInstancesCommand"),
-      CreateStackRefactorCommand: /* @__PURE__ */ __name(() => CreateStackRefactorCommand, "CreateStackRefactorCommand"),
+      CreateStackRefactorCommand: /* @__PURE__ */ __name(() => CreateStackRefactorCommand2, "CreateStackRefactorCommand"),
       CreateStackSetCommand: /* @__PURE__ */ __name(() => CreateStackSetCommand, "CreateStackSetCommand"),
       CreatedButModifiedException: /* @__PURE__ */ __name(() => CreatedButModifiedException, "CreatedButModifiedException"),
       DeactivateOrganizationsAccessCommand: /* @__PURE__ */ __name(() => DeactivateOrganizationsAccessCommand, "DeactivateOrganizationsAccessCommand"),
@@ -110351,7 +110356,7 @@ var require_dist_cjs56 = __commonJS({
       EstimateTemplateCostCommand: /* @__PURE__ */ __name(() => EstimateTemplateCostCommand, "EstimateTemplateCostCommand"),
       EvaluationType: /* @__PURE__ */ __name(() => EvaluationType, "EvaluationType"),
       ExecuteChangeSetCommand: /* @__PURE__ */ __name(() => ExecuteChangeSetCommand2, "ExecuteChangeSetCommand"),
-      ExecuteStackRefactorCommand: /* @__PURE__ */ __name(() => ExecuteStackRefactorCommand, "ExecuteStackRefactorCommand"),
+      ExecuteStackRefactorCommand: /* @__PURE__ */ __name(() => ExecuteStackRefactorCommand2, "ExecuteStackRefactorCommand"),
       ExecutionStatus: /* @__PURE__ */ __name(() => ExecutionStatus, "ExecutionStatus"),
       GeneratedTemplateDeletionPolicy: /* @__PURE__ */ __name(() => GeneratedTemplateDeletionPolicy, "GeneratedTemplateDeletionPolicy"),
       GeneratedTemplateNotFoundException: /* @__PURE__ */ __name(() => GeneratedTemplateNotFoundException, "GeneratedTemplateNotFoundException"),
@@ -110514,8 +110519,8 @@ var require_dist_cjs56 = __commonJS({
       waitUntilStackDeleteComplete: /* @__PURE__ */ __name(() => waitUntilStackDeleteComplete, "waitUntilStackDeleteComplete"),
       waitUntilStackExists: /* @__PURE__ */ __name(() => waitUntilStackExists, "waitUntilStackExists"),
       waitUntilStackImportComplete: /* @__PURE__ */ __name(() => waitUntilStackImportComplete, "waitUntilStackImportComplete"),
-      waitUntilStackRefactorCreateComplete: /* @__PURE__ */ __name(() => waitUntilStackRefactorCreateComplete, "waitUntilStackRefactorCreateComplete"),
-      waitUntilStackRefactorExecuteComplete: /* @__PURE__ */ __name(() => waitUntilStackRefactorExecuteComplete, "waitUntilStackRefactorExecuteComplete"),
+      waitUntilStackRefactorCreateComplete: /* @__PURE__ */ __name(() => waitUntilStackRefactorCreateComplete2, "waitUntilStackRefactorCreateComplete"),
+      waitUntilStackRefactorExecuteComplete: /* @__PURE__ */ __name(() => waitUntilStackRefactorExecuteComplete2, "waitUntilStackRefactorExecuteComplete"),
       waitUntilStackRollbackComplete: /* @__PURE__ */ __name(() => waitUntilStackRollbackComplete, "waitUntilStackRollbackComplete"),
       waitUntilStackUpdateComplete: /* @__PURE__ */ __name(() => waitUntilStackUpdateComplete, "waitUntilStackUpdateComplete"),
       waitUntilTypeRegistrationComplete: /* @__PURE__ */ __name(() => waitUntilTypeRegistrationComplete, "waitUntilTypeRegistrationComplete")
@@ -120607,7 +120612,7 @@ var require_dist_cjs56 = __commonJS({
         __name2(this, "CreateStackInstancesCommand");
       }
     };
-    var CreateStackRefactorCommand = class extends import_smithy_client28.Command.classBuilder().ep(commonParams3).m(function(Command, cs, config, o3) {
+    var CreateStackRefactorCommand2 = class extends import_smithy_client28.Command.classBuilder().ep(commonParams3).m(function(Command, cs, config, o3) {
       return [
         (0, import_middleware_serde5.getSerdePlugin)(config, this.serialize, this.deserialize),
         (0, import_middleware_endpoint8.getEndpointPlugin)(config, Command.getEndpointParameterInstructions())
@@ -121049,7 +121054,7 @@ var require_dist_cjs56 = __commonJS({
         __name2(this, "ExecuteChangeSetCommand");
       }
     };
-    var ExecuteStackRefactorCommand = class extends import_smithy_client28.Command.classBuilder().ep(commonParams3).m(function(Command, cs, config, o3) {
+    var ExecuteStackRefactorCommand2 = class extends import_smithy_client28.Command.classBuilder().ep(commonParams3).m(function(Command, cs, config, o3) {
       return [
         (0, import_middleware_serde5.getSerdePlugin)(config, this.serialize, this.deserialize),
         (0, import_middleware_endpoint8.getEndpointPlugin)(config, Command.getEndpointParameterInstructions())
@@ -121644,7 +121649,7 @@ var require_dist_cjs56 = __commonJS({
       CreateGeneratedTemplateCommand: CreateGeneratedTemplateCommand2,
       CreateStackCommand: CreateStackCommand2,
       CreateStackInstancesCommand,
-      CreateStackRefactorCommand,
+      CreateStackRefactorCommand: CreateStackRefactorCommand2,
       CreateStackSetCommand,
       DeactivateOrganizationsAccessCommand,
       DeactivateTypeCommand,
@@ -121678,7 +121683,7 @@ var require_dist_cjs56 = __commonJS({
       DetectStackSetDriftCommand,
       EstimateTemplateCostCommand,
       ExecuteChangeSetCommand: ExecuteChangeSetCommand2,
-      ExecuteStackRefactorCommand,
+      ExecuteStackRefactorCommand: ExecuteStackRefactorCommand2,
       GetGeneratedTemplateCommand: GetGeneratedTemplateCommand2,
       GetStackPolicyCommand,
       GetTemplateCommand: GetTemplateCommand2,
@@ -122362,7 +122367,7 @@ var require_dist_cjs56 = __commonJS({
       const serviceDefaults = { minDelay: 5, maxDelay: 120 };
       return (0, import_util_waiter.createWaiter)({ ...serviceDefaults, ...params }, input, checkState6);
     }, "waitForStackRefactorCreateComplete");
-    var waitUntilStackRefactorCreateComplete = /* @__PURE__ */ __name2(async (params, input) => {
+    var waitUntilStackRefactorCreateComplete2 = /* @__PURE__ */ __name2(async (params, input) => {
       const serviceDefaults = { minDelay: 5, maxDelay: 120 };
       const result2 = await (0, import_util_waiter.createWaiter)({ ...serviceDefaults, ...params }, input, checkState6);
       return (0, import_util_waiter.checkExceptions)(result2);
@@ -122411,7 +122416,7 @@ var require_dist_cjs56 = __commonJS({
       const serviceDefaults = { minDelay: 15, maxDelay: 120 };
       return (0, import_util_waiter.createWaiter)({ ...serviceDefaults, ...params }, input, checkState7);
     }, "waitForStackRefactorExecuteComplete");
-    var waitUntilStackRefactorExecuteComplete = /* @__PURE__ */ __name2(async (params, input) => {
+    var waitUntilStackRefactorExecuteComplete2 = /* @__PURE__ */ __name2(async (params, input) => {
       const serviceDefaults = { minDelay: 15, maxDelay: 120 };
       const result2 = await (0, import_util_waiter.createWaiter)({ ...serviceDefaults, ...params }, input, checkState7);
       return (0, import_util_waiter.checkExceptions)(result2);
@@ -305502,7 +305507,35 @@ var init_sdk = __esm({
               stackResources.push(...page?.StackSummaries || []);
             }
             return stackResources;
-          }, "paginatedListStacks")
+          }, "paginatedListStacks"),
+          createStackRefactor: /* @__PURE__ */ __name((input) => {
+            return client.send(new import_client_cloudformation.CreateStackRefactorCommand(input));
+          }, "createStackRefactor"),
+          executeStackRefactor: /* @__PURE__ */ __name((input) => {
+            return client.send(new import_client_cloudformation.ExecuteStackRefactorCommand(input));
+          }, "executeStackRefactor"),
+          waitUntilStackRefactorCreateComplete: /* @__PURE__ */ __name((input) => {
+            return (0, import_client_cloudformation.waitUntilStackRefactorCreateComplete)(
+              {
+                client,
+                maxWaitTime: 600,
+                minDelay: 6,
+                maxDelay: 6
+              },
+              input
+            );
+          }, "waitUntilStackRefactorCreateComplete"),
+          waitUntilStackRefactorExecuteComplete: /* @__PURE__ */ __name((input) => {
+            return (0, import_client_cloudformation.waitUntilStackRefactorExecuteComplete)(
+              {
+                client,
+                maxWaitTime: 600,
+                minDelay: 6,
+                maxDelay: 6
+              },
+              input
+            );
+          }, "waitUntilStackRefactorExecuteComplete")
         };
       }
       cloudWatchLogs() {
@@ -311239,7 +311272,7 @@ var init_notices = __esm({
        * Refresh the list of notices this instance is aware of.
        *
        * This method throws an error if the data source fails to fetch notices.
-       * When using, consider if execution should halt immdiately or if catching the rror and continuing is more appropriate
+       * When using, consider if execution should halt immdiately or if catching the error and continuing is more appropriate
        *
        * @throws on failure to refresh the data source
        */
@@ -315612,10 +315645,14 @@ function equalSets(a3, b3) {
   }
   return true;
 }
+function setDiff(a3, b3) {
+  return new Set(Array.from(a3).filter((x3) => !b3.has(x3)));
+}
 var init_sets = __esm({
   "../toolkit-lib/lib/util/sets.ts"() {
     "use strict";
     __name(equalSets, "equalSets");
+    __name(setDiff, "setDiff");
   }
 });
 
@@ -329453,6 +329490,8 @@ function formatAmbiguousMappings(stream2, pairs) {
   formatter.print("Detected ambiguities:");
   formatter.print(tables.join("\n\n"));
   formatter.print(" ");
+  formatter.print(chalk11.yellow("Please provide an override file to resolve these ambiguous mappings."));
+  formatter.print(" ");
   function renderTable([removed, added]) {
     return formatTable([["", "Resource"], renderRemoval(removed), renderAddition(added)], void 0);
   }
@@ -332880,6 +332919,9 @@ var init_cloudformation3 = __esm({
       equalTo(other) {
         return this.logicalResourceId === other.logicalResourceId && this.stack.stackName === other.stack.stackName;
       }
+      get stackName() {
+        return this.stack.stackName;
+      }
     };
     ResourceMapping = class {
       constructor(source, destination) {
@@ -332898,6 +332940,18 @@ var init_cloudformation3 = __esm({
           destinationPath: this.destination.toPath()
         };
       }
+      toCloudFormation() {
+        return {
+          Source: {
+            StackName: this.source.stack.stackName,
+            LogicalResourceId: this.source.logicalResourceId
+          },
+          Destination: {
+            StackName: this.destination.stack.stackName,
+            LogicalResourceId: this.destination.logicalResourceId
+          }
+        };
+      }
     };
   }
 });
@@ -332947,15 +333001,17 @@ var init_graph = __esm({
           }
           if ("Fn::ImportValue" in value) {
             const exp = exports2[value["Fn::ImportValue"]];
-            const v6 = exp.value;
-            if ("Fn::GetAtt" in v6) {
-              const id = Array.isArray(v6["Fn::GetAtt"]) ? v6["Fn::GetAtt"][0] : v6["Fn::GetAtt"].split(".")[0];
-              return [`${exp.stackName}.${id}`];
-            }
-            if ("Ref" in v6) {
-              return [`${exp.stackName}.${v6.Ref}`];
+            if (exp != null) {
+              const v6 = exp.value;
+              if ("Fn::GetAtt" in v6) {
+                const id = Array.isArray(v6["Fn::GetAtt"]) ? v6["Fn::GetAtt"][0] : v6["Fn::GetAtt"].split(".")[0];
+                return [`${exp.stackName}.${id}`];
+              }
+              if ("Ref" in v6) {
+                return [`${exp.stackName}.${v6.Ref}`];
+              }
+              return [`${exp.stackName}.${v6}`];
             }
-            return [`${exp.stackName}.${v6}`];
           }
           const result2 = [];
           if ("DependsOn" in value) {
@@ -333096,11 +333152,14 @@ function stripReferences(value, exports2) {
     return { __cloud_ref__: "DependsOn" };
   }
   if ("Fn::ImportValue" in value) {
-    const v6 = exports2[value["Fn::ImportValue"]].value;
-    if ("Ref" in v6) {
-      return { __cloud_ref__: "Ref" };
-    } else if ("Fn::GetAtt" in v6) {
-      return { __cloud_ref__: "Fn::GetAtt" };
+    const exp = exports2[value["Fn::ImportValue"]];
+    if (exp != null) {
+      const v6 = exp.value;
+      if ("Ref" in v6) {
+        return { __cloud_ref__: "Ref" };
+      } else if ("Fn::GetAtt" in v6) {
+        return { __cloud_ref__: "Fn::GetAtt" };
+      }
     }
   }
   const result2 = {};
@@ -333149,14 +333208,30 @@ function structuralOverrides(deployedStacks, localStacks) {
 function resourceMoves(before, after, direction = "direct", ignoreModifications = false) {
   const digestsBefore = resourceDigests(before, direction);
   const digestsAfter = resourceDigests(after, direction);
-  const stackNames = /* @__PURE__ */ __name((stacks) => stacks.map((s3) => s3.stackName).sort().join(", "), "stackNames");
   if (!(ignoreModifications || isomorphic(digestsBefore, digestsAfter))) {
-    const message2 = [
-      "A refactor operation cannot add, remove or update resources. Only resource moves and renames are allowed. ",
-      "Run 'cdk diff' to compare the local templates to the deployed stacks.\n",
-      `Deployed stacks: ${stackNames(before)}`,
-      `Local stacks: ${stackNames(after)}`
-    ];
+    const message2 = ["A refactor operation cannot add, remove or update resources. Only resource moves and renames are allowed."];
+    const difference2 = /* @__PURE__ */ __name((a3, b3) => {
+      return Array.from(setDiff(new Set(Object.keys(a3)), new Set(Object.keys(b3)))).flatMap((k3) => a3[k3]).map((x3) => `  - ${x3.toPath()}`).sort().join("\n");
+    }, "difference");
+    const stackNames = /* @__PURE__ */ __name((stacks) => stacks.length === 0 ? "NONE" : stacks.map((s3) => s3.stackName).sort().join(", "), "stackNames");
+    const onlyDeployed = difference2(digestsBefore, digestsAfter);
+    const onlyLocal = difference2(digestsAfter, digestsBefore);
+    if (onlyDeployed.length > 0) {
+      message2.push(`The following resources are present only in the AWS environment:
+${onlyDeployed}`);
+    }
+    if (onlyLocal.length > 0) {
+      message2.push(`
+The following resources are present only in your CDK application:
+${onlyLocal}`);
+    }
+    message2.push("");
+    message2.push("The following stacks were used in the comparison:");
+    message2.push(`  - Deployed: ${stackNames(before)}`);
+    message2.push(`  - Local: ${stackNames(after)}`);
+    message2.push("");
+    message2.push("Hint: by default, only deployed stacks that have the same name as a local stack are included.");
+    message2.push("If you want to include additional deployed stacks for comparison, re-run the command with the option '--additional-stack-name=<STACK>' for each stack.");
     throw new ToolkitError(message2.join("\n"));
   }
   return Object.values(removeUnmovedResources(zip(digestsBefore, digestsAfter)));
@@ -333263,20 +333338,49 @@ function partitionByAmbiguity(overrides, moves) {
   __name(remove, "remove");
   return [nonAmbiguous, ambiguous];
 }
-var RefactoringContext;
+async function replaceAwsPlaceholders2(object, aws) {
+  let partition = /* @__PURE__ */ __name(async () => {
+    const p3 = await aws.discoverPartition();
+    partition = /* @__PURE__ */ __name(() => Promise.resolve(p3), "partition");
+    return p3;
+  }, "partition");
+  let account = /* @__PURE__ */ __name(async () => {
+    const a3 = await aws.discoverCurrentAccount();
+    account = /* @__PURE__ */ __name(() => Promise.resolve(a3), "account");
+    return a3;
+  }, "account");
+  return import_cx_api10.EnvironmentPlaceholders.replaceAsync(object, {
+    async region() {
+      return object.region ?? aws.discoverDefaultRegion();
+    },
+    async accountId() {
+      return (await account()).accountId;
+    },
+    async partition() {
+      return partition();
+    }
+  });
+}
+var import_cdk_assets_lib4, import_cx_api10, RefactoringContext;
 var init_context3 = __esm({
   "../toolkit-lib/lib/api/refactoring/context.ts"() {
     "use strict";
+    import_cdk_assets_lib4 = __toESM(require_lib8());
+    import_cx_api10 = __toESM(require_lib3());
     init_cloudformation3();
     init_digest();
     init_toolkit_error();
     init_sets();
+    init_environment();
+    init_plugin2();
     RefactoringContext = class {
       static {
         __name(this, "RefactoringContext");
       }
       _mappings = [];
       ambiguousMoves = [];
+      localStacks;
+      assumeRoleArn;
       environment;
       constructor(props) {
         this.environment = props.environment;
@@ -333285,6 +333389,8 @@ var init_context3 = __esm({
         const overrides = (props.overrides ?? []).concat(additionalOverrides);
         const [nonAmbiguousMoves, ambiguousMoves] = partitionByAmbiguity(overrides, moves);
         this.ambiguousMoves = ambiguousMoves;
+        this.localStacks = props.localStacks;
+        this.assumeRoleArn = props.assumeRoleArn;
         this._mappings = resourceMappings(nonAmbiguousMoves);
       }
       get ambiguousPaths() {
@@ -333297,6 +333403,68 @@ var init_context3 = __esm({
       get mappings() {
         return this._mappings;
       }
+      async execute(stackDefinitions, sdkProvider, ioHelper) {
+        if (this.mappings.length === 0) {
+          return;
+        }
+        const assumeRoleArn = this.assumeRoleArn ?? await this.findRoleToAssume(sdkProvider);
+        const sdk = (await sdkProvider.forEnvironment(this.environment, 1 /* ForWriting */, {
+          assumeRoleArn
+        })).sdk;
+        await this.checkBootstrapVersion(sdk, ioHelper);
+        const cfn = sdk.cloudFormation();
+        const mappings = this.mappings;
+        const input = {
+          ResourceMappings: mappings.map((m3) => m3.toCloudFormation()),
+          StackDefinitions: stackDefinitions
+        };
+        const refactor = await cfn.createStackRefactor(input);
+        await cfn.waitUntilStackRefactorCreateComplete({
+          StackRefactorId: refactor.StackRefactorId
+        });
+        await cfn.executeStackRefactor({
+          StackRefactorId: refactor.StackRefactorId
+        });
+        await cfn.waitUntilStackRefactorExecuteComplete({
+          StackRefactorId: refactor.StackRefactorId
+        });
+      }
+      async checkBootstrapVersion(sdk, ioHelper) {
+        const environmentResourcesRegistry = new EnvironmentResourcesRegistry();
+        const envResources = environmentResourcesRegistry.for(this.environment, sdk, ioHelper);
+        let bootstrapVersion = void 0;
+        try {
+          bootstrapVersion = (await envResources.lookupToolkit()).version;
+        } catch (e3) {
+        }
+        if (bootstrapVersion != null && bootstrapVersion < 28) {
+          const environment = `aws://${this.environment.account}/${this.environment.region}`;
+          throw new ToolkitError(
+            `The CDK toolkit stack in environment ${environment} doesn't support refactoring. Please run 'cdk bootstrap ${environment}' to update it.`
+          );
+        }
+      }
+      async findRoleToAssume(sdkProvider) {
+        const env = this.environment;
+        const roleArns = new Set(
+          this.localStacks.filter((s3) => s3.environment.account === env.account && s3.environment.region === env.region).map((s3) => s3.assumeRoleArn)
+        );
+        if (roleArns.size === 0) {
+          return void 0;
+        }
+        if (roleArns.size !== 1) {
+          throw new ToolkitError(
+            `Multiple stacks in environment aws://${env.account}/${env.region} have different deployment role ARNs. Cannot proceed.`
+          );
+        }
+        const arn = Array.from(roleArns)[0];
+        if (arn != null) {
+          const resolvedEnv = await sdkProvider.resolveEnvironment(env);
+          const region = resolvedEnv.region;
+          return (await replaceAwsPlaceholders2({ region, assumeRoleArn: arn }, new import_cdk_assets_lib4.DefaultAwsClient())).assumeRoleArn;
+        }
+        return void 0;
+      }
     };
     __name(structuralOverrides, "structuralOverrides");
     __name(resourceMoves, "resourceMoves");
@@ -333307,6 +333475,7 @@ var init_context3 = __esm({
     __name(isAmbiguousMove, "isAmbiguousMove");
     __name(resourceMappings, "resourceMappings");
     __name(partitionByAmbiguity, "partitionByAmbiguity");
+    __name(replaceAwsPlaceholders2, "replaceAwsPlaceholders");
   }
 });
 
@@ -333732,14 +333901,14 @@ function bootstrapVersionFromTemplate(template) {
 function bootstrapVariantFromTemplate(template) {
   return template.Parameters?.[BOOTSTRAP_VARIANT_PARAMETER]?.Default ?? DEFAULT_BOOTSTRAP_VARIANT;
 }
-var os8, path22, import_cloud_assembly_schema7, import_cx_api10, fs25, BootstrapStack;
+var os8, path22, import_cloud_assembly_schema7, import_cx_api11, fs25, BootstrapStack;
 var init_deploy_bootstrap = __esm({
   "../toolkit-lib/lib/api/bootstrap/deploy-bootstrap.ts"() {
     "use strict";
     os8 = __toESM(require("os"));
     path22 = __toESM(require("path"));
     import_cloud_assembly_schema7 = __toESM(require_lib2());
-    import_cx_api10 = __toESM(require_lib3());
+    import_cx_api11 = __toESM(require_lib3());
     fs25 = __toESM(require_lib6());
     init_bootstrap_props();
     init_deployments2();
@@ -333809,14 +333978,14 @@ var init_deploy_bootstrap = __esm({
           }
         }
         const outdir = await fs25.mkdtemp(path22.join(os8.tmpdir(), "cdk-bootstrap"));
-        const builder = new import_cx_api10.CloudAssemblyBuilder(outdir);
+        const builder = new import_cx_api11.CloudAssemblyBuilder(outdir);
         const templateFile = `${this.toolkitStackName}.template.json`;
         await fs25.writeJson(path22.join(builder.outdir, templateFile), template, {
           spaces: 2
         });
         builder.addArtifact(this.toolkitStackName, {
           type: import_cloud_assembly_schema7.ArtifactType.AWS_CLOUDFORMATION_STACK,
-          environment: import_cx_api10.EnvironmentUtils.format(this.resolvedEnvironment.account, this.resolvedEnvironment.region),
+          environment: import_cx_api11.EnvironmentUtils.format(this.resolvedEnvironment.account, this.resolvedEnvironment.region),
           properties: {
             templateFile,
             terminationProtection: options.terminationProtection ?? false
@@ -335553,6 +335722,59 @@ var init_logs_monitor3 = __esm({
   }
 });
 
+// ../toolkit-lib/lib/api/refactoring/stack-definitions.ts
+function generateStackDefinitions(mappings, deployedStacks, localStacks) {
+  const deployedStackMap = new Map(deployedStacks.map((s3) => [s3.stackName, s3]));
+  for (const localStack of localStacks) {
+    const deployedStack = deployedStackMap.get(localStack.stackName);
+    const localTemplate = localStack.template;
+    const deployedTemplate = deployedStack?.template;
+    if (deployedTemplate?.Resources?.CDKMetadata != null) {
+      localTemplate.Resources = localTemplate.Resources ?? {};
+      localTemplate.Resources.CDKMetadata = deployedTemplate.Resources.CDKMetadata;
+    } else {
+      delete localTemplate.Resources?.CDKMetadata;
+    }
+  }
+  const stacksToProcess = localStacks.filter((localStack) => {
+    const deployedStack = deployedStackMap.get(localStack.stackName);
+    return !deployedStack || !deepEqual4(localStack.template, deployedStack.template);
+  });
+  for (let mapping of mappings) {
+    const stackName = mapping.source.stackName;
+    if (!localStacks.some((s3) => s3.stackName === stackName)) {
+      const deployedStack = deployedStackMap.get(stackName);
+      delete deployedStack?.template.Resources?.[mapping.source.logicalResourceId];
+      delete deployedStack?.template.Outputs;
+      if (deployedStack && !stacksToProcess.some((s3) => s3.stackName === stackName)) {
+        stacksToProcess.push(deployedStack);
+      }
+    }
+  }
+  for (const stack of stacksToProcess) {
+    if (!deployedStacks.some((deployed) => deployed.stackName === stack.stackName)) {
+      if ("Rules" in stack.template) {
+        delete stack.template.Rules;
+      }
+      if ("Parameters" in stack.template) {
+        delete stack.template.Parameters;
+      }
+    }
+  }
+  return stacksToProcess.map((stack) => ({
+    StackName: stack.stackName,
+    TemplateBody: JSON.stringify(stack.template)
+  }));
+}
+var deepEqual4;
+var init_stack_definitions = __esm({
+  "../toolkit-lib/lib/api/refactoring/stack-definitions.ts"() {
+    "use strict";
+    deepEqual4 = require_fast_deep_equal();
+    __name(generateStackDefinitions, "generateStackDefinitions");
+  }
+});
+
 // ../toolkit-lib/lib/api/tags/private/util.ts
 function tagsForStack(stack) {
   return Object.entries(stack.tags).map(([Key, Value]) => ({ Key, Value }));
@@ -335944,11 +336166,11 @@ function stacksFromAssets(artifacts) {
 function onlyStacks(artifacts) {
   return artifacts.filter((x3) => cxapi7.CloudFormationStackArtifact.isCloudFormationStackArtifact(x3));
 }
-var import_cdk_assets_lib4, cxapi7, WorkGraphBuilder;
+var import_cdk_assets_lib5, cxapi7, WorkGraphBuilder;
 var init_work_graph_builder = __esm({
   "../toolkit-lib/lib/api/work-graph/work-graph-builder.ts"() {
     "use strict";
-    import_cdk_assets_lib4 = __toESM(require_lib8());
+    import_cdk_assets_lib5 = __toESM(require_lib8());
     cxapi7 = __toESM(require_lib3());
     init_work_graph();
     init_work_graph_types();
@@ -336045,7 +336267,7 @@ var init_work_graph_builder = __esm({
           if (cxapi7.CloudFormationStackArtifact.isCloudFormationStackArtifact(artifact)) {
             this.addStack(artifact);
           } else if (cxapi7.AssetManifestArtifact.isAssetManifestArtifact(artifact)) {
-            const manifest = import_cdk_assets_lib4.AssetManifest.fromFile(artifact.file);
+            const manifest = import_cdk_assets_lib5.AssetManifest.fromFile(artifact.file);
             for (const entry of manifest.entries) {
               const parentStack = parentStacks.get(artifact);
               if (parentStack === void 0) {
@@ -336169,6 +336391,7 @@ var init_toolkit = __esm({
     init_refactoring();
     init_cloudformation3();
     init_context3();
+    init_stack_definitions();
     init_resource_import();
     init_private9();
     init_toolkit_info();
@@ -336951,7 +337174,7 @@ ${deployResult.stackArn}`));
           this.requireUnstableFeature("refactor");
           const ioHelper = asIoHelper(this.ioHost, "refactor");
           const assembly = __using(_stack, await assemblyFromSource(ioHelper, cx), true);
-          return await this._refactor(assembly, ioHelper, options);
+          return await this._refactor(assembly, ioHelper, cx, options);
         } catch (_3) {
           var _error = _3, _hasError = true;
         } finally {
@@ -336959,20 +337182,27 @@ ${deployResult.stackArn}`));
           _promise && await _promise;
         }
       }
-      async _refactor(assembly, ioHelper, options = {}) {
-        if (!options.dryRun) {
-          throw new ToolkitError("Refactor is not available yet. Too see the proposed changes, use the --dry-run flag.");
-        }
+      async _refactor(assembly, ioHelper, cx, options = {}) {
         const sdkProvider = await this.sdkProvider("refactor");
         const selectedStacks = await assembly.selectStacksV2(options.stacks ?? ALL_STACKS);
         const groups = await groupStacks(sdkProvider, selectedStacks.stackArtifacts, options.additionalStackNames ?? []);
         for (let { environment, localStacks, deployedStacks } of groups) {
           await ioHelper.defaults.info(formatEnvironmentSectionHeader2(environment));
+          const newStacks = localStacks.filter((s3) => !deployedStacks.map((t3) => t3.stackName).includes(s3.stackName));
+          if (newStacks.length > 0) {
+            let message2 = `The following stack${newStacks.length === 1 ? " is" : "s are"} new: ${newStacks.map((s3) => s3.stackName).join(", ")}
+`;
+            message2 += "Creation of new stacks is not yet supported by the refactor command. ";
+            message2 += "Please deploy any new stacks separately before refactoring your stacks.";
+            await ioHelper.defaults.error(chalk21.red(message2));
+            continue;
+          }
           try {
             const context = new RefactoringContext({
               environment,
               deployedStacks,
               localStacks,
+              assumeRoleArn: options.roleArn,
               overrides: getOverrides(environment, deployedStacks, localStacks)
             });
             const mappings = context.mappings;
@@ -336983,48 +337213,85 @@ ${deployResult.stackArn}`));
             const typedMappings = mappings.map((m3) => m3.toTypedMapping()).filter((m3) => m3.type !== "AWS::CDK::Metadata");
             let refactorMessage = formatTypedMappings2(typedMappings);
             const refactorResult = { typedMappings };
+            const stackDefinitions = generateStackDefinitions(mappings, deployedStacks, localStacks);
             if (context.ambiguousPaths.length > 0) {
               const paths = context.ambiguousPaths;
               refactorMessage += "\n" + formatAmbiguousMappings2(paths);
               refactorResult.ambiguousPaths = paths;
             }
             await ioHelper.notify(IO.CDK_TOOLKIT_I8900.msg(refactorMessage, refactorResult));
+            if (options.dryRun || context.mappings.length === 0 || context.ambiguousPaths.length > 0) {
+              continue;
+            }
+            if (process.stdout.isTTY && !await confirm2(options.force ?? false)) {
+              await ioHelper.defaults.info(chalk21.red(`Refactoring canceled for environment aws://${environment.account}/${environment.region}
+`));
+              continue;
+            }
+            await ioHelper.defaults.info("Refactoring...");
+            await context.execute(stackDefinitions, sdkProvider, ioHelper);
+            await ioHelper.defaults.info("\u2705  Stack refactor complete");
+            await ioHelper.defaults.info("Deploying updated stacks to finalize refactor...");
+            await this.deploy(cx, {
+              stacks: ALL_STACKS,
+              forceDeployment: true
+            });
           } catch (e3) {
-            await ioHelper.notify(IO.CDK_TOOLKIT_E8900.msg(e3.message, { error: e3 }));
+            const message2 = `\u274C  Refactor failed: ${formatError2(e3)}`;
+            await ioHelper.notify(IO.CDK_TOOLKIT_E8900.msg(message2, { error: e3 }));
+            await ioHelper.defaults.debug(e3.message);
           }
         }
         function getOverrides(environment, deployedStacks, localStacks) {
           const mappingGroup = options.overrides?.find((g3) => g3.region === environment.region && g3.account === environment.account);
-          let overrides = [];
-          if (mappingGroup != null) {
-            overrides = Object.entries(mappingGroup.resources ?? {}).map(([source, destination]) => {
-              const sourceStack = findStack(source, deployedStacks);
-              const sourceLogicalId = source.split(".")[1];
-              const destinationStack = findStack(destination, localStacks);
-              const destinationLogicalId = destination.split(".")[1];
-              return new ResourceMapping(
-                new ResourceLocation(sourceStack, sourceLogicalId),
-                new ResourceLocation(destinationStack, destinationLogicalId)
-              );
-            });
-          }
-          return overrides;
-          function findStack(location, stacks) {
-            const result2 = stacks.find((stack) => {
-              const [stackName, logicalId] = location.split(".");
-              if (stackName == null || logicalId == null) {
-                throw new ToolkitError(`Invalid location '${location}'`);
+          return mappingGroup == null ? [] : Object.entries(mappingGroup.resources ?? {}).map(([source, destination]) => new ResourceMapping(
+            getResourceLocation(source, deployedStacks),
+            getResourceLocation(destination, localStacks)
+          ));
+        }
+        __name(getOverrides, "getOverrides");
+        function getResourceLocation(location, stacks) {
+          for (let stack of stacks) {
+            const [stackName, logicalId] = location.split(".");
+            if (stackName != null && logicalId != null && stack.stackName === stackName && stack.template.Resources?.[logicalId] != null) {
+              return new ResourceLocation(stack, logicalId);
+            } else {
+              const resourceEntry = Object.entries(stack.template.Resources ?? {}).find(([_3, r3]) => r3.Metadata?.["aws:cdk:path"] === location);
+              if (resourceEntry != null) {
+                return new ResourceLocation(stack, resourceEntry[0]);
               }
-              return stack.stackName === stackName && stack.template.Resources?.[logicalId] != null;
-            });
-            if (result2 == null) {
-              throw new ToolkitError(`Cannot find resource in location ${location}`);
             }
-            return result2;
           }
-          __name(findStack, "findStack");
+          throw new ToolkitError(`Cannot find resource in location ${location}`);
         }
-        __name(getOverrides, "getOverrides");
+        __name(getResourceLocation, "getResourceLocation");
+        async function confirm2(force) {
+          if (force) {
+            return true;
+          }
+          const question2 = "Do you wish to refactor these resources?";
+          const response = await ioHelper.requestResponse(IO.CDK_TOOLKIT_I8910.req(question2, {
+            responseDescription: "[Y]es/[n]o"
+          }, "y"));
+          return ["y", "yes"].includes(response.toLowerCase());
+        }
+        __name(confirm2, "confirm");
+        function formatError2(error4) {
+          try {
+            const payload2 = JSON.parse(error4.message);
+            const messages = [];
+            if (payload2.reason?.StatusReason) {
+              messages.push(`Refactor creation: [${payload2.reason?.Status}] ${payload2.reason.StatusReason}`);
+            }
+            if (payload2.reason?.ExecutionStatusReason) {
+              messages.push(`Refactor execution: [${payload2.reason?.Status}] ${payload2.reason.ExecutionStatusReason}`);
+            }
+            return messages.length > 0 ? messages.join("\n") : `Unknown error (Stack refactor ID: ${payload2.reason?.StackRefactorId ?? "unknown"})`;
+          } catch (e3) {
+            return formatErrorMessage(error4);
+          }
+        }
+        __name(formatError2, "formatError");
       }
       /**
        * Destroy Action
@@ -337654,12 +337921,12 @@ var init_logger = __esm({
 });
 
 // lib/runner/private/cloud-assembly.ts
-var path28, import_cdk_assets_lib5, import_cloud_assembly_schema9, fs31, AssemblyManifestReader;
+var path28, import_cdk_assets_lib6, import_cloud_assembly_schema9, fs31, AssemblyManifestReader;
 var init_cloud_assembly3 = __esm({
   "lib/runner/private/cloud-assembly.ts"() {
     "use strict";
     path28 = __toESM(require("path"));
-    import_cdk_assets_lib5 = __toESM(require_lib8());
+    import_cdk_assets_lib6 = __toESM(require_lib8());
     import_cloud_assembly_schema9 = __toESM(require_lib2());
     fs31 = __toESM(require_lib4());
     AssemblyManifestReader = class _AssemblyManifestReader {
@@ -337783,7 +338050,7 @@ var init_cloud_assembly3 = __esm({
       getAssetManifestsForStack(stackId) {
         return Object.values(this.manifest.artifacts ?? {}).filter((artifact) => artifact.type === import_cloud_assembly_schema9.ArtifactType.ASSET_MANIFEST && artifact.properties?.file === `${stackId}.assets.json`).map((artifact) => {
           const fileName = artifact.properties.file;
-          return import_cdk_assets_lib5.AssetManifest.fromFile(path28.join(this.directory, fileName));
+          return import_cdk_assets_lib6.AssetManifest.fromFile(path28.join(this.directory, fileName));
         });
       }
       /**
@@ -337809,7 +338076,7 @@ var init_cloud_assembly3 = __esm({
       assetsFromAssetManifest(artifact) {
         const assets = [];
         const fileName = artifact.properties.file;
-        const assetManifest = import_cdk_assets_lib5.AssetManifest.fromFile(path28.join(this.directory, fileName));
+        const assetManifest = import_cdk_assets_lib6.AssetManifest.fromFile(path28.join(this.directory, fileName));
         assetManifest.entries.forEach((entry) => {
           if (entry.type === "file") {
             const source = entry.source;
@@ -337892,12 +338159,12 @@ var init_cloud_assembly3 = __esm({
 function currentlyRecommendedAwsCdkLibFlags() {
   return recommended_feature_flags_exports;
 }
-var path29, import_cx_api11, fs32, DESTRUCTIVE_CHANGES, IntegRunner, DEFAULT_SYNTH_OPTIONS;
+var path29, import_cx_api12, fs32, DESTRUCTIVE_CHANGES, IntegRunner, DEFAULT_SYNTH_OPTIONS;
 var init_runner_base = __esm({
   "lib/runner/runner-base.ts"() {
     "use strict";
     path29 = __toESM(require("path"));
-    import_cx_api11 = __toESM(require_lib3());
+    import_cx_api12 = __toESM(require_lib3());
     fs32 = __toESM(require_lib4());
     init_integ_test_suite();
     init_recommended_feature_flags();
@@ -338139,7 +338406,7 @@ var init_runner_base = __esm({
           ...additionalContext,
           // We originally had PLANNED to set this to ['aws', 'aws-cn'], but due to a programming mistake
           // it was set to everything. In this PR, set it to everything to not mess up all the snapshots.
-          [import_cx_api11.TARGET_PARTITIONS]: void 0
+          [import_cx_api12.TARGET_PARTITIONS]: void 0
           /* ---------------- THE FUTURE LIVES BELOW----------------------------
           // Restricting to these target partitions makes most service principals synthesize to
           // `service.${URL_SUFFIX}`, which is technically *incorrect* (it's only `amazonaws.com`
@@ -338152,7 +338419,7 @@ var init_runner_base = __esm({
     };
     DEFAULT_SYNTH_OPTIONS = {
       context: {
-        [import_cx_api11.AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY]: ["test-region-1a", "test-region-1b", "test-region-1c"],
+        [import_cx_api12.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

@@ -66,12 +66,12 @@
     "@aws-cdk/aws-service-spec": "^0.1.94",
     "@aws-cdk/cdk-assets-lib": "1.0.3",
     "@aws-cdk/cdk-cli-wrapper": "0.0.0",
-    "@aws-cdk/cloud-assembly-schema": ">=48.7.0",
-    "@aws-cdk/cloudformation-diff": "2.183.1",
+    "@aws-cdk/cloud-assembly-schema": ">=48.8.0",
+    "@aws-cdk/cloudformation-diff": "2.184.0",
     "@aws-cdk/cx-api": "^2.213.0",
-    "@aws-cdk/toolkit-lib": "1.7.0",
+    "@aws-cdk/toolkit-lib": "1.8.0",
     "@aws-sdk/client-cloudformation": "^3",
-    "aws-cdk": "2.1028.0",
+    "aws-cdk": "2.1029.0",
     "chalk": "^4",
     "chokidar": "^3",
     "fs-extra": "^9",
@@ -80,7 +80,7 @@
   },
   "dependencies": {
     "@aws-cdk/aws-service-spec": "0.1.94",
-    "aws-cdk": "2.1028.0"
+    "aws-cdk": "2.1029.0"
   },
   "keywords": [
     "aws",
@@ -95,7 +95,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.190.3",
+  "version": "2.190.4",
   "types": "lib/index.d.ts",
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\".",
   "optionalDependencies": {