Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nexus] Expand BlueprintDiff to identify changed datasets #6481

Merged
merged 7 commits into from
Nov 7, 2024
Merged

Conversation

smklein
Copy link
Collaborator

@smklein smklein commented Aug 29, 2024

Add "datasets" to BlueprintDiff.

The BlueprintDiff tool already allows comparing blueprints and collections, this PR expands that comparison
to also display differences in datasets.

Additionally, this PR:

  • Makes Dataset UUID generation deterministic
  • Adds datasets to the ExampleSystem's system description
  • Starts to use these BlueprintDiff values in reconfigurator tests

@smklein smklein marked this pull request as draft August 29, 2024 22:29
@smklein smklein marked this pull request as ready for review August 30, 2024 18:06
@smklein smklein changed the title Expand BlueprintDiff to identify changed datasets [nexus] Expand BlueprintDiff to identify changed datasets Aug 30, 2024
Copy link
Contributor

@andrewjstone andrewjstone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

Base automatically changed from nexus-requests-datasets to main October 30, 2024 20:01
@andrewjstone andrewjstone self-requested a review November 6, 2024 20:44
@@ -1755,6 +1772,79 @@ mod test {
logctx.cleanup_successful();
}

#[test]
fn test_dataset_settings_modified_in_place() {
static TEST_NAME: &str = "planner_dataset_settings_modified_in_place";
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this test to give an example of "what the diff looks like when a dataset is modified".

planner_dataset_settings_modified_in_place_1_2.txt contains this example

Comment on lines +80 to +81
* oxp_f843fb62-0f04-4c7d-a56f-62531104dc77/crypt/debug 2011121d-b454-41c5-9062-18fa04ee1d52 - none - 1 GiB off
└─ + 100 GiB + none
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(This is the notable bit)

Copy link
Contributor

@andrewjstone andrewjstone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Thanks for bringing this up to date @smklein!

@smklein smklein merged commit 9846490 into main Nov 7, 2024
16 checks passed
@smklein smklein deleted the dataset-diff branch November 7, 2024 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants