aws-cdk 2.1028.0 → 2.1029.0

package/lib/index.js

@@ -3478,7 +3478,7 @@ var require_semver2 = __commonJS({
 // ../@aws-cdk/cloud-assembly-schema/cli-version.json
 var require_cli_version = __commonJS({
   "../@aws-cdk/cloud-assembly-schema/cli-version.json"(exports2, module2) {
-    module2.exports = { version: "2.1028.0" };
+    module2.exports = { version: "2.1029.0" };
   }
 });
 
@@ -8759,7 +8759,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");
       }
@@ -8839,12 +8839,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);
     }
@@ -123484,6 +123484,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"
@@ -124372,7 +124377,7 @@ var require_dist_cjs80 = __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"),
@@ -124412,7 +124417,7 @@ var require_dist_cjs80 = __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"),
@@ -124575,8 +124580,8 @@ var require_dist_cjs80 = __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")
@@ -134668,7 +134673,7 @@ var require_dist_cjs80 = __commonJS({
         __name2(this, "CreateStackInstancesCommand");
       }
     };
-    var CreateStackRefactorCommand = class extends import_smithy_client28.Command.classBuilder().ep(commonParams3).m(function(Command2, cs, config, o3) {
+    var CreateStackRefactorCommand2 = class extends import_smithy_client28.Command.classBuilder().ep(commonParams3).m(function(Command2, cs, config, o3) {
       return [
         (0, import_middleware_serde5.getSerdePlugin)(config, this.serialize, this.deserialize),
         (0, import_middleware_endpoint8.getEndpointPlugin)(config, Command2.getEndpointParameterInstructions())
@@ -135110,7 +135115,7 @@ var require_dist_cjs80 = __commonJS({
         __name2(this, "ExecuteChangeSetCommand");
       }
     };
-    var ExecuteStackRefactorCommand = class extends import_smithy_client28.Command.classBuilder().ep(commonParams3).m(function(Command2, cs, config, o3) {
+    var ExecuteStackRefactorCommand2 = class extends import_smithy_client28.Command.classBuilder().ep(commonParams3).m(function(Command2, cs, config, o3) {
       return [
         (0, import_middleware_serde5.getSerdePlugin)(config, this.serialize, this.deserialize),
         (0, import_middleware_endpoint8.getEndpointPlugin)(config, Command2.getEndpointParameterInstructions())
@@ -135705,7 +135710,7 @@ var require_dist_cjs80 = __commonJS({
       CreateGeneratedTemplateCommand: CreateGeneratedTemplateCommand2,
       CreateStackCommand: CreateStackCommand2,
       CreateStackInstancesCommand,
-      CreateStackRefactorCommand,
+      CreateStackRefactorCommand: CreateStackRefactorCommand2,
       CreateStackSetCommand,
       DeactivateOrganizationsAccessCommand,
       DeactivateTypeCommand,
@@ -135739,7 +135744,7 @@ var require_dist_cjs80 = __commonJS({
       DetectStackSetDriftCommand,
       EstimateTemplateCostCommand,
       ExecuteChangeSetCommand: ExecuteChangeSetCommand2,
-      ExecuteStackRefactorCommand,
+      ExecuteStackRefactorCommand: ExecuteStackRefactorCommand2,
       GetGeneratedTemplateCommand: GetGeneratedTemplateCommand2,
       GetStackPolicyCommand,
       GetTemplateCommand: GetTemplateCommand2,
@@ -136423,7 +136428,7 @@ var require_dist_cjs80 = __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);
@@ -136472,7 +136477,7 @@ var require_dist_cjs80 = __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);
@@ -149870,6 +149875,8 @@ function formatAmbiguousMappings(stream3, pairs) {
   formatter.print("Detected ambiguities:");
   formatter.print(tables.join("\n\n"));
   formatter.print(" ");
+  formatter.print(chalk7.yellow("Please provide an override file to resolve these ambiguous mappings."));
+  formatter.print(" ");
   function renderTable2([removed, added]) {
     return formatTable([["", "Resource"], renderRemoval(removed), renderAddition(added)], void 0);
   }
@@ -152446,7 +152453,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
        */
@@ -319079,7 +319086,35 @@ var init_sdk2 = __esm({
               stackResources.push(...page?.StackSummaries || []);
             }
             return stackResources;
-          }, "paginatedListStacks")
+          }, "paginatedListStacks"),
+          createStackRefactor: /* @__PURE__ */ __name((input) => {
+            return client.send(new import_client_cloudformation3.CreateStackRefactorCommand(input));
+          }, "createStackRefactor"),
+          executeStackRefactor: /* @__PURE__ */ __name((input) => {
+            return client.send(new import_client_cloudformation3.ExecuteStackRefactorCommand(input));
+          }, "executeStackRefactor"),
+          waitUntilStackRefactorCreateComplete: /* @__PURE__ */ __name((input) => {
+            return (0, import_client_cloudformation3.waitUntilStackRefactorCreateComplete)(
+              {
+                client,
+                maxWaitTime: 600,
+                minDelay: 6,
+                maxDelay: 6
+              },
+              input
+            );
+          }, "waitUntilStackRefactorCreateComplete"),
+          waitUntilStackRefactorExecuteComplete: /* @__PURE__ */ __name((input) => {
+            return (0, import_client_cloudformation3.waitUntilStackRefactorExecuteComplete)(
+              {
+                client,
+                maxWaitTime: 600,
+                minDelay: 6,
+                maxDelay: 6
+              },
+              input
+            );
+          }, "waitUntilStackRefactorExecuteComplete")
         };
       }
       cloudWatchLogs() {
@@ -321385,10 +321420,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({
   "../@aws-cdk/toolkit-lib/lib/util/sets.ts"() {
     "use strict";
     __name(equalSets, "equalSets");
+    __name(setDiff, "setDiff");
   }
 });
 
@@ -332767,6 +332806,9 @@ var init_cloudformation4 = __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) {
@@ -332785,6 +332827,18 @@ var init_cloudformation4 = __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
+          }
+        };
+      }
     };
   }
 });
@@ -332834,15 +332888,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) {
@@ -332983,11 +333039,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 = {};
@@ -333036,14 +333095,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)));
@@ -333150,20 +333225,49 @@ function partitionByAmbiguity(overrides, moves) {
   __name(remove2, "remove");
   return [nonAmbiguous, ambiguous];
 }
