Disable accurate previews for PF tests (#2752)

This change disables accurate previews for the PF tests as accurate preview rollout for PF is blocked on #2660 The first commit here are the code changes and the second one is test recordings.
pulumi · Dec 16, 2024 · bf5a600 · bf5a600
1 parent 731e5a1
commit bf5a600
Show file tree

Hide file tree

Showing 326 changed files with 1,105 additions and 896 deletions.
diff --git a/dynamic/provider_test.go b/dynamic/provider_test.go
@@ -62,10 +62,8 @@ func TestStacktraceDisplayed(t *testing.T) {
 }
 
 func TestPrimitiveTypes(t *testing.T) {
+	t.Parallel()
 	skipWindows(t)
-	// TODO[pulumi/pulumi-terraform-bridge#2517]: fix once accurate bridge previews are enabled by default
-	t.Setenv("PULUMI_TF_BRIDGE_ACCURATE_BRIDGE_PREVIEW", "true")
-
 	ctx := context.Background()
 
 	grpc := grpcTestServer(ctx, t)

diff --git a/dynamic/testdata/TestPrimitiveTypes/diff(all).golden b/dynamic/testdata/TestPrimitiveTypes/diff(all).golden
@@ -1,22 +1,5 @@
 {
   "changes": "DIFF_SOME",
-  "detailedDiff": {
-    "attrBoolRequired": {
-      "kind": "UPDATE"
-    },
-    "attrIntRequired": {
-      "kind": "UPDATE"
-    },
-    "attrNumberComputed": {},
-    "attrNumberRequired": {
-      "kind": "UPDATE"
-    },
-    "attrStringDefault": {},
-    "attrStringDefaultOverridden": {},
-    "attrStringRequired": {
-      "kind": "UPDATE"
-    }
-  },
   "diffs": [
     "attrBoolRequired",
     "attrIntRequired",
@@ -25,6 +8,5 @@
     "attrStringDefault",
     "attrStringDefaultOverridden",
     "attrStringRequired"
-  ],
-  "hasDetailedDiff": true
+  ]
 }
diff --git a/dynamic/testdata/TestPrimitiveTypes/diff(some).golden b/dynamic/testdata/TestPrimitiveTypes/diff(some).golden
@@ -1,22 +1,10 @@
 {
   "changes": "DIFF_SOME",
-  "detailedDiff": {
-    "attrNumberComputed": {},
-    "attrNumberRequired": {
-      "kind": "DELETE"
-    },
-    "attrStringDefault": {},
-    "attrStringDefaultOverridden": {},
-    "attrStringRequired": {
-      "kind": "UPDATE"
-    }
-  },
   "diffs": [
     "attrNumberComputed",
     "attrNumberRequired",
     "attrStringDefault",
     "attrStringDefaultOverridden",
     "attrStringRequired"
-  ],
-  "hasDetailedDiff": true
+  ]
 }
