Merge pull request #7 from matthewhartstonge/dependabot/go_modules/github.com/hashicorp/terraform-plugin-framework-0.16.0

Author: matthewhartstonge

.run/README.md

@@ -0,0 +1,4 @@
+## .run
+
+The `.run` folder provides configs to set your Intellij IDE up to perform
+testing locally.

.run/go test terraform-plugin-framework-type-uuid_uuidtype.run.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="go test terraform-plugin-framework-type-uuid/uuidtype" type="GoTestRunConfiguration" factoryName="Go Test">
+    <module name="terraform-plugin-framework-type-uuid" />
+    <working_directory value="$PROJECT_DIR$/uuidtypes" />
+    <root_directory value="$PROJECT_DIR$" />
+    <kind value="PACKAGE" />
+    <package value="github.com/matthewhartstonge/terraform-plugin-framework-type-uuid/uuidtypes" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$" />
+    <framework value="gotest" />
+    <method v="2" />
+  </configuration>
+</component>

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/google/go-cmp v0.5.9
 	github.com/google/uuid v1.3.0
-	github.com/hashicorp/terraform-plugin-framework v0.14.0
+	github.com/hashicorp/terraform-plugin-framework v0.16.0
 	github.com/hashicorp/terraform-plugin-go v0.14.1
 )
 

go.sum

@@ -9,8 +9,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hashicorp/terraform-plugin-framework v0.14.0 h1:Mwj55u+Jc/QGM6fLBPCe1P+ZF3cuYs6wbCdB15lx/Dg=
-github.com/hashicorp/terraform-plugin-framework v0.14.0/go.mod h1:wcZdk4+Uef6Ng+BiBJjGAcIPlIs5bhlEV/TA1k6Xkq8=
+github.com/hashicorp/terraform-plugin-framework v0.16.0 h1:kEHh0d6dp5Ig/ey6PYXkWDZPMLIW8Me41T/Oa7bpO4s=
+github.com/hashicorp/terraform-plugin-framework v0.16.0/go.mod h1:Vk5MuIJoE1qksHZawAZr6psx6YXsQBFIKDrWbROrwus=
 github.com/hashicorp/terraform-plugin-go v0.14.1 h1:cwZzPYla82XwAqpLhSzdVsOMU+6H29tczAwrB0z9Zek=
 github.com/hashicorp/terraform-plugin-go v0.14.1/go.mod h1:Bc/K6K26BQ2FHqIELPbpKtt2CzzbQou+0UQF3/0NsCQ=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=

uuidtypes/uuid.go

@@ -35,12 +35,12 @@ var (
 
 // UUIDNull returns a null UUID value.
 func UUIDNull() UUID {
-	return UUID{null: true}
+	return UUID{state: attr.ValueStateNull}
 }
 
 // UUIDUnknown returns an unknown UUID value.
 func UUIDUnknown() UUID {
-	return UUID{unknown: true}
+	return UUID{state: attr.ValueStateUnknown}
 }
 
 // UUIDFromString returns a value or any errors when attempting to parse the
@@ -61,6 +61,7 @@ func UUIDFromString(value string, schemaPath path.Path) (UUID, diag.Diagnostics)
 	}
 
 	return UUID{
+		state: attr.ValueStateKnown,
 		value: validUUID,
 	}, nil
 }
@@ -69,16 +70,16 @@ func UUIDFromString(value string, schemaPath path.Path) (UUID, diag.Diagnostics)
 // UUID Value.
 func UUIDFromGoogleUUID(value uuid.UUID) UUID {
 	return UUID{
+		state: attr.ValueStateKnown,
 		value: value,
 	}
 }
 
 // UUID provides a concrete implementation of a UUID tftypes.Value for the
 // Terraform Plugin framework.
 type UUID struct {
-	null    bool
-	unknown bool
-	value   uuid.UUID
+	state attr.ValueState
+	value uuid.UUID
 }
 
 // Type returns the UUID type that created the UUID.
@@ -101,12 +102,12 @@ func (u UUID) ToTerraformValue(_ context.Context) (tftypes.Value, error) {
 
 // IsNull returns true if the uuid represents a null value.
 func (u UUID) IsNull() bool {
-	return u.null
+	return u.state == attr.ValueStateNull
 }
 
 // IsUnknown returns true if the uuid represents an unknown value.
 func (u UUID) IsUnknown() bool {
-	return u.unknown
+	return u.state == attr.ValueStateUnknown
 }
 
 // Equal returns true if the uuid is semantically equal to the Value passed as
@@ -117,11 +118,7 @@ func (u UUID) Equal(other attr.Value) bool {
 		return false
 	}
 
-	if otherValue.null != u.null {
-		return false
-	}
-
-	if otherValue.unknown != u.unknown {
+	if otherValue.state != u.state {
 		return false
 	}
 
@@ -133,13 +130,14 @@ func (u UUID) Equal(other attr.Value) bool {
 // or UnknownValueString (`<unknown>`) when IsUnknown() returns true,
 // or NullValueString (`<null>`) when IsNull() return true.
 func (u UUID) String() string {
-	if u.null {
+	switch u.state {
+	case attr.ValueStateNull:
 		return attr.NullValueString
-	}
 
-	if u.unknown {
+	case attr.ValueStateUnknown:
 		return attr.UnknownValueString
-	}
 
-	return u.value.String()
+	default:
+		return u.value.String()
+	}
 }

uuidtypes/uuid_test.go

@@ -150,7 +150,7 @@ func TestUUID_Equal(t *testing.T) {
 		{
 			name:     "not-uuidtypes.UUID",
 			value:    uuidtypes.UUIDFromGoogleUUID(uuid.MustParse(valueUUIDv4)),
-			other:    types.String{Value: valueUUIDv4},
+			other:    types.StringValue(valueUUIDv4),
 			expected: false,
 		},
 	}

uuidtypes/uuid_type.go

@@ -113,5 +113,5 @@ func (u UUIDType) ValueFromTerraform(_ context.Context, value tftypes.Value) (at
 
 // ValueType returns attr.Value type returned by ValueFromTerraform.
 func (u UUIDType) ValueType(context.Context) attr.Value {
-	return UUID{}
+	return UUIDNull()
 }