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

Fix --diff display to print non-logical steps #15916

Closed
wants to merge 1 commit into from

Conversation

Frassle
Copy link
Member

@Frassle Frassle commented Apr 11, 2024

Description

Fixes #7665.

Checklist

  • I have run make tidy to update any new dependencies
  • I have run make lint to verify my code passes the lint check
    • I have formatted my code using gofumpt
  • I have added tests that prove my fix is effective or that my feature works
  • I have run make changelog and committed the changelog/pending/<file> documenting my change
  • Yes, there are changes in this PR that warrants bumping the Pulumi Cloud API version

@pulumi-bot
Copy link
Contributor

pulumi-bot commented Apr 11, 2024

Changelog

[uncommitted] (2024-04-12)

@Frassle Frassle changed the title Add DetailedDiff to RefreshStep Fix --diff display to print non-logical steps Apr 13, 2024
@tgummerer
Copy link
Collaborator

Running this with the newly added displaytests, I'm getting a bunch of diffs like the following here:

--- a/pkg/engine/lifecycletest/testdata/output/TestAliasURNs/urn-depends-relationship-0-0/diff.stdout.txt
+++ b/pkg/engine/lifecycletest/testdata/output/TestAliasURNs/urn-depends-relationship-0-0/diff.stdout.txt
@@ -1,11 +1,4 @@
-<{%fg 2%}>+ pulumi:providers:pkgA: (create)
-<{%fg 2%}>    [urn=urn:pulumi:test::test::pulumi:providers:pkgA::default]
-<{%reset%}><{%reset%}><{%fg 2%}>+ pkgA:index:t1: (create)
-<{%fg 2%}>    [urn=urn:pulumi:test::test::pkgA:index:t1::n1]
-<{%reset%}><{%fg 2%}>    forcesReplacement: <{%reset%}><{%fg 2%}>1<{%reset%}><{%fg 2%}>
-<{%reset%}><{%reset%}><{%fg 2%}>+ pkgA:index:t2: (create)
-<{%fg 2%}>    [urn=urn:pulumi:test::test::pkgA:index:t2::n2]
-<{%reset%}><{%reset%}><{%fg 13%}><{%bold%}>Resources:<{%reset%}>
+<{%fg 13%}><{%bold%}>Resources:<{%reset%}>
     <{%fg 2%}>+ 2 created<{%reset%}>
 
 <{%fg 13%}><{%bold%}>Duration:<{%reset%}> 1s

and

diff --git a/pkg/engine/lifecycletest/testdata/output/TestAliasURNs/urn-depends-relationship-2-0-0/diff.stdout.txt b/pkg/engine/lifecycletest/testdata/output/TestAliasURNs/urn-depends-relationship-2-0-0/diff.stdout.txt
index 32966f34a1..c688bea90d 100644
--- a/pkg/engine/lifecycletest/testdata/output/TestAliasURNs/urn-depends-relationship-2-0-0/diff.stdout.txt
+++ b/pkg/engine/lifecycletest/testdata/output/TestAliasURNs/urn-depends-relationship-2-0-0/diff.stdout.txt
@@ -1,7 +1,11 @@
 <{%reset%}>  pulumi:providers:pkgA: (same)
 <{%reset%}>    [id=ID]
 <{%reset%}><{%reset%}>    [urn=urn:pulumi:test::test::pulumi:providers:pkgA::default]
-<{%reset%}><{%reset%}><{%fg 13%}>+-pkgA:index:t1-new: (replace)
+<{%reset%}><{%reset%}><{%fg 9%}>--pkgA:index:t1: (delete-replaced)
+<{%fg 9%}>    [id=ID]
+<{%reset%}><{%fg 9%}>    [urn=urn:pulumi:test::test::pkgA:index:t1::n1]
+<{%reset%}><{%fg 9%}>    forcesReplacement: <{%reset%}><{%fg 9%}>1<{%reset%}><{%fg 9%}>
+<{%reset%}><{%reset%}><{%fg 10%}>++pkgA:index:t1-new: (create-replacement)
 <{%reset%}>    [id=ID]
 <{%reset%}><{%reset%}>    [urn=urn:pulumi:test::test::pkgA:index:t1-new::n1-new]
 <{%reset%}><{%fg 3%}>  ~ forcesReplacement: <{%reset%}><{%fg 1%}>1<{%reset%}><{%fg 3%}> => <{%reset%}><{%fg 2%}>2<{%reset%}><{%fg 3%}>

(For this one I'm actually not sure we don't want it)

In addition to the diffs that I think we actually do want

diff --git a/pkg/engine/lifecycletest/testdata/output/TestRefreshBasics/0-0-0/diff.stdout.txt b/pkg/engine/lifecycletest/testdata/output/TestRe
freshBasics/0-0-0/diff.stdout.txt
index 38882111a9..23bd17f2a6 100644
--- a/pkg/engine/lifecycletest/testdata/output/TestRefreshBasics/0-0-0/diff.stdout.txt
+++ b/pkg/engine/lifecycletest/testdata/output/TestRefreshBasics/0-0-0/diff.stdout.txt
@@ -4,6 +4,11 @@
 <{%reset%}><{%reset%}>  pkgA:m:typA: (same)
 <{%reset%}>    [id=3]
 <{%reset%}><{%reset%}>    [urn=urn:pulumi:test::test::pkgA:m:typA::resA]
+<{%reset%}><{%fg 3%}>~ pkgA:m:typA: (update)
+<{%reset%}>    [id=4]
+<{%reset%}><{%reset%}>    [urn=urn:pulumi:test::test::pkgA:m:typA::resA]
+<{%reset%}><{%fg 3%}>    --outputs:--<{%reset%}>
+<{%fg 2%}>  + baz: <{%reset%}><{%fg 2%}>"qux"<{%reset%}><{%fg 2%}>
 <{%reset%}><{%fg 13%}><{%bold%}>Resources:<{%reset%}>
     <{%fg 3%}>~ 1 updated<{%reset%}>
     2 unchanged

@Frassle
Copy link
Member Author

Frassle commented Apr 27, 2024

Superseded by #16065

@Frassle Frassle closed this Apr 27, 2024
@Frassle Frassle deleted the fraser/refreshDiff branch April 27, 2024 20:40
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.

pulumi refresh --diff does not show a diff
3 participants