feat: diff shows moved resources
#708
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: github-actions <github-actions@github.com>
Show both mappings and ambiguities;
Signed-off-by: github-actions <github-actions@github.com>
…rides # Conflicts: # packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts
Signed-off-by: github-actions <github-actions@github.com>
# Conflicts: # packages/@aws-cdk/toolkit-lib/lib/actions/refactor/index.ts # packages/@aws-cdk/toolkit-lib/lib/api/refactoring/context.ts # packages/@aws-cdk/toolkit-lib/lib/api/refactoring/index.ts # packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts # packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-two-buckets/index.ts # packages/@aws-cdk/toolkit-lib/test/actions/refactor.test.ts # packages/aws-cdk/README.md # packages/aws-cdk/lib/cli/cdk-toolkit.ts # packages/aws-cdk/lib/cli/cli-config.ts # packages/aws-cdk/lib/cli/cli-type-registry.json # packages/aws-cdk/lib/cli/cli.ts # packages/aws-cdk/lib/cli/convert-to-user-input.ts # packages/aws-cdk/lib/cli/parse-command-line-arguments.ts # packages/aws-cdk/lib/cli/user-input.ts
otaviomacedo
temporarily deployed
to
integ-approval
GitHub Actions
Inactive
rix0rrr
approved these changes
Jul 15, 2025
| @@ -239,6 +246,10 @@ export class Formatter { | |||
| } | |||
| } | |||
|
|
|||
| private formatMove(move?: Move): string { | |||
| return !move ? '' : chalk.gray('(OR', chalk.italic(chalk.bold('move')), `${move.direction} ${move.stackName}.${move.resourceLogicalId} via refactoring)`); | |||
There was a problem hiding this comment.
Can we make this slightly more visible than grey? Maybe yellow or orange or something?
| }); | ||
| return { | ||
| environment: context.environment, | ||
| mappings: Object.fromEntries( |
There was a problem hiding this comment.
Rather than splatting down the object to a string here, aren't we better off maintaining the object and rendering it later when it comes time to present the diff?
otaviomacedo
temporarily deployed
to
integ-approval
GitHub Actions
Inactive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a resource is moved from one location to another, the
diffcommand will show two entries: an addition and a removal. This PR augments those entries to show where they moved to and from, respectively:This information is not shown by default. To enable it, the user has to pass
--include-movesto the CLI, andincludeMoves: trueto the toolkit.Closes #362
Depends on #679.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license