Skip to content

Commit 005a1f5

Browse files
VenelinMartinovVenelinMartinov
authored
PF detailed diff (#2629)
This change integrates the detailed diff v2 algorithm for the Plugin Framework bridge. This leads to better previews for many common operations. Will follow-up on #2660 as the only regression compared to not computing the detailed diff in the bridge. fixes #752 fixes #2647 fixes #2649 fixes #2650
1 parent ea35eb2 commit 005a1f5

File tree

223 files changed

+3113
-1036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+3113
-1036
lines changed

‎dynamic/testdata/TestPrimitiveTypes/diff(all).golden

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
{
22
"changes": "DIFF_SOME",
3+
"detailedDiff": {
4+
"attrBoolRequired": {
5+
"kind": "UPDATE"
6+
},
7+
"attrIntRequired": {
8+
"kind": "UPDATE"
9+
},
10+
"attrNumberComputed": {},
11+
"attrNumberRequired": {
12+
"kind": "UPDATE"
13+
},
14+
"attrStringDefault": {},
15+
"attrStringDefaultOverridden": {},
16+
"attrStringRequired": {
17+
"kind": "UPDATE"
18+
}
19+
},
320
"diffs": [
421
"attrBoolRequired",
522
"attrIntRequired",
@@ -8,5 +25,6 @@
825
"attrStringDefault",
926
"attrStringDefaultOverridden",
1027
"attrStringRequired"
11-
]
28+
],
29+
"hasDetailedDiff": true
1230
}

‎dynamic/testdata/TestPrimitiveTypes/diff(some).golden

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
{
22
"changes": "DIFF_SOME",
3+
"detailedDiff": {
4+
"attrNumberComputed": {},
5+
"attrNumberRequired": {
6+
"kind": "DELETE"
7+
},
8+
"attrStringDefault": {},
9+
"attrStringDefaultOverridden": {},
10+
"attrStringRequired": {
11+
"kind": "UPDATE"
12+
}
13+
},
314
"diffs": [
415
"attrNumberComputed",
516
"attrNumberRequired",
617
"attrStringDefault",
718
"attrStringDefaultOverridden",
819
"attrStringRequired"
9-
]
20+
],
21+
"hasDetailedDiff": true
1022
}

‎pkg/pf/tests/diff_secret_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
)
1919

