Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[cli] Render changes to text properties as diffs. (#9376)
Instead of simply rendering the old and new values for textual properties, compute the diff between the old and new values and render that. For single-line values, the diff is computed and rendered character-wise, with simplification applied to avoid "small" diffs. For multi-line values, the diff is computed and rendered linewise (as we already to for textual assets). Fixes #9136.
- Loading branch information
Showing
8 changed files
with
210 additions
and
12 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Large diffs are not rendered by default.
Oops, something went wrong.
Empty file.
Empty file.
66 changes: 66 additions & 0 deletions
66
pkg/backend/display/testdata/webserver-userdata.json.stdout
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <{%reset%}>Configuration:<{%reset%}> | ||
| aws:region: us-west-2 | ||
| <{%reset%}> pulumi:pulumi:Stack: (same) | ||
| <{%reset%}> [urn=urn:pulumi:dev::aws-ts-webserver::pulumi:pulumi:Stack::aws-ts-webserver-dev] | ||
| <{%reset%}><{%reset%}><{%!r(MISSING)eset%!}(MISSING)> --outputs:--<{%!r(MISSING)eset%!}(MISSING)> | ||
| <{%reset%}> publicHostName: <{%reset%}><{%reset%}>"ec2-34-211-56-110.us-west-2.compute.amazonaws.com"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> publicIp : <{%reset%}><{%reset%}>"34.211.56.110"<{%reset%}><{%reset%}> | ||
| <{%reset%}> <{%reset%}> aws:ec2/securityGroup:SecurityGroup: (same) | ||
| <{%reset%}> [id=sg-07498abcdbdf88f34] | ||
| <{%reset%}><{%reset%}> [urn=urn:pulumi:dev::aws-ts-webserver::aws:ec2/securityGroup:SecurityGroup::web-secgrp] | ||
| <{%reset%}><{%reset%}> [provider=urn:pulumi:dev::aws-ts-webserver::pulumi:providers:aws::default_3_38_1::57baf899-740a-486a-908e-43cf27cce182] | ||
| <{%reset%}><{%reset%}> description : <{%reset%}><{%reset%}>"Managed by Pulumi"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> ingress : <{%reset%}><{%reset%}>[ | ||
| <{%reset%}><{%reset%}> [0]: <{%reset%}><{%reset%}>{ | ||
| <{%reset%}><{%reset%}> cidrBlocks: <{%reset%}><{%reset%}>[ | ||
| <{%reset%}><{%reset%}> [0]: <{%reset%}><{%reset%}>"0.0.0.0/0"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> ]<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> fromPort : <{%reset%}><{%reset%}>80<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> protocol : <{%reset%}><{%reset%}>"tcp"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> self : <{%reset%}><{%reset%}>false<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> toPort : <{%reset%}><{%reset%}>80<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> }<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> ]<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> name : <{%reset%}><{%reset%}>"web-secgrp-5ee4db6"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> revokeRulesOnDelete: <{%reset%}><{%reset%}>false<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> <{%fg 10%}>++aws:ec2/instance:Instance: (create-replacement) | ||
| <{%reset%}> [id=i-0207dc7a2d8c5135a] | ||
| <{%reset%}><{%reset%}> [urn=urn:pulumi:dev::aws-ts-webserver::aws:ec2/instance:Instance::web-server-www] | ||
| <{%reset%}><{%reset%}> [provider=urn:pulumi:dev::aws-ts-webserver::pulumi:providers:aws::default_3_38_1::57baf899-740a-486a-908e-43cf27cce182] | ||
| <{%reset%}><{%fg 3%}> ~ userData: <{%reset%}><{%fg 3%}> | ||
| <{%reset%}><{%fg 1%}> - 6c9af18dedd883b14ac2969ec364e7113dd8533c<{%reset%}> | ||
| <{%fg 2%}> + #!/bin/bash<{%reset%}> | ||
| <{%fg 2%}> + echo "Hello, Pulumi!" > index.html<{%reset%}> | ||
| <{%fg 2%}> + nohup python -m SimpleHTTPServer 80 &<{%reset%}> | ||
| <{%reset%}> <{%fg 13%}>+-aws:ec2/instance:Instance: (replace) | ||
| <{%reset%}> [id=i-0207dc7a2d8c5135a] | ||
| <{%reset%}><{%reset%}> [urn=urn:pulumi:dev::aws-ts-webserver::aws:ec2/instance:Instance::web-server-www] | ||
| <{%reset%}><{%reset%}> [provider=urn:pulumi:dev::aws-ts-webserver::pulumi:providers:aws::default_3_38_1::57baf899-740a-486a-908e-43cf27cce182] | ||
| <{%reset%}><{%fg 3%}> ~ userData: <{%reset%}><{%fg 3%}> | ||
| <{%reset%}><{%fg 1%}> - 6c9af18dedd883b14ac2969ec364e7113dd8533c<{%reset%}> | ||
| <{%fg 2%}> + #!/bin/bash<{%reset%}> | ||
| <{%fg 2%}> + echo "Hello, Pulumi!" > index.html<{%reset%}> | ||
| <{%fg 2%}> + nohup python -m SimpleHTTPServer 80 &<{%reset%}> | ||
| <{%reset%}><{%!r(MISSING)eset%!}(MISSING)> --outputs:--<{%!r(MISSING)eset%!}(MISSING)> | ||
| <{%fg 3%}> ~ publicHostName: <{%reset%}><{%fg 1%}>"ec2-34-211-56-110.us-west-2.compute.amazonaws.com"<{%reset%}><{%fg 3%}> => <{%reset%}><{%fg 2%}>output<string><{%reset%}><{%fg 3%}> | ||
| <{%reset%}><{%fg 3%}> ~ publicIp : <{%reset%}><{%fg 1%}>"34.211.56.110"<{%reset%}><{%fg 3%}> => <{%reset%}><{%fg 2%}>output<string><{%reset%}><{%fg 3%}> | ||
| <{%reset%}> <{%fg 9%}>--aws:ec2/instance:Instance: (delete-replaced) | ||
| <{%fg 9%}> [id=i-0207dc7a2d8c5135a] | ||
| <{%reset%}><{%fg 9%}> [urn=urn:pulumi:dev::aws-ts-webserver::aws:ec2/instance:Instance::web-server-www] | ||
| <{%reset%}><{%fg 9%}> [provider=urn:pulumi:dev::aws-ts-webserver::pulumi:providers:aws::default_3_38_1::57baf899-740a-486a-908e-43cf27cce182] | ||
| <{%reset%}><{%fg 9%}> ami : <{%reset%}><{%fg 9%}>"ami-0175af5baaf2bce8e"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> getPasswordData : <{%reset%}><{%fg 9%}>false<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> instanceType : <{%reset%}><{%fg 9%}>"t2.micro"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> sourceDestCheck : <{%reset%}><{%fg 9%}>true<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> tags : <{%reset%}><{%fg 9%}>{ | ||
| <{%reset%}><{%fg 9%}> Name : <{%reset%}><{%fg 9%}>"web-server-www"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> }<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> userData : <{%reset%}><{%fg 9%}>"#!/bin/bash\necho \"Hello, World!\" > index.html\nnohup python -m SimpleHTTPServer 80 &"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> vpcSecurityGroupIds: <{%reset%}><{%fg 9%}>[ | ||
| <{%reset%}><{%fg 9%}> [0]: <{%reset%}><{%fg 9%}>"sg-07498abcdbdf88f34"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> ]<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%reset%}><{%fg 13%}><{%bold%}>Resources:<{%reset%}> | ||
| <{%fg 13%}>+-1 replaced<{%reset%}> | ||
| 2 unchanged | ||
|
|
||
| <{%fg 13%}><{%bold%}>Duration:<{%reset%}> 12s |
66 changes: 66 additions & 0 deletions
66
pkg/backend/display/testdata/webserver-userdata.json.stdout.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <{%reset%}>Configuration:<{%reset%}> | ||
| aws:region: us-west-2 | ||
| <{%reset%}> pulumi:pulumi:Stack: (same) | ||
| <{%reset%}> [urn=urn:pulumi:dev::aws-ts-webserver::pulumi:pulumi:Stack::aws-ts-webserver-dev] | ||
| <{%reset%}><{%reset%}><{%!r(MISSING)eset%!}(MISSING)> --outputs:--<{%!r(MISSING)eset%!}(MISSING)> | ||
| <{%reset%}> publicHostName: <{%reset%}><{%reset%}>"ec2-34-211-56-110.us-west-2.compute.amazonaws.com"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> publicIp : <{%reset%}><{%reset%}>"34.211.56.110"<{%reset%}><{%reset%}> | ||
| <{%reset%}> <{%reset%}> aws:ec2/securityGroup:SecurityGroup: (same) | ||
| <{%reset%}> [id=sg-07498abcdbdf88f34] | ||
| <{%reset%}><{%reset%}> [urn=urn:pulumi:dev::aws-ts-webserver::aws:ec2/securityGroup:SecurityGroup::web-secgrp] | ||
| <{%reset%}><{%reset%}> [provider=urn:pulumi:dev::aws-ts-webserver::pulumi:providers:aws::default_3_38_1::57baf899-740a-486a-908e-43cf27cce182] | ||
| <{%reset%}><{%reset%}> description : <{%reset%}><{%reset%}>"Managed by Pulumi"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> ingress : <{%reset%}><{%reset%}>[ | ||
| <{%reset%}><{%reset%}> [0]: <{%reset%}><{%reset%}>{ | ||
| <{%reset%}><{%reset%}> cidrBlocks: <{%reset%}><{%reset%}>[ | ||
| <{%reset%}><{%reset%}> [0]: <{%reset%}><{%reset%}>"0.0.0.0/0"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> ]<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> fromPort : <{%reset%}><{%reset%}>80<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> protocol : <{%reset%}><{%reset%}>"tcp"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> self : <{%reset%}><{%reset%}>false<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> toPort : <{%reset%}><{%reset%}>80<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> }<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> ]<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> name : <{%reset%}><{%reset%}>"web-secgrp-5ee4db6"<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> revokeRulesOnDelete: <{%reset%}><{%reset%}>false<{%reset%}><{%reset%}> | ||
| <{%reset%}><{%reset%}> <{%fg 10%}>++aws:ec2/instance:Instance: (create-replacement) | ||
| <{%reset%}> [id=i-0207dc7a2d8c5135a] | ||
| <{%reset%}><{%reset%}> [urn=urn:pulumi:dev::aws-ts-webserver::aws:ec2/instance:Instance::web-server-www] | ||
| <{%reset%}><{%reset%}> [provider=urn:pulumi:dev::aws-ts-webserver::pulumi:providers:aws::default_3_38_1::57baf899-740a-486a-908e-43cf27cce182] | ||
| <{%reset%}><{%fg 3%}> ~ userData: <{%reset%}><{%fg 3%}> | ||
| <{%reset%}><{%reset%}> #!/bin/bash<{%reset%}> | ||
| <{%fg 1%}> - echo "Hello, World!" > index.html<{%reset%}> | ||
| <{%fg 2%}> + echo "Hello, Pulumi!" > index.html<{%reset%}> | ||
| <{%reset%}> nohup python -m SimpleHTTPServer 80 &<{%reset%}> | ||
| <{%reset%}> <{%fg 13%}>+-aws:ec2/instance:Instance: (replace) | ||
| <{%reset%}> [id=i-0207dc7a2d8c5135a] | ||
| <{%reset%}><{%reset%}> [urn=urn:pulumi:dev::aws-ts-webserver::aws:ec2/instance:Instance::web-server-www] | ||
| <{%reset%}><{%reset%}> [provider=urn:pulumi:dev::aws-ts-webserver::pulumi:providers:aws::default_3_38_1::57baf899-740a-486a-908e-43cf27cce182] | ||
| <{%reset%}><{%fg 3%}> ~ userData: <{%reset%}><{%fg 3%}> | ||
| <{%reset%}><{%reset%}> #!/bin/bash<{%reset%}> | ||
| <{%fg 1%}> - echo "Hello, World!" > index.html<{%reset%}> | ||
| <{%fg 2%}> + echo "Hello, Pulumi!" > index.html<{%reset%}> | ||
| <{%reset%}> nohup python -m SimpleHTTPServer 80 &<{%reset%}> | ||
| <{%reset%}><{%!r(MISSING)eset%!}(MISSING)> --outputs:--<{%!r(MISSING)eset%!}(MISSING)> | ||
| <{%fg 3%}> ~ publicHostName: <{%reset%}><{%fg 1%}>"ec2-34-211-56-110.us-west-2.compute.amazonaws.com"<{%reset%}><{%fg 3%}> => <{%reset%}><{%fg 2%}>output<string><{%reset%}><{%fg 3%}> | ||
| <{%reset%}><{%fg 3%}> ~ publicIp : <{%reset%}><{%fg 1%}>"34.211.56.110"<{%reset%}><{%fg 3%}> => <{%reset%}><{%fg 2%}>output<string><{%reset%}><{%fg 3%}> | ||
| <{%reset%}> <{%fg 9%}>--aws:ec2/instance:Instance: (delete-replaced) | ||
| <{%fg 9%}> [id=i-0207dc7a2d8c5135a] | ||
| <{%reset%}><{%fg 9%}> [urn=urn:pulumi:dev::aws-ts-webserver::aws:ec2/instance:Instance::web-server-www] | ||
| <{%reset%}><{%fg 9%}> [provider=urn:pulumi:dev::aws-ts-webserver::pulumi:providers:aws::default_3_38_1::57baf899-740a-486a-908e-43cf27cce182] | ||
| <{%reset%}><{%fg 9%}> ami : <{%reset%}><{%fg 9%}>"ami-0175af5baaf2bce8e"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> getPasswordData : <{%reset%}><{%fg 9%}>false<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> instanceType : <{%reset%}><{%fg 9%}>"t2.micro"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> sourceDestCheck : <{%reset%}><{%fg 9%}>true<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> tags : <{%reset%}><{%fg 9%}>{ | ||
| <{%reset%}><{%fg 9%}> Name : <{%reset%}><{%fg 9%}>"web-server-www"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> }<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> userData : <{%reset%}><{%fg 9%}>"#!/bin/bash\necho \"Hello, World!\" > index.html\nnohup python -m SimpleHTTPServer 80 &"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> vpcSecurityGroupIds: <{%reset%}><{%fg 9%}>[ | ||
| <{%reset%}><{%fg 9%}> [0]: <{%reset%}><{%fg 9%}>"sg-07498abcdbdf88f34"<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%fg 9%}> ]<{%reset%}><{%fg 9%}> | ||
| <{%reset%}><{%reset%}><{%fg 13%}><{%bold%}>Resources:<{%reset%}> | ||
| <{%fg 13%}>+-1 replaced<{%reset%}> | ||
| 2 unchanged | ||
|
|
||
| <{%fg 13%}><{%bold%}>Duration:<{%reset%}> 12s |