SDKv2 Diff tests for primitive types (#2829)

This PR finishes the test coverage for primitive types (string, bool,
int and float) for the SDKv2 bridge for Diff.
[14807c6](14807c6)
and
[8552a4a](8552a4a)
contain the test recordings.

fixes #2786

pkg/tests/diff_test/detailed_diff_test.go → pkg/tests/diff_test/detailed_diff_map_test.go

@@ -10,58 +10,6 @@ import (
 	crosstests "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests"
 )
 
-func TestSDKv2DetailedDiffString(t *testing.T) {
-	t.Parallel()
-
-	res := schema.Resource{
-		Schema: map[string]*schema.Schema{
-			"string_prop": {
-				Type:     schema.TypeString,
-				Optional: true,
-			},
-		},
-	}
-
-	valueOne := ref("val1")
-	valueTwo := ref("val2")
-	var noValue *string
-
-	ctyVal := func(v *string) map[string]cty.Value {
-		if v == nil {
-			return map[string]cty.Value{}
-		}
-		return map[string]cty.Value{
-			"string_prop": cty.StringVal(*v),
-		}
-	}
-
-	scenarios := []struct {
-		name         string
-		initialValue *string
-		changeValue  *string
-	}{
-		{"unchanged empty", noValue, noValue},
-		{"unchanged non-empty", valueOne, valueOne},
-		{"added", noValue, valueOne},
-		{"removed", valueOne, noValue},
-		{"changed", valueOne, valueTwo},
-	}
-
-	for _, scenario := range scenarios {
-		t.Run(scenario.name, func(t *testing.T) {
-			t.Parallel()
-			diff := crosstests.Diff(t, &res, ctyVal(scenario.initialValue), ctyVal(scenario.changeValue))
-			autogold.ExpectFile(t, testOutput{
-				initialValue: scenario.initialValue,
-				changeValue:  scenario.changeValue,
-				tfOut:        diff.TFOut,
-				pulumiOut:    diff.PulumiOut,
-				detailedDiff: diff.PulumiDiff.DetailedDiff,
-			})
-		})
-	}
-}
-
 func TestSDKv2DetailedDiffMap(t *testing.T) {
 	t.Parallel()
 

pkg/tests/diff_test/detailed_diff_primitive_test.go

@@ -0,0 +1,48 @@
+package tests
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/zclconf/go-cty/cty"
+)
+
+func TestSDKv2DetailedDiffString(t *testing.T) {
+	t.Parallel()
+
+	var nilVal string
+	schemaValueMakerPairs, scenarios := generateBaseTests(
+		schema.TypeString, cty.StringVal, "val1", "val2", "computed", "default", nilVal)
+
+	runSDKv2TestMatrix(t, schemaValueMakerPairs, scenarios)
+}
+
+func TestSDKv2DetailedDiffBool(t *testing.T) {
+	t.Parallel()
+
+	var nilVal bool
+	schemaValueMakerPairs, scenarios := generateBaseTests(
+		schema.TypeBool, cty.BoolVal, true, false, true, false, nilVal)
+
+	runSDKv2TestMatrix(t, schemaValueMakerPairs, scenarios)
+}
+
+func TestSDKv2DetailedDiffInt(t *testing.T) {
+	t.Parallel()
+
+	var nilVal int64
+	schemaValueMakerPairs, scenarios := generateBaseTests(
+		schema.TypeInt, cty.NumberIntVal, 1, 2, 3, 4, nilVal)
+
+	runSDKv2TestMatrix(t, schemaValueMakerPairs, scenarios)
+}
+
+func TestSDKv2DetailedDiffFloat(t *testing.T) {
+	t.Parallel()
+
+	var nilVal float64
+	schemaValueMakerPairs, scenarios := generateBaseTests(
+		schema.TypeFloat, cty.NumberFloatVal, 1.0, 2.0, 3.0, 4.0, nilVal)
+
+	runSDKv2TestMatrix(t, schemaValueMakerPairs, scenarios)
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optional/added.golden

@@ -0,0 +1,31 @@
+tests.testOutput{
+	initialValue: valast.Ptr(false), changeValue: valast.Ptr(true),
+	tfOut: `
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+  ~ update in-place
+
+Terraform will perform the following actions:
+
+  # crossprovider_test_res.example will be updated in-place
+  ~ resource "crossprovider_test_res" "example" {
+        id   = "newid"
+      ~ prop = false -> true
+    }
+
+Plan: 0 to add, 1 to change, 0 to destroy.
+
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+    ~ crossprovider:index/testRes:TestRes: (update)
+        [id=newid]
+        [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
+      ~ prop: false => true
+Resources:
+    ~ 1 to update
+    1 unchanged
+`,
+	detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "UPDATE"}},
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optional/changed.golden

@@ -0,0 +1,31 @@
+tests.testOutput{
+	initialValue: valast.Ptr(true), changeValue: valast.Ptr(false),
+	tfOut: `
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+  ~ update in-place
+
+Terraform will perform the following actions:
+
+  # crossprovider_test_res.example will be updated in-place
+  ~ resource "crossprovider_test_res" "example" {
+        id   = "newid"
+      ~ prop = true -> false
+    }
+
+Plan: 0 to add, 1 to change, 0 to destroy.
+
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+    ~ crossprovider:index/testRes:TestRes: (update)
+        [id=newid]
+        [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
+      ~ prop: true => false
+Resources:
+    ~ 1 to update
+    1 unchanged
+`,
+	detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "UPDATE"}},
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffString/removed.golden → pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optional/removed.golden