diff --git a/pkg/pf/tests/diff_list_test.go b/pkg/pf/tests/diff_list_test.go
@@ -236,7 +236,9 @@ func TestDetailedDiffList(t *testing.T) {
 					})
 
 					diff := crosstests.Diff(
-						t, res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue})
+						t, res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue},
+						crosstests.DisableAccurateBridgePreview(),
+					)
 
 					autogold.ExpectFile(t, testOutput{
 						initialValue: scenario.initialValue,

diff --git a/pkg/pf/tests/diff_map_test.go b/pkg/pf/tests/diff_map_test.go
@@ -178,7 +178,10 @@ func TestDetailedDiffMap(t *testing.T) {
 						ResourceSchema: schemaValueMakerPair.schema,
 					})
 
-					diff := crosstests.Diff(t, res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue})
+					diff := crosstests.Diff(
+						t, res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue},
+						crosstests.DisableAccurateBridgePreview(),
+					)
 
 					autogold.ExpectFile(t, testOutput{
 						initialValue: scenario.initialValue,

diff --git a/pkg/pf/tests/diff_object_test.go b/pkg/pf/tests/diff_object_test.go
@@ -337,7 +337,10 @@ func TestDetailedDiffObject(t *testing.T) {
 					res := pb.NewResource(pb.NewResourceArgs{
 						ResourceSchema: schema.schema,
 					})
-					diff := crosstests.Diff(t, res, initialValue, changeValue)
+					diff := crosstests.Diff(
+						t, res, initialValue, changeValue,
+						crosstests.DisableAccurateBridgePreview(),
+					)
 					autogold.ExpectFile(t, testOutput{
 						initialValue: scenario.initialValue,
 						changeValue:  scenario.changeValue,
@@ -357,7 +360,10 @@ func TestDetailedDiffObject(t *testing.T) {
 						res := pb.NewResource(pb.NewResourceArgs{
 							ResourceSchema: schema.schema,
 						})
-						diff := crosstests.Diff(t, res, initialValue, changeValue)
+						diff := crosstests.Diff(
+							t, res, initialValue, changeValue,
+							crosstests.DisableAccurateBridgePreview(),
+						)
 						autogold.ExpectFile(t, testOutput{
 							initialValue: scenario.initialValue,
 							changeValue:  scenario.changeValue,

diff --git a/pkg/pf/tests/diff_set_test.go b/pkg/pf/tests/diff_set_test.go
@@ -595,7 +595,10 @@ func TestDetailedDiffSet(t *testing.T) {
 					initialValue := schemaValueMakerPair.valueMaker(scenario.initialValue)
 					changeValue := schemaValueMakerPair.valueMaker(scenario.changeValue)
 
-					diff := crosstests.Diff(t, schemaValueMakerPair.res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue})
+					diff := crosstests.Diff(
+						t, schemaValueMakerPair.res, map[string]cty.Value{"key": initialValue}, map[string]cty.Value{"key": changeValue},
+						crosstests.DisableAccurateBridgePreview(),
+					)
 
 					autogold.ExpectFile(t, testOutput{
 						initialValue: scenario.initialValue,

diff --git a/pkg/pf/tests/genrandom_test.go b/pkg/pf/tests/genrandom_test.go
@@ -48,7 +48,7 @@ func TestGenRandom(t *testing.T) {
 
 		t.Run(trace, func(t *testing.T) {
 			p := testprovider.RandomProvider()
-			p.EnableAccurateBridgePreview = true
+			p.EnableAccurateBridgePreview = false
 			server, err := newProviderServer(t, p)
 			require.NoError(t, err)
 			testutils.ReplayFile(t, server, trace)

diff --git a/pkg/pf/tests/genupdate_test.go b/pkg/pf/tests/genupdate_test.go
@@ -35,7 +35,7 @@ func TestGenUpdates(t *testing.T) {
 	trace := "testdata/updateprogram.json"
 
 	info := testprovider.SyntheticTestBridgeProvider()
-	info.EnableAccurateBridgePreview = true
+	info.EnableAccurateBridgePreview = false
 	server, err := newProviderServer(t, info)
 	require.NoError(t, err)
 	testutils.ReplayFile(t, server, trace)

diff --git a/pkg/pf/tests/internal/cross-tests/diff.go b/pkg/pf/tests/internal/cross-tests/diff.go
@@ -109,7 +109,8 @@ func Diff(t T, res pb.Resource, tfConfig1, tfConfig2 map[string]cty.Value, optio
 	require.NoError(t, err)
 	t.Logf("Pulumi.yaml:\n%s", string(bytes))
 
-	pt, err := pulcheck.PulCheck(t, bridgedProvider(prov, bridgedProviderOpts{enableAccurateBridgePreview: true}), string(bytes))
+	pt, err := pulcheck.PulCheck(
+		t, bridgedProvider(prov, bridgedProviderOpts{enableAccurateBridgePreview: !opts.disableAccurateBridgePreview}), string(bytes))
 	require.NoError(t, err)
 	pt.Up(t)
 
@@ -133,7 +134,8 @@ func Diff(t T, res pb.Resource, tfConfig1, tfConfig2 map[string]cty.Value, optio
 }
 
 type diffOpts struct {
-	resourceInfo map[string]*info.Schema
+	resourceInfo                 map[string]*info.Schema
+	disableAccurateBridgePreview bool
 }
 
 type DiffOption func(*diffOpts)
@@ -142,3 +144,8 @@ type DiffOption func(*diffOpts)
 func DiffProviderInfo(info map[string]*info.Schema) DiffOption {
 	return func(o *diffOpts) { o.resourceInfo = info }
 }
+
+// DisableAccurateBridgePreview disables the accurate bridge preview feature.
+func DisableAccurateBridgePreview() DiffOption {
+	return func(o *diffOpts) { o.disableAccurateBridgePreview = true }
+}
diff --git a/pkg/pf/tests/provider_diff_test.go b/pkg/pf/tests/provider_diff_test.go
@@ -57,7 +57,7 @@ func TestEmptyTestresDiff(t *testing.T) {
 func TestOptionRemovalTestresDiff(t *testing.T) {
 	t.Parallel()
 	info := testprovider.SyntheticTestBridgeProvider()
-	info.EnableAccurateBridgePreview = true
+	info.EnableAccurateBridgePreview = false
 	server, err := newProviderServer(t, info)
 	require.NoError(t, err)
 	testCase := `
@@ -82,13 +82,7 @@ func TestOptionRemovalTestresDiff(t *testing.T) {
             "changes": "DIFF_SOME",
             "diffs": [
                "optionalInputString"
-            ],
-            "hasDetailedDiff": true,
-            "detailedDiff": {
-              "optionalInputString": {
-                "kind": "DELETE"
-              }
-            }
+            ]
           }
         }
         `
@@ -270,7 +264,7 @@ func TestSetNestedObjectAdded(t *testing.T) {
 func TestSetNestedObjectAddedOtherDiff(t *testing.T) {
 	t.Parallel()
 	info := testprovider.SyntheticTestBridgeProvider()
-	info.EnableAccurateBridgePreview = true
+	info.EnableAccurateBridgePreview = false
 	server, err := newProviderServer(t, info)
 	require.NoError(t, err)
 	testCase := `
@@ -317,13 +311,7 @@ func TestSetNestedObjectAddedOtherDiff(t *testing.T) {
             "diffs": [
               "other",
               "vlanNames"
-            ],
-            "hasDetailedDiff": true,
-            "detailedDiff": {
-              "other": {
-                "kind": "UPDATE"
-              }
-            }
+            ]
           }
         }
         `

diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added.golden
@@ -32,5 +32,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys[0]": map[string]interface{}{}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added_end.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added_end.golden
@@ -35,11 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy.
         [id=test-id]
         [urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
       ~ keys: [
+            [0]: "val1"
+            [1]: "val2"
           + [2]: "val3"
         ]
 Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys[2]": map[string]interface{}{}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added_front.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added_front.golden
@@ -43,9 +43,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{
-		"keys[0]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[1]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[2]": map[string]interface{}{},
-	},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added_middle.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/added_middle.golden
@@ -35,15 +35,12 @@ Plan: 0 to add, 1 to change, 0 to destroy.
         [id=test-id]
         [urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
       ~ keys: [
+            [0]: "val1"
           ~ [1]: "val3" => "val2"
           + [2]: "val3"
         ]
 Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{
-		"keys[1]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[2]": map[string]interface{}{},
-	},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/changed_empty_to_null.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/changed_empty_to_null.golden
@@ -27,5 +27,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys": map[string]interface{}{"kind": "DELETE"}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/changed_non-empty.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/changed_non-empty.golden
@@ -34,5 +34,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys[0]": map[string]interface{}{"kind": "UPDATE"}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/changed_null_to_empty.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/changed_null_to_empty.golden
@@ -27,5 +27,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys": map[string]interface{}{}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/element_added.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/element_added.golden
@@ -32,11 +32,11 @@ Plan: 0 to add, 1 to change, 0 to destroy.
         [id=test-id]
         [urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
       ~ keys: [
+            [0]: "value"
           + [1]: "value1"
         ]
 Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys[1]": map[string]interface{}{}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/element_removed.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/element_removed.golden
@@ -30,11 +30,11 @@ Plan: 0 to add, 1 to change, 0 to destroy.
         [id=test-id]
         [urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
       ~ keys: [
+            [0]: "value"
           - [1]: "value1"
         ]
 Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys[1]": map[string]interface{}{"kind": "DELETE"}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/long_list_added.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/long_list_added.golden
@@ -71,11 +71,30 @@ Plan: 0 to add, 1 to change, 0 to destroy.
         [id=test-id]
         [urn=urn:pulumi:test::project::testprovider:index/test:Test::p]
       ~ keys: [
+            [0]: "value0"
+            [1]: "value1"
+            [2]: "value2"
+            [3]: "value3"
+            [4]: "value4"
+            [5]: "value5"
+            [6]: "value6"
+            [7]: "value7"
+            [8]: "value8"
+            [9]: "value9"
+            [10]: "value10"
+            [11]: "value11"
+            [12]: "value12"
+            [13]: "value13"
+            [14]: "value14"
+            [15]: "value15"
+            [16]: "value16"
+            [17]: "value17"
+            [18]: "value18"
+            [19]: "value19"
           + [20]: "value20"
         ]
 Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys[20]": map[string]interface{}{}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/long_list_added_front.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/long_list_added_front.golden
@@ -97,27 +97,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{
-		"keys[0]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[10]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[11]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[12]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[13]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[14]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[15]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[16]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[17]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[18]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[19]": map[string]interface{}{"kind": "UPDATE"},
-		"keys[1]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[20]": map[string]interface{}{},
-		"keys[2]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[3]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[4]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[5]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[6]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[7]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[8]":  map[string]interface{}{"kind": "UPDATE"},
-		"keys[9]":  map[string]interface{}{"kind": "UPDATE"},
-	},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/non-null_to_null.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/non-null_to_null.golden
@@ -33,5 +33,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys": map[string]interface{}{"kind": "DELETE"}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/null_to_non-null.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/null_to_non-null.golden
@@ -33,5 +33,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys": map[string]interface{}{}},
 }
diff --git a/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/removed.golden b/pkg/pf/tests/testdata/TestDetailedDiffList/attribute_no_replace/removed.golden
@@ -34,5 +34,4 @@ Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"keys[0]": map[string]interface{}{"kind": "DELETE"}},
 }