Deal with changes to 'attr.Value.ToTerraformValue' (hashicorp/terraform-plugin-framework#231).

Author: ewbankkit

internal/generic/default_value.go

@@ -38,7 +38,7 @@ func (attributePlanModifier defaultValueAttributePlanModifier) Modify(ctx contex
 		))
 
 		return
-	} else if v == nil && request.AttributeState != nil && request.AttributeState.Equal(attributePlanModifier.val) {
+	} else if v.IsNull() && request.AttributeState != nil && request.AttributeState.Equal(attributePlanModifier.val) {
 		response.AttributePlan = request.AttributeState
 	} else {
 		response.AttributePlan = request.AttributePlan

internal/types/duration.go

@@ -128,14 +128,18 @@ func (d Duration) Type(_ context.Context) attr.Type {
 // ToTerraformValue returns the data contained in the *String as a string. If
 // Unknown is true, it returns a tftypes.UnknownValue. If Null is true, it
 // returns nil.
-func (d Duration) ToTerraformValue(_ context.Context) (interface{}, error) {
+func (d Duration) ToTerraformValue(ctx context.Context) (tftypes.Value, error) {
+	t := DurationType.TerraformType(ctx)
 	if d.Null {
-		return nil, nil
+		return tftypes.NewValue(t, nil), nil
 	}
 	if d.Unknown {
-		return tftypes.UnknownValue, nil
+		return tftypes.NewValue(t, tftypes.UnknownValue), nil
 	}
-	return d.Value, nil
+	if err := tftypes.ValidateValue(tftypes.Number, d.Value); err != nil {
+		return tftypes.NewValue(t, tftypes.UnknownValue), err
+	}
+	return tftypes.NewValue(t, d.Value), nil
 }
 
 // Equal returns true if `other` is a *Duration and has the same value as `d`.

internal/validate/array.go

@@ -159,7 +159,7 @@ func setKeyer(ctx context.Context, path *tftypes.AttributePath, i int, v attr.Va
 		return nil, ccdiag.NewUnableToObtainValueAttributeError(path, err)
 	}
 
-	return path.WithElementKeyValue(tftypes.NewValue(v.Type(ctx).TerraformType(ctx), val)), nil
+	return path.WithElementKeyValue(val), nil
 }
 
 func validateArray(request tfsdk.ValidateAttributeRequest, response *tfsdk.ValidateAttributeResponse) ([]attr.Value, arrayKeyer, bool) {

internal/validate/required.go

@@ -129,21 +129,26 @@ func (validator requiredAttributesValidator) Validate(ctx context.Context, reque
 	// * Object (SingleNestedAttribute)
 	// * List (ListNestedAttribute)
 	// * Set (SetNestedAttribute)
+	isMap := false
+	isSlice := false
 	switch v := request.AttributeConfig.(type) {
 	case types.Object:
 		if v.Null || v.Unknown {
 			return
 		}
+		isMap = true
 
 	case types.List:
 		if v.Null || v.Unknown {
 			return
 		}
+		isSlice = true
 
 	case types.Set:
 		if v.Null || v.Unknown {
 			return
 		}
+		isSlice = true
 
 	default:
 		response.Diagnostics.Append(ccdiag.NewIncorrectValueTypeAttributeError(
@@ -166,8 +171,17 @@ func (validator requiredAttributesValidator) Validate(ctx context.Context, reque
 	}
 
 	var diags tfdiag.Diagnostics
-	switch v := val.(type) {
-	case map[string]tftypes.Value:
+	if isMap {
+		var v map[string]tftypes.Value
+		if err := val.As(&v); err != nil {
+			response.Diagnostics.Append(ccdiag.NewUnableToConvertValueTypeAttributeError(
+				request.AttributePath,
+				err,
+			))
+
+			return
+		}
+
 		// Ensure that the object is fully known.
 		for _, val := range v {
 			if !val.IsFullyKnown() {
@@ -176,8 +190,17 @@ func (validator requiredAttributesValidator) Validate(ctx context.Context, reque
 		}
 
 		diags = evaluateRequiredAttributesFuncs(specifiedAttributes(v), validator.fs...)
+	} else if isSlice {
+		var v []tftypes.Value
+		if err := val.As(&v); err != nil {
+			response.Diagnostics.Append(ccdiag.NewUnableToConvertValueTypeAttributeError(
+				request.AttributePath,
+				err,
+			))
+
+			return
+		}
 
-	case []tftypes.Value:
 		// Ensure that the array is fully known.
 		for _, val := range v {
 			if !val.IsFullyKnown() {

internal/validate/unique_items.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"github.com/hashicorp/terraform-provider-awscc/internal/diag"
 )
 
@@ -41,28 +40,38 @@ func (v uniqueItemsValidator) Validate(ctx context.Context, request tfsdk.Valida
 		return
 	}
 
-	val, err := list.ToTerraformValue(ctx)
+	for i1, val1 := range list.Elems {
+		val1, err := val1.ToTerraformValue(ctx)
 
-	if err != nil {
-		response.Diagnostics.Append(diag.NewUnableToObtainValueAttributeError(
-			request.AttributePath,
-			err,
-		))
+		if err != nil {
+			response.Diagnostics.Append(diag.NewUnableToObtainValueAttributeError(
+				request.AttributePath,
+				err,
+			))
 
-		return
-	}
+			return
+		}
 
-	vals := val.([]tftypes.Value)
-	for i1, val1 := range vals {
 		if !val1.IsFullyKnown() {
 			continue
 		}
 
-		for i2, val2 := range vals {
+		for i2, val2 := range list.Elems {
 			if i2 == i1 {
 				continue
 			}
 
+			val2, err := val2.ToTerraformValue(ctx)
+
+			if err != nil {
+				response.Diagnostics.Append(diag.NewUnableToObtainValueAttributeError(
+					request.AttributePath,
+					err,
+				))
+
+				return
+			}
+
 			if !val2.IsFullyKnown() {
 				continue
 			}