-var RefactoringContext;
+async function replaceAwsPlaceholders2(object, aws) {
+  let partition3 = /* @__PURE__ */ __name(async () => {
+    const p3 = await aws.discoverPartition();
+    partition3 = /* @__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_api11.EnvironmentPlaceholders.replaceAsync(object, {
+    async region() {
+      return object.region ?? aws.discoverDefaultRegion();
+    },
+    async accountId() {
+      return (await account()).accountId;
+    },
+    async partition() {
+      return partition3();
+    }
+  });
+}
+var import_cdk_assets_lib5, import_cx_api11, RefactoringContext;
 var init_context3 = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/refactoring/context.ts"() {
     "use strict";
+    import_cdk_assets_lib5 = __toESM(require_lib6());
+    import_cx_api11 = __toESM(require_lib3());
     init_cloudformation4();
     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;
@@ -333172,6 +333276,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() {
@@ -333184,6 +333290,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 env2 = this.environment;
+        const roleArns = new Set(
+          this.localStacks.filter((s3) => s3.environment.account === env2.account && s3.environment.region === env2.region).map((s3) => s3.assumeRoleArn)
+        );
+        if (roleArns.size === 0) {
+          return void 0;
+        }
+        if (roleArns.size !== 1) {
+          throw new ToolkitError(
+            `Multiple stacks in environment aws://${env2.account}/${env2.region} have different deployment role ARNs. Cannot proceed.`
+          );
+        }
+        const arn = Array.from(roleArns)[0];
+        if (arn != null) {
+          const resolvedEnv = await sdkProvider.resolveEnvironment(env2);
+          const region = resolvedEnv.region;
+          return (await replaceAwsPlaceholders2({ region, assumeRoleArn: arn }, new import_cdk_assets_lib5.DefaultAwsClient())).assumeRoleArn;
+        }
+        return void 0;
+      }
     };
     __name(structuralOverrides, "structuralOverrides");
     __name(resourceMoves, "resourceMoves");
@@ -333194,6 +333362,7 @@ var init_context3 = __esm({
     __name(isAmbiguousMove, "isAmbiguousMove");
     __name(resourceMappings, "resourceMappings");
     __name(partitionByAmbiguity, "partitionByAmbiguity");
+    __name(replaceAwsPlaceholders2, "replaceAwsPlaceholders");
   }
 });
 
@@ -333783,6 +333952,59 @@ var init_drift3 = __esm({
   }
 });
 
+// ../@aws-cdk/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({
+  "../@aws-cdk/toolkit-lib/lib/api/refactoring/stack-definitions.ts"() {
+    "use strict";
+    deepEqual4 = require_fast_deep_equal();
+    __name(generateStackDefinitions, "generateStackDefinitions");
+  }
+});
+
 // ../@aws-cdk/toolkit-lib/lib/api/tags/private/util.ts
 function tagsForStack(stack) {
   return Object.entries(stack.tags).map(([Key, Value]) => ({ Key, Value }));
@@ -333864,6 +334086,7 @@ var init_toolkit = __esm({
     init_refactoring();
     init_cloudformation4();
     init_context3();
+    init_stack_definitions();
     init_resource_import();
     init_private9();
     init_toolkit_info();
@@ -334646,7 +334869,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 {
@@ -334654,20 +334877,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(chalk23.red(message2));
+            continue;
+          }
           try {
             const context = new RefactoringContext({
               environment,
               deployedStacks,
               localStacks,
+              assumeRoleArn: options.roleArn,
               overrides: getOverrides(environment, deployedStacks, localStacks)
             });
             const mappings = context.mappings;
@@ -334678,48 +334908,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 confirm4(options.force ?? false)) {
+              await ioHelper.defaults.info(chalk23.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: ${formatError(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 confirm4(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(confirm4, "confirm");
+        function formatError(error5) {
+          try {
+            const payload2 = JSON.parse(error5.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(error5);
+          }
+        }
+        __name(formatError, "formatError");
       }
       /**
        * Destroy Action
@@ -338476,6 +338743,11 @@ var require_cli_type_registry = __commonJS({
               type: "boolean",
               default: false,
               desc: "If specified, the command will revert the refactor operation. This is only valid if a mapping file was provided."
+            },
+            force: {
+              type: "boolean",
+              default: false,
+              desc: "Whether to do the refactor without asking for confirmation"
             }
           }
         },
@@ -342655,8 +342927,8 @@ function chunks(list2, chunkSize) {
 }
 function setEnvironment(account, region) {
   return {
-    account: account ?? import_cx_api11.UNKNOWN_ACCOUNT,
-    region: region ?? import_cx_api11.UNKNOWN_REGION,
+    account: account ?? import_cx_api12.UNKNOWN_ACCOUNT,
+    region: region ?? import_cx_api12.UNKNOWN_REGION,
     name: "cdk-migrate-env"
   };
 }
@@ -342839,13 +343111,13 @@ function deduplicateResources(resources) {
   }
   return Object.values(uniqueResources);
 }
-var fs36, path34, import_cx_api11, import_toolkit_lib13, cdk_from_cfn, chalk27, camelCase2, decamelize2, MIGRATE_SUPPORTED_LANGUAGES, FilterType, CfnTemplateGeneratorProvider;
+var fs36, path34, import_cx_api12, import_toolkit_lib13, cdk_from_cfn, chalk27, camelCase2, decamelize2, MIGRATE_SUPPORTED_LANGUAGES, FilterType, CfnTemplateGeneratorProvider;
 var init_migrate = __esm({
   "lib/commands/migrate.ts"() {
     "use strict";
     fs36 = __toESM(require("fs"));
     path34 = __toESM(require("path"));
-    import_cx_api11 = __toESM(require_lib3());
+    import_cx_api12 = __toESM(require_lib3());
     import_toolkit_lib13 = __toESM(require_lib12());
     cdk_from_cfn = __toESM(require_cdk_from_cfn());
     chalk27 = __toESM(require_source());
@@ -344099,8 +344371,10 @@ var init_cdk_toolkit = __esm({
               patterns,
               strategy: patterns.length > 0 ? "pattern-match" /* PATTERN_MATCH */ : "all-stacks" /* ALL_STACKS */
             },
+            force: options.force,
             additionalStackNames: options.additionalStackNames,
-            overrides: readOverrides(options.overrideFile, options.revert)
+            overrides: readOverrides(options.overrideFile, options.revert),
+            roleArn: options.roleArn
           });
         } catch (e3) {
           await this.ioHost.asIoHelper().defaults.error(e3.message);
@@ -344432,20 +344706,14 @@ function browserForPlatform() {
       return "xdg-open %u";
   }
 }
