Add typeutils package

Author: nick-benoit

internal/kibana/security_list/models.go

@@ -8,6 +8,7 @@ import (
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
+	"github.com/elastic/terraform-provider-elasticstack/internal/utils/typeutils"
 	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -120,10 +121,10 @@ func (m *SecurityListModel) fromAPI(ctx context.Context, apiList *kbapi.Security
 	}
 	m.ID = types.StringValue(compId.String())
 
-	m.ListID = utils.StringishValue(apiList.Id)
-	m.Name = utils.StringishValue(apiList.Name)
-	m.Description = utils.StringishValue(apiList.Description)
-	m.Type = utils.StringishValue(apiList.Type)
+	m.ListID = typeutils.StringishValue(apiList.Id)
+	m.Name = typeutils.StringishValue(apiList.Name)
+	m.Description = typeutils.StringishValue(apiList.Description)
+	m.Type = typeutils.StringishValue(apiList.Type)
 	m.Immutable = types.BoolValue(apiList.Immutable)
 	m.Version = types.Int64Value(int64(apiList.Version))
 	m.TieBreakerID = types.StringValue(apiList.TieBreakerId)
@@ -133,11 +134,11 @@ func (m *SecurityListModel) fromAPI(ctx context.Context, apiList *kbapi.Security
 	m.UpdatedBy = types.StringValue(apiList.UpdatedBy)
 
 	// Set optional _version field
-	m.VersionID = utils.StringishPointerValue(apiList.UnderscoreVersion)
+	m.VersionID = typeutils.StringishPointerValue(apiList.UnderscoreVersion)
 
-	m.Deserializer = utils.StringishPointerValue(apiList.Deserializer)
+	m.Deserializer = typeutils.StringishPointerValue(apiList.Deserializer)
 
-	m.Serializer = utils.StringishPointerValue(apiList.Serializer)
+	m.Serializer = typeutils.StringishPointerValue(apiList.Serializer)
 
 	if apiList.Meta != nil {
 		metaBytes, err := json.Marshal(apiList.Meta)

internal/kibana/security_list_item/models.go

@@ -7,6 +7,7 @@ import (
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
+	"github.com/elastic/terraform-provider-elasticstack/internal/utils/typeutils"
 	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -98,20 +99,16 @@ func (m *SecurityListItemModel) fromAPIModel(ctx context.Context, apiItem *kbapi
 		ResourceId: string(apiItem.Id),
 	}
 	m.ID = types.StringValue(compId.String())
-	m.ListItemID = types.StringValue(string(apiItem.Id))
-	m.ListID = types.StringValue(string(apiItem.ListId))
-	m.Value = types.StringValue(string(apiItem.Value))
+	m.ListItemID = typeutils.StringishValue(apiItem.Id)
+	m.ListID = typeutils.StringishValue(apiItem.ListId)
+	m.Value = typeutils.StringishValue(apiItem.Value)
 	m.CreatedAt = types.StringValue(apiItem.CreatedAt.Format("2006-01-02T15:04:05.000Z"))
 	m.CreatedBy = types.StringValue(apiItem.CreatedBy)
 	m.UpdatedAt = types.StringValue(apiItem.UpdatedAt.Format("2006-01-02T15:04:05.000Z"))
 	m.UpdatedBy = types.StringValue(apiItem.UpdatedBy)
 
 	// Set version if available
-	if apiItem.UnderscoreVersion != nil {
-		m.VersionID = types.StringValue(string(*apiItem.UnderscoreVersion))
-	} else {
-		m.VersionID = types.StringNull()
-	}
+	m.VersionID = typeutils.StringishPointerValue(apiItem.UnderscoreVersion)
 
 	// Set meta if available
 	if apiItem.Meta != nil {

internal/utils/typeutils/typeutils.go

@@ -0,0 +1,16 @@
+package typeutils
+
+import "github.com/hashicorp/terraform-plugin-framework/types"
+
+// StringishPointerValue converts a pointer to a string-like type to a Terraform types.String value.
+func StringishPointerValue[T ~string](ptr *T) types.String {
+	if ptr == nil {
+		return types.StringNull()
+	}
+	return types.StringValue(string(*ptr))
+}
+
+// StringishValue converts a value of any string-like type T to a Terraform types.String.
+func StringishValue[T ~string](value T) types.String {
+	return types.StringValue(string(value))
+}

internal/utils/utils.go

@@ -231,16 +231,3 @@ func NonNilSlice[T any](s []T) []T {
 func TimeToStringValue(t time.Time) types.String {
 	return types.StringValue(FormatStrictDateTime(t))
 }
-
-// StringishPointerValue converts a pointer to a string-like type to a Terraform types.String value.
-func StringishPointerValue[T ~string](ptr *T) types.String {
-	if ptr == nil {
-		return types.StringNull()
-	}
-	return types.StringValue(string(*ptr))
-}
-
-// StringishValue converts a value of any string-like type T to a Terraform types.String.
-func StringishValue[T ~string](value T) types.String {
-	return types.StringValue(string(value))
-}