Add resource info override options to SDKv2 Diff cross-tests (#3111)

This adds the ability to override the Resource Info for Diff
cross-tests.

Author: VenelinMartinov

pkg/internal/tests/cross-tests/diff.go

@@ -5,12 +5,15 @@ import (
 	"github.com/zclconf/go-cty/cty"
 
 	crosstestsimpl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests/impl"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
 )
 
 type diffOpts struct {
 	deleteBeforeReplace      bool
 	resource2                *schema.Resource
 	skipDiffEquivalenceCheck bool
+	resourceInfo             *info.Resource
+	resourceInfo2Override    *info.Resource
 }
 
 // An option that can be used to customize [Diff].
@@ -31,6 +34,16 @@ func DiffSkipDiffEquivalenceCheck() DiffOption {
 	return func(o *diffOpts) { o.skipDiffEquivalenceCheck = true }
 }
 
+// DiffResourceInfo specifies the resource info to use for the diff.
+func DiffResourceInfo(resourceInfo *info.Resource) DiffOption {
+	return func(o *diffOpts) { o.resourceInfo = resourceInfo }
+}
+
+// DiffResourceInfo2Override specifies an optional override for the resource info to use for the second provider.
+func DiffResourceInfo2Override(resourceInfo *info.Resource) DiffOption {
+	return func(o *diffOpts) { o.resourceInfo2Override = resourceInfo }
+}
+
 func Diff(
 	t T, resource *schema.Resource, config1, config2 map[string]cty.Value, opts ...DiffOption,
 ) crosstestsimpl.DiffResult {
@@ -49,5 +62,7 @@ func Diff(
 		DeleteBeforeReplace:      o.deleteBeforeReplace,
 		Resource2:                o.resource2,
 		SkipDiffEquivalenceCheck: o.skipDiffEquivalenceCheck,
+		ResourceInfo:             o.resourceInfo,
+		ResourceInfo2Override:    o.resourceInfo2Override,
 	})
 }

pkg/internal/tests/cross-tests/diff_check.go

@@ -28,11 +28,13 @@ import (
 
 	crosstestsimpl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests/impl"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/pulcheck"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info"
 )
 
 type diffTestCase struct {
 	// Schema for the resource to test diffing on.
-	Resource *schema.Resource
+	Resource     *schema.Resource
+	ResourceInfo *info.Resource
 
 	// Two resource configurations to simulate an Update from the desired state of Config1 to Config2.
 	//
@@ -50,6 +52,9 @@ type diffTestCase struct {
 	// Optional second schema to use as an upgrade test with a different schema.
 	Resource2 *schema.Resource
 
+	// Optional second resource info to use as an upgrade test with a different schema.
+	ResourceInfo2Override *info.Resource
+
 	// Whether to skip the diff equivalence check.
 	SkipDiffEquivalenceCheck bool
 }
@@ -76,8 +81,16 @@ func runDiffCheck(t T, tc diffTestCase) crosstestsimpl.DiffResult {
 	tfp1 := &schema.Provider{ResourcesMap: map[string]*schema.Resource{defRtype: resource1}}
 	tfp2 := &schema.Provider{ResourcesMap: map[string]*schema.Resource{defRtype: resource2}}
 
-	bridgedProvider1 := pulcheck.BridgedProvider(t, defProviderShortName, tfp1)
-	bridgedProvider2 := pulcheck.BridgedProvider(t, defProviderShortName, tfp2)
+	resourceInfo1 := tc.ResourceInfo
+	resourceInfo2 := tc.ResourceInfo
+	if tc.ResourceInfo2Override != nil {
+		resourceInfo2 = tc.ResourceInfo2Override
+	}
+
+	bridgedProvider1 := pulcheck.BridgedProvider(t, defProviderShortName, tfp1,
+		pulcheck.WithResourceInfo(map[string]*info.Resource{defRtype: resourceInfo1}))
+	bridgedProvider2 := pulcheck.BridgedProvider(t, defProviderShortName, tfp2,
+		pulcheck.WithResourceInfo(map[string]*info.Resource{defRtype: resourceInfo2}))
 	if tc.DeleteBeforeReplace {
 		bridgedProvider1.Resources[defRtype].DeleteBeforeReplace = true
 		bridgedProvider2.Resources[defRtype].DeleteBeforeReplace = true