-function shouldDisplayNotices() {
-  return !isCI2() || Boolean(ciSystemIsStdErrSafe());
-}
 var init_yargs_helpers = __esm({
   "lib/cli/util/yargs-helpers.ts"() {
     "use strict";
-    init_ci_systems();
-    init_ci();
     init_version2();
     init_ci();
     __name(yargsNegativeAlias, "yargsNegativeAlias");
     __name(cliVersion, "cliVersion");
     __name(browserForPlatform, "browserForPlatform");
-    __name(shouldDisplayNotices, "shouldDisplayNotices");
   }
 });
 
@@ -349315,7 +349583,7 @@ function parseCommandLineArguments(args) {
     desc: "Emits the synthesized cloud assembly into a directory (default: cdk.out)",
     requiresArg: true
   }).option("notices", {
-    default: shouldDisplayNotices(),
+    default: void 0,
     type: "boolean",
     desc: "Show relevant notices"
   }).option("no-color", {
@@ -350040,6 +350308,10 @@ function parseCommandLineArguments(args) {
       default: false,
       type: "boolean",
       desc: "If specified, the command will revert the refactor operation. This is only valid if a mapping file was provided."
+    }).option("force", {
+      default: false,
+      type: "boolean",
+      desc: "Whether to do the refactor without asking for confirmation"
     })
   ).command(
     "cli-telemetry",
@@ -355140,7 +355412,7 @@ async function handleFlags(flagData, ioHelper, options, toolkit) {
     return;
   }
   if (options.unconfigured && options.FLAGNAME) {
-    await ioHelper.defaults.error("Error: Cannot use --unconfigured with a specific flag name. --unconfigured works on multiple flags.");
+    await ioHelper.defaults.error("Error: Cannot use --unconfigured with a specific flag name. --unconfigured works with multiple flags.");
     return;
   }
   if (options.set && options.FLAGNAME && !options.value) {
@@ -355155,6 +355427,10 @@ async function handleFlags(flagData, ioHelper, options, toolkit) {
     await ioHelper.defaults.error("Error: When using --set with --unconfigured, you must specify either --recommended or --default.");
     return;
   }
+  if (options.set && !options.all && !options.unconfigured && !options.FLAGNAME) {
+    await ioHelper.defaults.error("Error: When using --set, you must specify either --all, --unconfigured, or provide a specific flag name.");
+    return;
+  }
   if (options.FLAGNAME && !options.set && !options.value) {
     await displayFlags(params);
     return;
@@ -383315,8 +383591,19 @@ async function exec4(args, synthesizer) {
   } catch (e3) {
     await ioHost.asIoHelper().defaults.trace(`Telemetry instantiation failed: ${e3.message}`);
   }
-  const shouldDisplayNotices2 = configuration.settings.get(["notices"]);
-  ioHost.noticesDestination = shouldDisplayNotices2 ? "stderr" : "drop";
+  const isSafeToWriteNotices = !isCI2() || Boolean(ciSystemIsStdErrSafe());
+  let shouldDisplayNotices;
+  if (argv.notices !== void 0) {
+    shouldDisplayNotices = argv.notices;
+  } else {
+    const configNotices = configuration.settings.get(["notices"]);
+    if (configNotices !== void 0) {
+      shouldDisplayNotices = configNotices !== "false" && Boolean(configNotices);
+    } else {
+      shouldDisplayNotices = isSafeToWriteNotices;
+    }
+  }
+  ioHost.noticesDestination = shouldDisplayNotices ? "stderr" : "drop";
   const notices = Notices.create({
     ioHost,
     context: configuration.context,
@@ -383325,7 +383612,7 @@ async function exec4(args, synthesizer) {
     cliVersion: versionNumber2()
   });
   const refreshNotices = (async () => {
-    if (shouldDisplayNotices2 && cmd !== "notices") {
+    if (shouldDisplayNotices && cmd !== "notices") {
       try {
         return await notices.refresh();
       } catch (e3) {
@@ -383381,7 +383668,7 @@ async function exec4(args, synthesizer) {
         includeAcknowledged: !argv.unacknowledged,
         showTotal: argv.unacknowledged
       });
-    } else if (cmd !== "version") {
+    } else if (shouldDisplayNotices && cmd !== "version") {
       await notices.display();
     }
   }
@@ -383479,7 +383766,9 @@ async function exec4(args, synthesizer) {
           overrideFile: args2.overrideFile,
           revert: args2.revert,
           stacks: selector,
-          additionalStackNames: arrayFromYargs(args2.additionalStackName ?? [])
+          additionalStackNames: arrayFromYargs(args2.additionalStackName ?? []),
+          force: args2.force ?? false,
+          roleArn: args2.roleArn
         });
       case "bootstrap":
         ioHost.currentAction = "bootstrap";
@@ -383826,6 +384115,7 @@ var init_cli = __esm({
     import_toolkit_lib19 = __toESM(require_lib12());
     chalk35 = __toESM(require_source());
     init_cdk_toolkit();
+    init_ci_systems();
     init_display_version();
     init_io_host2();
     init_parse_command_line_arguments();
@@ -383848,6 +384138,7 @@ var init_cli = __esm({
     init_cxapp();
     init_proxy_agent();
     init_error();
+    init_ci();
     init_version2();
     init_language();
     if (!process.stdout.isTTY) {