Improve meta property handling / include test

Author: nick-benoit

internal/kibana/security_list_item/acc_test.go

@@ -72,6 +72,48 @@ func TestAccResourceSecurityListItem(t *testing.T) {
 	})
 }
 
+func TestAccResourceSecurityListItem_WithMeta(t *testing.T) {
+	listID := "test-list-items-meta-" + uuid.New().String()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			acctest.PreCheck(t)
+			ensureListIndexExists(t)
+		},
+		ProtoV6ProviderFactories: acctest.Providers,
+		Steps: []resource.TestStep{
+			{ // Create with meta
+				ConfigDirectory: acctest.NamedTestCaseDirectory("create"),
+				ConfigVariables: config.Variables{
+					"list_id": config.StringVariable(listID),
+					"value":   config.StringVariable("test-value-with-meta"),
+					"meta":    config.StringVariable(`{"category":"suspicious","severity":"high"}`),
+				},
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("elasticstack_kibana_security_list_item.test", "id"),
+					resource.TestCheckResourceAttr("elasticstack_kibana_security_list_item.test", "value", "test-value-with-meta"),
+					resource.TestCheckResourceAttr("elasticstack_kibana_security_list_item.test", "meta", `{"category":"suspicious","severity":"high"}`),
+					resource.TestCheckResourceAttrSet("elasticstack_kibana_security_list_item.test", "created_at"),
+					resource.TestCheckResourceAttrSet("elasticstack_kibana_security_list_item.test", "created_by"),
+					resource.TestCheckResourceAttrSet("elasticstack_kibana_security_list_item.test", "updated_at"),
+					resource.TestCheckResourceAttrSet("elasticstack_kibana_security_list_item.test", "updated_by"),
+				),
+			},
+			{ // Update meta
+				ConfigDirectory: acctest.NamedTestCaseDirectory("update"),
+				ConfigVariables: config.Variables{
+					"list_id": config.StringVariable(listID),
+					"value":   config.StringVariable("test-value-with-meta"),
+					"meta":    config.StringVariable(`{"category":"malicious","notes":"Updated metadata","severity":"critical"}`),
+				},
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("elasticstack_kibana_security_list_item.test", "value", "test-value-with-meta"),
+					resource.TestCheckResourceAttr("elasticstack_kibana_security_list_item.test", "meta", `{"category":"malicious","notes":"Updated metadata","severity":"critical"}`),
+				),
+			},
+		},
+	})
+}
+
 func TestAccResourceSecurityListItem_Space(t *testing.T) {
 	spaceID := "test-space-" + uuid.New().String()
 	listID := "test-list-" + uuid.New().String()

internal/kibana/security_list_item/models.go

@@ -42,8 +42,8 @@ func (m *SecurityListItemModel) toAPICreateModel(ctx context.Context) (*kbapi.Cr
 	// Set optional meta if specified
 	if utils.IsKnown(m.Meta) {
 		var meta kbapi.SecurityListsAPIListItemMetadata
-		if err := json.Unmarshal([]byte(m.Meta.ValueString()), &meta); err != nil {
-			diags.AddError("Failed to parse meta JSON", err.Error())
+		diags.Append(m.Meta.Unmarshal(&meta)...)
+		if diags.HasError() {
 			return nil, diags
 		}
 		body.Meta = &meta
@@ -70,8 +70,8 @@ func (m *SecurityListItemModel) toAPIUpdateModel(ctx context.Context) (*kbapi.Up
 	// Set optional meta if specified
 	if utils.IsKnown(m.Meta) {
 		var meta kbapi.SecurityListsAPIListItemMetadata
-		if err := json.Unmarshal([]byte(m.Meta.ValueString()), &meta); err != nil {
-			diags.AddError("Failed to parse meta JSON", err.Error())
+		diags.Append(m.Meta.Unmarshal(&meta)...)
+		if diags.HasError() {
 			return nil, diags
 		}
 		body.Meta = &meta
@@ -103,7 +103,7 @@ func (m *SecurityListItemModel) fromAPIModel(ctx context.Context, apiItem *kbapi
 	if apiItem.Meta != nil {
 		metaJSON, err := json.Marshal(apiItem.Meta)
 		if err != nil {
-			diags.AddError("Failed to serialize meta", err.Error())
+			diags.AddError("Failed to serialize meta field", err.Error())
 			return diags
 		}
 		m.Meta = jsontypes.NewNormalizedValue(string(metaJSON))

internal/kibana/security_list_item/testdata/TestAccResourceSecurityListItem_WithMeta/create/main.tf

@@ -0,0 +1,18 @@
+variable "list_id" {}
+variable "value" {}
+variable "meta" {}
+
+# First create a security list to put items in
+resource "elasticstack_kibana_security_list" "test" {
+  list_id     = var.list_id
+  name        = "Test List for Items with Meta"
+  description = "A test security list for items with metadata"
+  type        = "keyword"
+}
+
+# Create a list item with meta
+resource "elasticstack_kibana_security_list_item" "test" {
+  list_id = elasticstack_kibana_security_list.test.list_id
+  value   = var.value
+  meta    = var.meta
+}

internal/kibana/security_list_item/testdata/TestAccResourceSecurityListItem_WithMeta/update/main.tf

@@ -0,0 +1,18 @@
+variable "list_id" {}
+variable "value" {}
+variable "meta" {}
+
+# First create a security list to put items in
+resource "elasticstack_kibana_security_list" "test" {
+  list_id     = var.list_id
+  name        = "Test List for Items with Meta"
+  description = "A test security list for items with metadata"
+  type        = "keyword"
+}
+
+# Update list item with different meta
+resource "elasticstack_kibana_security_list_item" "test" {
+  list_id = elasticstack_kibana_security_list.test.list_id
+  value   = var.value
+  meta    = var.meta
+}