Fix acceptance test failures: add Type field to update and use jsontypes.Normalized for entries

- Add missing Type field to exception_list update operation
- Change entries field to use jsontypes.Normalized to handle JSON key ordering differences
- This fixes the "received ''" error and "inconsistent result" errors in acceptance tests

Co-authored-by: nick-benoit <[email protected]>

Author: Copilot

internal/kibana/security/exception_item/create.go

@@ -8,6 +8,7 @@ import (
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
 	"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/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -224,13 +225,13 @@ func (r *ExceptionItemResource) updateStateFromAPIResponse(ctx context.Context,
 		model.Meta = types.StringNull()
 	}
 
-	// Set entries (convert back to JSON)
+	// Set entries (convert back to JSON and normalize)
 	entriesJSON, err := json.Marshal(apiResp.Entries)
 	if err != nil {
 		diags.AddError("Failed to serialize entries", err.Error())
 		return diags
 	}
-	model.Entries = types.StringValue(string(entriesJSON))
+	model.Entries = jsontypes.NewNormalizedValue(string(entriesJSON))
 
 	// Set optional comments
 	if len(apiResp.Comments) > 0 {

internal/kibana/security/exception_item/models.go

@@ -1,28 +1,29 @@
 package exception_item
 
 import (
+	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 type ExceptionItemModel struct {
-	ID            types.String `tfsdk:"id"`
-	ItemID        types.String `tfsdk:"item_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"`
-	Entries       types.String `tfsdk:"entries"`
-	Comments      types.List   `tfsdk:"comments"`
-	ExpireTime    types.String `tfsdk:"expire_time"`
-	CreatedAt     types.String `tfsdk:"created_at"`
-	CreatedBy     types.String `tfsdk:"created_by"`
-	UpdatedAt     types.String `tfsdk:"updated_at"`
-	UpdatedBy     types.String `tfsdk:"updated_by"`
-	TieBreakerID  types.String `tfsdk:"tie_breaker_id"`
+	ID            types.String         `tfsdk:"id"`
+	ItemID        types.String         `tfsdk:"item_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"`
+	Entries       jsontypes.Normalized `tfsdk:"entries"`
+	Comments      types.List           `tfsdk:"comments"`
+	ExpireTime    types.String         `tfsdk:"expire_time"`
+	CreatedAt     types.String         `tfsdk:"created_at"`
+	CreatedBy     types.String         `tfsdk:"created_by"`
+	UpdatedAt     types.String         `tfsdk:"updated_at"`
+	UpdatedBy     types.String         `tfsdk:"updated_by"`
+	TieBreakerID  types.String         `tfsdk:"tie_breaker_id"`
 }
 
 type CommentModel struct {

internal/kibana/security/exception_item/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"
@@ -91,6 +92,7 @@ func (r *ExceptionItemResource) Schema(_ context.Context, _ resource.SchemaReque
 			"entries": schema.StringAttribute{
 				MarkdownDescription: "The exception item entries as JSON string. This defines the conditions under which the exception applies.",
 				Required:            true,
+				CustomType:          jsontypes.NormalizedType{},
 			},
 			"comments": schema.ListNestedAttribute{
 				MarkdownDescription: "Array of comments about the exception item.",

internal/kibana/security/exception_list/update.go

@@ -31,6 +31,7 @@ func (r *ExceptionListResource) Update(ctx context.Context, req resource.UpdateR
 		Id:          &id,
 		Name:        kbapi.SecurityExceptionsAPIExceptionListName(plan.Name.ValueString()),
 		Description: kbapi.SecurityExceptionsAPIExceptionListDescription(plan.Description.ValueString()),
+		Type:        kbapi.SecurityExceptionsAPIExceptionListType(plan.Type.ValueString()),
 	}
 
 	// Set optional namespace_type (should not change, but include it)