@@ -1,5 +1,5 @@
 tests.testOutput{
-	initialValue: valast.Ptr("val1"), changeValue: nil,
+	initialValue: valast.Ptr(true), changeValue: valast.Ptr(false),
 	tfOut: `
 Terraform used the selected providers to generate the following execution
 plan. Resource actions are indicated with the following symbols:
@@ -9,8 +9,8 @@ Terraform will perform the following actions:
 
   # crossprovider_test_res.example will be updated in-place
   ~ resource "crossprovider_test_res" "example" {
-        id          = "newid"
-      - string_prop = "val1" -> null
+        id   = "newid"
+      ~ prop = true -> false
     }
 
 Plan: 0 to add, 1 to change, 0 to destroy.
@@ -22,10 +22,10 @@ Plan: 0 to add, 1 to change, 0 to destroy.
     ~ crossprovider:index/testRes:TestRes: (update)
         [id=newid]
         [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
-      - stringProp: "val1"
+      ~ prop: true => false
 Resources:
     ~ 1 to update
     1 unchanged
 `,
-	detailedDiff: map[string]interface{}{"stringProp": map[string]interface{}{"kind": "DELETE"}},
+	detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "UPDATE"}},
 }

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optional/unchanged_empty.golden

@@ -0,0 +1,15 @@
+tests.testOutput{
+	initialValue: valast.Ptr(false), changeValue: valast.Ptr(false),
+	tfOut: `
+No changes. Your infrastructure matches the configuration.
+
+Terraform has compared your real infrastructure against your configuration
+and found no differences, so no changes are needed.
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+Resources:
+    2 unchanged
+`,
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optional/unchanged_non-empty.golden

@@ -0,0 +1,15 @@
+tests.testOutput{
+	initialValue: valast.Ptr(true), changeValue: valast.Ptr(true),
+	tfOut: `
+No changes. Your infrastructure matches the configuration.
+
+Terraform has compared your real infrastructure against your configuration
+and found no differences, so no changes are needed.
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+Resources:
+    2 unchanged
+`,
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optionalComputed/added.golden

@@ -0,0 +1,15 @@
+tests.testOutput{
+	initialValue: valast.Ptr(false), changeValue: valast.Ptr(true),
+	tfOut: `
+No changes. Your infrastructure matches the configuration.
+
+Terraform has compared your real infrastructure against your configuration
+and found no differences, so no changes are needed.
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+Resources:
+    2 unchanged
+`,
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optionalComputed/changed.golden

@@ -0,0 +1,31 @@
+tests.testOutput{
+	initialValue: valast.Ptr(true), changeValue: valast.Ptr(false),
+	tfOut: `
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+  ~ update in-place
+
+Terraform will perform the following actions:
+
+  # crossprovider_test_res.example will be updated in-place
+  ~ resource "crossprovider_test_res" "example" {
+        id   = "id"
+      ~ prop = true -> false
+    }
+
+Plan: 0 to add, 1 to change, 0 to destroy.
+
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+    ~ crossprovider:index/testRes:TestRes: (update)
+        [id=id]
+        [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
+      ~ prop: true => false
+Resources:
+    ~ 1 to update
+    1 unchanged
+`,
+	detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "UPDATE"}},
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optionalComputed/removed.golden

@@ -0,0 +1,31 @@
+tests.testOutput{
+	initialValue: valast.Ptr(true), changeValue: valast.Ptr(false),
+	tfOut: `
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+  ~ update in-place
+
+Terraform will perform the following actions:
+
+  # crossprovider_test_res.example will be updated in-place
+  ~ resource "crossprovider_test_res" "example" {
+        id   = "id"
+      ~ prop = true -> false
+    }
+
+Plan: 0 to add, 1 to change, 0 to destroy.
+
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+    ~ crossprovider:index/testRes:TestRes: (update)
+        [id=id]
+        [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
+      ~ prop: true => false
+Resources:
+    ~ 1 to update
+    1 unchanged
+`,
+	detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "UPDATE"}},
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optionalComputed/unchanged_empty.golden

@@ -0,0 +1,31 @@
+tests.testOutput{
+	initialValue: valast.Ptr(false), changeValue: valast.Ptr(false),
+	tfOut: `
+Terraform used the selected providers to generate the following execution
+plan. Resource actions are indicated with the following symbols:
+  ~ update in-place
+
+Terraform will perform the following actions:
+
+  # crossprovider_test_res.example will be updated in-place
+  ~ resource "crossprovider_test_res" "example" {
+        id   = "id"
+      ~ prop = true -> false
+    }
+
+Plan: 0 to add, 1 to change, 0 to destroy.
+
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+    ~ crossprovider:index/testRes:TestRes: (update)
+        [id=id]
+        [urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
+      ~ prop: true => false
+Resources:
+    ~ 1 to update
+    1 unchanged
+`,
+	detailedDiff: map[string]interface{}{"prop": map[string]interface{}{"kind": "UPDATE"}},
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optionalComputed/unchanged_non-empty.golden

@@ -0,0 +1,15 @@
+tests.testOutput{
+	initialValue: valast.Ptr(true), changeValue: valast.Ptr(true),
+	tfOut: `
+No changes. Your infrastructure matches the configuration.
+
+Terraform has compared your real infrastructure against your configuration
+and found no differences, so no changes are needed.
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+Resources:
+    2 unchanged
+`,
+}

pkg/tests/diff_test/testdata/TestSDKv2DetailedDiffBool/optionalComputedForceNew/added.golden

@@ -0,0 +1,15 @@
+tests.testOutput{
+	initialValue: valast.Ptr(false), changeValue: valast.Ptr(true),
+	tfOut: `
+No changes. Your infrastructure matches the configuration.
+
+Terraform has compared your real infrastructure against your configuration
+and found no differences, so no changes are needed.
+`,
+	pulumiOut: `Previewing update (test):
+  pulumi:pulumi:Stack: (same)
+    [urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
+Resources:
+    2 unchanged
+`,
+}