fix: mark invalid UUIDs as known

ethanndickson · ethanndickson · commit 2840903693a7 · 2024-11-27T02:44:06.000Z
diff --git a/internal/provider/uuid.go b/internal/provider/uuid.go
@@ -48,16 +48,16 @@ func (t uuidType) ValueFromString(ctx context.Context, in basetypes.StringValue)
 		return NewUUIDUnknown(), diags
 	}
 
-	value, err := uuid.Parse(in.ValueString())
-	if err != nil {
-		// The framework doesn't want us to return validation errors here
-		// for some reason. They get caught by `ValidateAttribute` instead,
-		// and this function isn't called directly by our provider - UUIDValue
-		// takes a valid UUID instead of a string.
-		return NewUUIDUnknown(), diags
-	}
-
-	return UUIDValue(value), diags
+	// This function deliberately does not handle invalid UUIDs.
+	// Instead, `ValidateAttribute` will be called
+	// on the stored string during `validate` `plan` and `apply`,
+	// which will also create an error diagnostic.
+	// For that reason, storing the zero UUID is fine.
+	v, _ := uuid.Parse(in.ValueString())
+	return UUID{
+		StringValue: in,
+		value:       v,
+	}, diags
 }
 
 // ValueFromTerraform implements basetypes.StringTypable.
diff --git a/internal/provider/uuid_internal_test.go b/internal/provider/uuid_internal_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"github.com/stretchr/testify/require"
 )
@@ -37,9 +38,12 @@ func TestUUIDTypeValueFromTerraform(t *testing.T) {
 			expected: UUIDValue(ValidUUID),
 		},
 		{
-			name:     "invalid UUID",
-			input:    tftypes.NewValue(tftypes.String, "invalid"),
-			expected: NewUUIDUnknown(),
+			name:  "invalid UUID",
+			input: tftypes.NewValue(tftypes.String, "invalid"),
+			expected: UUID{
+				StringValue: basetypes.NewStringValue("invalid"),
+				value:       uuid.Nil,
+			},
 		},
 	}
 