2020
func TestSecretBasic(t *testing.T) {
21+
t.Skip("skipping until #2643")
2122
t.Parallel()
2223
provBuilder := providerbuilder.NewProvider(
2324
providerbuilder.NewProviderArgs{
@@ -65,6 +66,7 @@ Resources:
6566
}
6667

6768
func TestSecretSet(t *testing.T) {
69+
t.Skip("skipping until #2643")
6870
t.Parallel()
6971

7072
provBuilder := pb.NewProvider(pb.NewProviderArgs{
@@ -158,6 +160,7 @@ Resources:
158160
}
159161

160162
func TestSecretObjectBlock(t *testing.T) {
163+
t.Skip("skipping until #2643")
161164
t.Parallel()
162165

163166
provBuilder := pb.NewProvider(pb.NewProviderArgs{
@@ -259,6 +262,7 @@ Resources:
259262
}
260263

261264
func TestSecretPulumiSchema(t *testing.T) {
265+
t.Skip("skipping until #2643")
262266
t.Parallel()
263267

264268
provBuilder := pb.NewProvider(pb.NewProviderArgs{

‎pkg/pf/tests/provider_diff_test.go

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,13 @@ func TestOptionRemovalTestresDiff(t *testing.T) {
8080
"changes": "DIFF_SOME",
8181
"diffs": [
8282
"optionalInputString"
83-
]
83+
],
84+
"hasDetailedDiff": true,
85+
"detailedDiff": {
86+
"optionalInputString": {
87+
"kind": "DELETE"
88+
}
89+
}
8490
}
8591
}
8692
`
@@ -121,6 +127,8 @@ func TestEmptyTestresDiffWithOptionalComputed(t *testing.T) {
121127

122128
func TestDiffWithSecrets(t *testing.T) {
123129
t.Parallel()
130+
t.Skip("TODO: secrets")
131+
124132
server, err := newProviderServer(t, testprovider.RandomProvider())
125133
require.NoError(t, err)
126134

@@ -165,6 +173,7 @@ func TestDiffWithSecrets(t *testing.T) {
165173
// See https://github.com/pulumi/pulumi-random/issues/258
166174
func TestDiffVersionUpgrade(t *testing.T) {
167175
t.Parallel()
176+
t.Skip("TODO: secrets")
168177
server, err := newProviderServer(t, testprovider.RandomProvider())
169178
require.NoError(t, err)
170179
testCase := `
@@ -307,7 +316,13 @@ func TestSetNestedObjectAddedOtherDiff(t *testing.T) {
307316
"diffs": [
308317
"other",
309318
"vlanNames"
310-
]
319+
],
320+
"hasDetailedDiff": true,
321+
"detailedDiff": {
322+
"other": {
323+
"kind": "UPDATE"
324+
}
325+
}
311326
}
312327
}
313328
`

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added_end.golden

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Plan: 0 to add, 1 to change, 0 to destroy.
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
3737
~ keys: [
38-
[0]: "val1"
39-
[1]: "val2"
4038
+ [2]: "val3"
4139
]
4240
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added_middle.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Plan: 0 to add, 1 to change, 0 to destroy.
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
3737
~ keys: [
38-
[0]: "val1"
3938
~ [1]: "val3" => "val2"
4039
+ [2]: "val3"
4140
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/element_added.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Plan: 0 to add, 1 to change, 0 to destroy.
3232
[id=test-id]
3333
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
3434
~ keys: [
35-
[0]: "value"
3635
+ [1]: "value1"
3736
]
3837
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/element_removed.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Plan: 0 to add, 1 to change, 0 to destroy.
3030
[id=test-id]
3131
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
3232
~ keys: [
33-
[0]: "value"
3433
- [1]: "value1"
3534
]
3635
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/long_list_added.golden

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,26 +71,6 @@ Plan: 0 to add, 1 to change, 0 to destroy.
7171
[id=test-id]
7272
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
7373
~ keys: [
74-
[0]: "value0"
75-
[1]: "value1"
76-
[2]: "value2"
77-
[3]: "value3"
78-
[4]: "value4"
79-
[5]: "value5"
80-
[6]: "value6"
81-
[7]: "value7"
82-
[8]: "value8"
83-
[9]: "value9"
84-
[10]: "value10"
85-
[11]: "value11"
86-
[12]: "value12"
87-
[13]: "value13"
88-
[14]: "value14"
89-
[15]: "value15"
90-
[16]: "value16"
91-
[17]: "value17"
92-
[18]: "value18"
93-
[19]: "value19"
9474
+ [20]: "value20"
9575
]
9676
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/removed_end.golden

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Plan: 0 to add, 1 to change, 0 to destroy.
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
3737
~ keys: [
38-
[0]: "val1"
39-
[1]: "val2"
4038
- [2]: "val3"
4139
]
4240
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/removed_middle.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Plan: 0 to add, 1 to change, 0 to destroy.
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
3737
~ keys: [
38-
[0]: "val1"
3938
~ [1]: "val2" => "val3"
4039
- [2]: "val3"
4140
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/added.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2525
+-testprovider:index/test:Test: (replace)
2626
[id=test-id]
2727
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
28-
~ id : "test-id" => output<string>
2928
~ keys: [
3029
+ [0]: "value"
3130
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/added_end.golden

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ Plan: 1 to add, 0 to change, 1 to destroy.
3434
+-testprovider:index/test:Test: (replace)
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
37-
~ id : "test-id" => output<string>
3837
~ keys: [
39-
[0]: "val1"
40-
[1]: "val2"
4138
+ [2]: "val3"
4239
]
4340
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/added_front.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
3434
+-testprovider:index/test:Test: (replace)
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
37-
~ id : "test-id" => output<string>
3837
~ keys: [
3938
~ [0]: "val2" => "val1"
4039
~ [1]: "val3" => "val2"

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/added_middle.golden

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ Plan: 1 to add, 0 to change, 1 to destroy.
3434
+-testprovider:index/test:Test: (replace)
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
37-
~ id : "test-id" => output<string>
3837
~ keys: [
39-
[0]: "val1"
4038
~ [1]: "val3" => "val2"
4139
+ [2]: "val3"
4240
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/changed_empty_to_null.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2222
+-testprovider:index/test:Test: (replace)
2323
[id=test-id]
2424
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
25-
~ id : "test-id" => output<string>
2625
- keys: []
2726
Resources:
2827
+-1 to replace

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/changed_non-empty.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2727
+-testprovider:index/test:Test: (replace)
2828
[id=test-id]
2929
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
30-
~ id : "test-id" => output<string>
3130
~ keys: [
3231
~ [0]: "value" => "value1"
3332
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/changed_null_to_empty.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2222
+-testprovider:index/test:Test: (replace)
2323
[id=test-id]
2424
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
25-
~ id : "test-id" => output<string>
2625
+ keys: []
2726
Resources:
2827
+-1 to replace

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/element_added.golden

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ Plan: 1 to add, 0 to change, 1 to destroy.
3131
+-testprovider:index/test:Test: (replace)
3232
[id=test-id]
3333
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
34-
~ id : "test-id" => output<string>
3534
~ keys: [
36-
[0]: "value"
3735
+ [1]: "value1"
3836
]
3937
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/element_removed.golden

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2929
+-testprovider:index/test:Test: (replace)
3030
[id=test-id]
3131
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
32-
~ id : "test-id" => output<string>
3332
~ keys: [
34-
[0]: "value"
3533
- [1]: "value1"
3634
]
3735
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/long_list_added.golden

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -70,28 +70,7 @@ Plan: 1 to add, 0 to change, 1 to destroy.
7070
+-testprovider:index/test:Test: (replace)
7171
[id=test-id]
7272
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
73-
~ id : "test-id" => output<string>
7473
~ keys: [
75-
[0]: "value0"
76-
[1]: "value1"
77-
[2]: "value2"
78-
[3]: "value3"
79-
[4]: "value4"
80-
[5]: "value5"
81-
[6]: "value6"
82-
[7]: "value7"
83-
[8]: "value8"
84-
[9]: "value9"
85-
[10]: "value10"
86-
[11]: "value11"
87-
[12]: "value12"
88-
[13]: "value13"
89-
[14]: "value14"
90-
[15]: "value15"
91-
[16]: "value16"
92-
[17]: "value17"
93-
[18]: "value18"
94-
[19]: "value19"
9574
+ [20]: "value20"
9675
]
9776
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/long_list_added_front.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
7070
+-testprovider:index/test:Test: (replace)
7171
[id=test-id]
7272
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
73-
~ id : "test-id" => output<string>
7473
~ keys: [
7574
~ [0]: "value0" => "value20"
7675
~ [1]: "value1" => "value0"

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/non-null_to_null.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2626
+-testprovider:index/test:Test: (replace)
2727
[id=test-id]
2828
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
29-
~ id : "test-id" => output<string>
3029
- keys: [
3130
- [0]: "value"
3231
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/null_to_non-null.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2626
+-testprovider:index/test:Test: (replace)
2727
[id=test-id]
2828
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
29-
~ id : "test-id" => output<string>
3029
+ keys: [
3130
+ [0]: "value"
3231
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/removed.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2727
+-testprovider:index/test:Test: (replace)
2828
[id=test-id]
2929
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
30-
~ id : "test-id" => output<string>
3130
~ keys: [
3231
- [0]: "value"
3332
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/removed_end.golden

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ Plan: 1 to add, 0 to change, 1 to destroy.
3434
+-testprovider:index/test:Test: (replace)
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
37-
~ id : "test-id" => output<string>
3837
~ keys: [
39-
[0]: "val1"
40-
[1]: "val2"
4138
- [2]: "val3"
4239
]
4340
Resources:

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/removed_front.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
3434
+-testprovider:index/test:Test: (replace)
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
37-
~ id : "test-id" => output<string>
3837
~ keys: [
3938
~ [0]: "val1" => "val2"
4039
~ [1]: "val2" => "val3"

‎pkg/pf/tests/testdata/TestDetailedDiffList/attribute_requires_replace/removed_middle.golden

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ Plan: 1 to add, 0 to change, 1 to destroy.
3434
+-testprovider:index/test:Test: (replace)
3535
[id=test-id]
3636
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
37-
~ id : "test-id" => output<string>
3837
~ keys: [
39-
[0]: "val1"
4038
~ [1]: "val2" => "val3"
4139
- [2]: "val3"
4240
]

‎pkg/pf/tests/testdata/TestDetailedDiffList/block_nested_requires_replace/added.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Plan: 1 to add, 0 to change, 1 to destroy.
2626
+-testprovider:index/test:Test: (replace)
2727
[id=test-id]
2828
[urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
29-
~ id : "test-id" => output<string>
3029
~ keys: [
3130
+ [0]: {
3231
+ nested: "value"

0 commit comments

Comments
 (0)