Remove v2Resource and v2ResourceMap

pkg/tfbridge/schema_provider_test.go

@@ -243,7 +243,7 @@ func (f shimv2Factory) newResource(r shim.Resource) *schemav2.Resource {
 }
 
 func (f shimv2Factory) NewResource(r *schema.Resource) shim.Resource {
-	return shimv2.NewResource(f.newResource(r.Shim()))
+	return shimv2.NewTestOnlyResource(f.newResource(r.Shim()))
 }
 
 func (f shimv2Factory) NewInstanceState(id string) shim.InstanceState {

pkg/tfbridge/schema_test.go

@@ -3057,7 +3057,6 @@ func TestMakeTerraformInputsOnMapNestedObjects(t *testing.T) {
 		},
 	}
 
-	shimmedR := shimv2.NewResource(r)
 	type testCase struct {
 		name   string
 		ps     map[string]*SchemaInfo
@@ -3132,7 +3131,7 @@ func TestMakeTerraformInputsOnMapNestedObjects(t *testing.T) {
 		tc := tc
 
 		t.Run(tc.name, func(t *testing.T) {
-			i, _, err := makeTerraformInputsForConfig(tc.olds, tc.news, shimmedR.Schema(), tc.ps)
+			i, _, err := makeTerraformInputsForConfig(tc.olds, tc.news, shimv2.NewSchemaMap(r.Schema), tc.ps)
 			require.NoError(t, err)
 			require.Equal(t, tc.expect, i)
 		})
@@ -3161,7 +3160,6 @@ func TestRegress940(t *testing.T) {
 			},
 		},
 	}
-	shimmedR := shimv2.NewResource(r)
 
 	var olds, news resource.PropertyMap
 
@@ -3175,7 +3173,7 @@ func TestRegress940(t *testing.T) {
 		}),
 	}
 
-	result, _, err := makeTerraformInputsForConfig(olds, news, shimmedR.Schema(), map[string]*SchemaInfo{})
+	result, _, err := makeTerraformInputsForConfig(olds, news, shimv2.NewSchemaMap(r.Schema), map[string]*SchemaInfo{})
 
 	t.Run("no error with empty keys", func(t *testing.T) {
 		assert.NoError(t, err)

pkg/tfshim/sdk-v2/instance_state_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestToInstanceState(t *testing.T) {
 	t.Parallel()
-	res := NewResource(&schema.Resource{
+	res := newElemResource(&schema.Resource{
 		Schema: map[string]*schema.Schema{
 			"nil_property_value":    {Type: schema.TypeMap},
 			"bool_property_value":   {Type: schema.TypeBool},
@@ -156,7 +156,7 @@ func TestToInstanceState(t *testing.T) {
 	expected := writer.Map()
 
 	// Build the same using makeTerraformAttributesFromInputs.
-	res = NewResource(&schema.Resource{Schema: sharedSchema})
+	res = newElemResource(&schema.Resource{Schema: sharedSchema})
 	state, err = res.InstanceState("id", sharedInputs, nil)
 	assert.NoError(t, err)
 	assert.Equal(t, expected, state.(v2InstanceState).tf.Attributes)
@@ -165,7 +165,7 @@ func TestToInstanceState(t *testing.T) {
 // Test that an unset list still generates a length attribute.
 func TestEmptyListAttribute(t *testing.T) {
 	t.Parallel()
-	res := NewResource(&schema.Resource{
+	res := newElemResource(&schema.Resource{
 		Schema: map[string]*schema.Schema{
 			"list_property": {Type: schema.TypeList, Optional: true},
 		},
@@ -180,7 +180,7 @@ func TestEmptyListAttribute(t *testing.T) {
 
 func TestObjectFromInstanceDiff(t *testing.T) {
 	t.Parallel()
-	res := NewResource(&schema.Resource{
+	res := newElemResource(&schema.Resource{
 		Schema: map[string]*schema.Schema{
 			"nil_property_value":    {Type: schema.TypeMap},
 			"bool_property_value":   {Type: schema.TypeBool},

pkg/tfshim/sdk-v2/provider2.go

@@ -32,6 +32,16 @@ type v2Resource2 struct {
 	resourceType string
 }
 
+// NewTestOnlyResource is a test-only constructor for v2Resource2.
+// New tests should avoid using this and instead construct a v2 Provider with a TF schema.
+func NewTestOnlyResource(r *schema.Resource) shim.Resource {
+	return &v2Resource2{r, nil, ""}
+}
+
+func newElemResource(r *schema.Resource) shim.Resource {
+	return &v2Resource2{r, nil, ""}
+}
+
 var _ shim.Resource = (*v2Resource2)(nil)
 
 func (r *v2Resource2) Schema() shim.SchemaMap {
@@ -82,11 +92,31 @@ func (r *v2Resource2) DeprecationMessage() string {
 }
 
 func (r *v2Resource2) Timeouts() *shim.ResourceTimeout {
-	return v2Resource{r.tf}.Timeouts()
+	if r.tf.Timeouts == nil {
+		return nil
+	}
+	return &shim.ResourceTimeout{
+		Create:  r.tf.Timeouts.Create,
+		Read:    r.tf.Timeouts.Read,
+		Update:  r.tf.Timeouts.Update,
+		Delete:  r.tf.Timeouts.Delete,
+		Default: r.tf.Timeouts.Default,
+	}
 }
 
 func (r *v2Resource2) DecodeTimeouts(config shim.ResourceConfig) (*shim.ResourceTimeout, error) {
-	return v2Resource{r.tf}.DecodeTimeouts(config)
+	v2Timeouts := &schema.ResourceTimeout{}
+	if err := v2Timeouts.ConfigDecode(r.tf, configFromShim(config)); err != nil {
+		return nil, err
+	}
+
+	return &shim.ResourceTimeout{
+		Create:  v2Timeouts.Create,
+		Read:    v2Timeouts.Read,
+		Update:  v2Timeouts.Update,
+		Delete:  v2Timeouts.Delete,
+		Default: v2Timeouts.Default,
+	}, nil
 }
 
 type v2InstanceState2 struct {
@@ -260,7 +290,12 @@ func (p *planResourceChangeImpl) ResourcesMap() shim.ResourceMap {
 }
 
 func (p *planResourceChangeImpl) DataSourcesMap() shim.ResourceMap {
-	return v2ResourceMap(p.tf.DataSourcesMap)
+	return &v2ResourceCustomMap{
+		resources: p.tf.DataSourcesMap,
+		pack: func(token string, res *schema.Resource) shim.Resource {
+			return &v2Resource2{res, nil, token}
+		},
+	}
 }
 
 func (p *planResourceChangeImpl) InternalValidate() error {
@@ -1038,12 +1073,7 @@ func (m *v2ResourceCustomMap) Range(each func(key string, value shim.Resource) b
 }
 
 func (m *v2ResourceCustomMap) Set(key string, value shim.Resource) {
-	switch r := value.(type) {
-	case v2Resource:
-		m.resources[key] = r.tf
-	case *v2Resource2:
-		m.resources[key] = r.tf
-	}
+	m.resources[key] = value.(*v2Resource2).tf
 }
 
 func NewProvider(p *schema.Provider, opts ...providerOption) shim.Provider {

pkg/tfshim/sdk-v2/schema.go

@@ -86,7 +86,7 @@ func (s v2Schema) StateFunc() shim.SchemaStateFunc {
 func (s v2Schema) Elem() interface{} {
 	switch e := s.tf.Elem.(type) {
 	case *schema.Resource:
-		return v2Resource{e}
+		return newElemResource(e)
 	case *schema.Schema:
 		return v2Schema{e}
 	default: