Use normalized json type for "meta"

Author: nick-benoit

internal/kibana/security_exception_list/create.go

@@ -8,6 +8,7 @@ import (
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients/kibana_oapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
+	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -76,8 +77,9 @@ func (r *ExceptionListResource) Create(ctx context.Context, req resource.CreateR
 	// Set optional meta
 	if utils.IsKnown(plan.Meta) {
 		var meta kbapi.SecurityExceptionsAPIExceptionListMeta
-		if err := json.Unmarshal([]byte(plan.Meta.ValueString()), &meta); err != nil {
-			resp.Diagnostics.AddError("Failed to parse meta JSON", err.Error())
+		unmarshalDiags := plan.Meta.Unmarshal(&meta)
+		resp.Diagnostics.Append(unmarshalDiags...)
+		if resp.Diagnostics.HasError() {
 			return
 		}
 		body.Meta = &meta
@@ -177,9 +179,9 @@ func (r *ExceptionListResource) updateStateFromAPIResponse(ctx context.Context,
 			diags.AddError("Failed to serialize meta", err.Error())
 			return diags
 		}
-		model.Meta = types.StringValue(string(metaJSON))
+		model.Meta = jsontypes.NewNormalizedValue(string(metaJSON))
 	} else {
-		model.Meta = types.StringNull()
+		model.Meta = jsontypes.NewNormalizedNull()
 	}
 
 	return diags

internal/kibana/security_exception_list/models.go

@@ -1,24 +1,25 @@
 package security_exception_list
 
 import (
+	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 type ExceptionListModel struct {
-	ID            types.String `tfsdk:"id"`
-	SpaceID       types.String `tfsdk:"space_id"`
-	ListID        types.String `tfsdk:"list_id"`
-	Name          types.String `tfsdk:"name"`
-	Description   types.String `tfsdk:"description"`
-	Type          types.String `tfsdk:"type"`
-	NamespaceType types.String `tfsdk:"namespace_type"`
-	OsTypes       types.List   `tfsdk:"os_types"`
-	Tags          types.List   `tfsdk:"tags"`
-	Meta          types.String `tfsdk:"meta"`
-	CreatedAt     types.String `tfsdk:"created_at"`
-	CreatedBy     types.String `tfsdk:"created_by"`
-	UpdatedAt     types.String `tfsdk:"updated_at"`
-	UpdatedBy     types.String `tfsdk:"updated_by"`
-	Immutable     types.Bool   `tfsdk:"immutable"`
-	TieBreakerID  types.String `tfsdk:"tie_breaker_id"`
+	ID            types.String         `tfsdk:"id"`
+	SpaceID       types.String         `tfsdk:"space_id"`
+	ListID        types.String         `tfsdk:"list_id"`
+	Name          types.String         `tfsdk:"name"`
+	Description   types.String         `tfsdk:"description"`
+	Type          types.String         `tfsdk:"type"`
+	NamespaceType types.String         `tfsdk:"namespace_type"`
+	OsTypes       types.List           `tfsdk:"os_types"`
+	Tags          types.List           `tfsdk:"tags"`
+	Meta          jsontypes.Normalized `tfsdk:"meta"`
+	CreatedAt     types.String         `tfsdk:"created_at"`
+	CreatedBy     types.String         `tfsdk:"created_by"`
+	UpdatedAt     types.String         `tfsdk:"updated_at"`
+	UpdatedBy     types.String         `tfsdk:"updated_by"`
+	Immutable     types.Bool           `tfsdk:"immutable"`
+	TieBreakerID  types.String         `tfsdk:"tie_breaker_id"`
 }

internal/kibana/security_exception_list/schema.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	_ "embed"
 
+	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
@@ -94,6 +95,7 @@ func (r *ExceptionListResource) Schema(_ context.Context, _ resource.SchemaReque
 			"meta": schema.StringAttribute{
 				MarkdownDescription: "Placeholder for metadata about the list container as JSON string.",
 				Optional:            true,
+				CustomType:          jsontypes.NormalizedType{},
 			},
 			"created_at": schema.StringAttribute{
 				MarkdownDescription: "The timestamp of when the exception list was created.",

internal/kibana/security_exception_list/update.go

@@ -2,7 +2,6 @@ package security_exception_list
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
@@ -84,8 +83,9 @@ func (r *ExceptionListResource) Update(ctx context.Context, req resource.UpdateR
 	// Set optional meta
 	if utils.IsKnown(plan.Meta) {
 		var meta kbapi.SecurityExceptionsAPIExceptionListMeta
-		if err := json.Unmarshal([]byte(plan.Meta.ValueString()), &meta); err != nil {
-			resp.Diagnostics.AddError("Failed to parse meta JSON", err.Error())
+		unmarshalDiags := plan.Meta.Unmarshal(&meta)
+		resp.Diagnostics.Append(unmarshalDiags...)
+		if resp.Diagnostics.HasError() {
 			return
 		}
 		body.Meta = &meta