Merge pull request #2796 from hashicorp/b-handle_any_identity_type

b/handle identity types that are not strings.

Author: johnsonaj

internal/generic/resource.go

@@ -480,32 +480,10 @@ func (r *genericResource) Create(ctx context.Context, request resource.CreateReq
 		pi = pi.AddRegionID()
 	}
 
-	for _, v := range pi {
-		if v.RequiredForImport {
-			var out types.String
-			response.Diagnostics.Append(response.State.GetAttribute(ctx, path.Root(v.Name), &out)...)
-			if response.Diagnostics.HasError() {
-				return
-			}
-
-			response.Diagnostics.Append(response.Identity.SetAttribute(ctx, path.Root(v.Name), out.ValueString())...)
-			if response.Diagnostics.HasError() {
-				return
-			}
-		} else {
-			switch v.Name {
-			case identity.NameAccountID:
-				response.Diagnostics.Append(response.Identity.SetAttribute(ctx, path.Root(identity.NameAccountID), r.provider.AccountID(ctx))...)
-				if response.Diagnostics.HasError() {
-					return
-				}
-			case identity.NameRegion:
-				response.Diagnostics.Append(response.Identity.SetAttribute(ctx, path.Root(identity.NameRegion), r.provider.Region(ctx))...)
-				if response.Diagnostics.HasError() {
-					return
-				}
-			}
-		}
+	d := pi.SetIdentity(ctx, r.provider, &response.State, response.Identity)
+	response.Diagnostics.Append(d...)
+	if response.Diagnostics.HasError() {
+		return
 	}
 
 	tflog.Debug(ctx, "Response.State.Raw", map[string]interface{}{
@@ -590,32 +568,10 @@ func (r *genericResource) Read(ctx context.Context, request resource.ReadRequest
 		pi = pi.AddRegionID()
 	}
 
-	for _, v := range pi {
-		if v.RequiredForImport {
-			var out types.String
-			response.Diagnostics.Append(response.State.GetAttribute(ctx, path.Root(v.Name), &out)...)
-			if response.Diagnostics.HasError() {
-				return
-			}
-
-			response.Diagnostics.Append(response.Identity.SetAttribute(ctx, path.Root(v.Name), out.ValueString())...)
-			if response.Diagnostics.HasError() {
-				return
-			}
-		} else {
-			switch v.Name {
-			case identity.NameAccountID:
-				response.Diagnostics.Append(response.Identity.SetAttribute(ctx, path.Root(identity.NameAccountID), r.provider.AccountID(ctx))...)
-				if response.Diagnostics.HasError() {
-					return
-				}
-			case identity.NameRegion:
-				response.Diagnostics.Append(response.Identity.SetAttribute(ctx, path.Root(identity.NameRegion), r.provider.Region(ctx))...)
-				if response.Diagnostics.HasError() {
-					return
-				}
-			}
-		}
+	d := pi.SetIdentity(ctx, r.provider, &response.State, response.Identity)
+	response.Diagnostics.Append(d...)
+	if response.Diagnostics.HasError() {
+		return
 	}
 
 	tflog.Debug(ctx, "Response.State.Raw", map[string]interface{}{

internal/identity/identifier.go

@@ -3,6 +3,15 @@
 
 package identity
 
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-provider-awscc/internal/service/cloudcontrol"
+)
+
 const (
 	NameAccountID = "account_id"
 	NameRegion    = "region"
@@ -30,3 +39,42 @@ func (a Identifiers) AddRegionID() Identifiers {
 		Description: "Region where this resource is managed",
 	})
 }
+
+type IdentitySetter interface {
+	GetAttribute(context.Context, path.Path, any) diag.Diagnostics
+	SetAttribute(context.Context, path.Path, any) diag.Diagnostics
+}
+
+// SetIdentity sets the identity in state using the primary identifiers.
+func (a Identifiers) SetIdentity(ctx context.Context, provider cloudcontrol.Provider, state, identity IdentitySetter) diag.Diagnostics {
+	var diags diag.Diagnostics
+	for _, v := range a {
+		if v.RequiredForImport {
+			var out attr.Value
+			diags.Append(state.GetAttribute(ctx, path.Root(v.Name), &out)...)
+			if diags.HasError() {
+				return diags
+			}
+
+			diags.Append(identity.SetAttribute(ctx, path.Root(v.Name), ValueAsString(ctx, out))...)
+			if diags.HasError() {
+				return diags
+			}
+		} else {
+			switch v.Name {
+			case NameAccountID:
+				diags.Append(identity.SetAttribute(ctx, path.Root(NameAccountID), provider.AccountID(ctx))...)
+				if diags.HasError() {
+					return diags
+				}
+			case NameRegion:
+				diags.Append(identity.SetAttribute(ctx, path.Root(NameRegion), provider.Region(ctx))...)
+				if diags.HasError() {
+					return diags
+				}
+			}
+		}
+	}
+
+	return diags
+}

internal/identity/values.go

@@ -0,0 +1,35 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package identity
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+func ValueAsString(ctx context.Context, v attr.Value) string {
+	if v.IsNull() || v.IsUnknown() {
+		return ""
+	}
+
+	switch v.Type(ctx) {
+	case types.StringType:
+		return v.(types.String).ValueString()
+	case types.Float64Type:
+		return fmt.Sprintf("%v", v.(types.Float64).ValueFloat64())
+	case types.Int64Type:
+		return fmt.Sprintf("%d", v.(types.Int64).ValueInt64())
+	case types.Int32Type:
+		return fmt.Sprintf("%d", v.(types.Int32).ValueInt32())
+	case types.NumberType:
+		return fmt.Sprintf("%v", v.(types.Number).ValueBigFloat())
+	case types.BoolType:
+		return fmt.Sprintf("%t", v.(types.Bool).ValueBool())
+	default:
+		return ""
+	}
+}

internal/identity/values_test.go

@@ -0,0 +1,65 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package identity
+
+import (
+	"context"
+	"math/big"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+func TestValueAsString(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name     string
+		input    attr.Value
+		expected string
+	}{
+		{
+			name:     "null string",
+			input:    types.StringNull(),
+			expected: "",
+		},
+		{
+			name:     "valid string",
+			input:    types.StringValue("hello"),
+			expected: "hello",
+		},
+		{
+			name:     "valid int64",
+			input:    types.Int64Value(1),
+			expected: "1",
+		},
+		{
+			name:     "valid float64",
+			input:    types.Float64Value(3.14),
+			expected: "3.14",
+		},
+		{
+			name:     "valid number",
+			input:    types.NumberValue(big.NewFloat(3)),
+			expected: "3",
+		},
+		{
+			name:     "valid bool",
+			input:    types.BoolValue(true),
+			expected: "true",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			result := ValueAsString(context.TODO(), tt.input)
+			if result != tt.expected {
+				t.Fatalf("expected %q but got %q", tt.expected, result)
+			}
+		})
+	}
+}