add tests for resource data tftype receiver funcs

Author: stephybun

helper/schema/resource_data.go

@@ -63,22 +63,26 @@ type getResult struct {
 	Schema         *Schema
 }
 
-// TfTypeIdentity returns the identity data as a tftypes.Value.
-func (d *ResourceData) TfTypeIdentity() tftypes.Value {
+// TfTypeIdentityState returns the identity data as a tftypes.Value.
+func (d *ResourceData) TfTypeIdentityState() tftypes.Value {
 	s := schemaMap(d.identitySchema).CoreConfigSchema()
 
 	state := d.State()
 
+	if state == nil {
+		log.Panicf("state is nil")
+	}
+
 	stateVal, err := hcl2shim.HCL2ValueFromFlatmap(state.Identity, s.ImpliedType())
 	if err != nil {
-		panic(fmt.Errorf("converting identity to tf value: %+v", err))
+		log.Panicf("converting identity to tf value: %+v", err)
 	}
 
 	return convert.ToTfValue(stateVal)
 }
 
-// TfTypeResource returns the resource data as a tftypes.Value.
-func (d *ResourceData) TfTypeResource() tftypes.Value {
+// TfTypeResourceState returns the resource data as a tftypes.Value.
+func (d *ResourceData) TfTypeResourceState() tftypes.Value {
 	s := schemaMap(d.schema).CoreConfigSchema()
 
 	// The CoreConfigSchema method on schemaMaps doesn't automatically handle adding the id
@@ -142,9 +146,13 @@ func (d *ResourceData) TfTypeResource() tftypes.Value {
 
 	state := d.State()
 
+	if state == nil {
+		log.Panicf("state is nil")
+	}
+
 	stateVal, err := hcl2shim.HCL2ValueFromFlatmap(state.Attributes, s.ImpliedType())
 	if err != nil {
-		panic(fmt.Errorf("converting resource state to tf value: %+v", err))
+		log.Panicf("converting resource state to tf value: %+v", err)
 	}
 
 	return convert.ToTfValue(stateVal)

helper/schema/resource_data_test.go

@@ -5,6 +5,7 @@ package schema
 
 import (
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"math"
 	"reflect"
 	"testing"
@@ -4314,6 +4315,125 @@ func TestResourceDataIdentity_no_schema(t *testing.T) {
 	}
 }
 
+func TestResourceData_TfTypeIdentityState(t *testing.T) {
+	d := &ResourceData{
+		identitySchema: map[string]*Schema{
+			"foo": {
+				Type:              TypeString,
+				RequiredForImport: true,
+			},
+		},
+	}
+
+	d.SetId("baz") // just required to be able to call .State()
+
+	identity, err := d.Identity()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	err = identity.Set("foo", "bar")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	expectedIdentity := tftypes.NewValue(tftypes.Object{
+		AttributeTypes: map[string]tftypes.Type{
+			"foo": tftypes.String,
+		}}, map[string]tftypes.Value{
+		"foo": tftypes.NewValue(tftypes.String, "bar"),
+	})
+
+	tfTypeIdentity := d.TfTypeIdentityState()
+
+	if !tfTypeIdentity.Equal(expectedIdentity) {
+		t.Fatalf("expected tftype value of identity to be %+v, got %+v", expectedIdentity, tfTypeIdentity)
+	}
+}
+
+func TestResourceData_TfTypeResourceState(t *testing.T) {
+	cases := []struct {
+		d        *ResourceData
+		expected tftypes.Value
+	}{
+		{
+			d: &ResourceData{
+				schema: map[string]*Schema{
+					"location": {
+						Type:     TypeString,
+						Optional: true,
+					},
+				},
+				timeouts: timeoutForValues(30, 5, 30, 5, 5),
+			},
+			expected: tftypes.NewValue(tftypes.Object{
+				AttributeTypes: map[string]tftypes.Type{
+					"location": tftypes.String,
+					"id":       tftypes.String,
+					"timeouts": tftypes.Object{
+						AttributeTypes: map[string]tftypes.Type{
+							"create":  tftypes.String,
+							"delete":  tftypes.String,
+							"read":    tftypes.String,
+							"update":  tftypes.String,
+							"default": tftypes.String,
+						},
+					},
+				}}, map[string]tftypes.Value{
+				"location": tftypes.NewValue(tftypes.String, "westeurope"),
+				"id":       tftypes.NewValue(tftypes.String, "baz"),
+				"timeouts": tftypes.NewValue(tftypes.Object{
+					AttributeTypes: map[string]tftypes.Type{
+						"create":  tftypes.String,
+						"default": tftypes.String,
+						"delete":  tftypes.String,
+						"read":    tftypes.String,
+						"update":  tftypes.String,
+					},
+				}, map[string]tftypes.Value{
+					"create":  tftypes.NewValue(tftypes.String, nil),
+					"default": tftypes.NewValue(tftypes.String, nil),
+					"delete":  tftypes.NewValue(tftypes.String, nil),
+					"read":    tftypes.NewValue(tftypes.String, nil),
+					"update":  tftypes.NewValue(tftypes.String, nil),
+				}),
+			}),
+		},
+		{
+			d: &ResourceData{
+				schema: map[string]*Schema{
+					"location": {
+						Type:     TypeString,
+						Optional: true,
+					},
+				},
+			},
+			expected: tftypes.NewValue(tftypes.Object{
+				AttributeTypes: map[string]tftypes.Type{
+					"location": tftypes.String,
+					"id":       tftypes.String,
+				}}, map[string]tftypes.Value{
+				"location": tftypes.NewValue(tftypes.String, "westeurope"),
+				"id":       tftypes.NewValue(tftypes.String, "baz"),
+			}),
+		},
+	}
+
+	for _, tc := range cases {
+		tc.d.SetId("baz") // just required to be able to call .State()
+
+		if err := tc.d.Set("location", "westeurope"); err != nil {
+			t.Fatalf("err: %s", err)
+		}
+
+		tfTypeIdentity := tc.d.TfTypeResourceState()
+
+		if !tfTypeIdentity.Equal(tc.expected) {
+			t.Fatalf("expected tftype value of identity to be %+v, got %+v", tc.expected, tfTypeIdentity)
+		}
+	}
+}
+
 func testPtrTo(raw interface{}) interface{} {
 	return &raw
 }