SUMO-275219: Fix breaking test

Author: achugh-sumo

sumologic/resource_sumologic_event_extraction_rule.go

@@ -67,28 +67,35 @@ func resourceSumologicEventExtractionRule() *schema.Resource {
 			},
 
 			"configuration": {
-				Type:        schema.TypeList,
+				Type:        schema.TypeSet,
 				Required:    true,
-				Description: "Structured field mappings for the extraction rule.",
+				Description: "Field mappings for the extraction rule. Each block represents a field with its value_source and optional mapping_type.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"field_name": {
 							Type:        schema.TypeString,
 							Required:    true,
-							Description: "The name of the field being mapped.",
+							Description: "The name of the field (e.g., eventType, eventName).",
 						},
 						"value_source": {
-							Type:     schema.TypeString,
-							Required: true,
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "The source value for the field.",
 						},
 						"mapping_type": {
 							Type:         schema.TypeString,
 							Optional:     true,
 							Default:      "HardCoded",
+							Description:  "The mapping type for the field. Defaults to 'HardCoded'.",
 							ValidateFunc: validation.StringInSlice([]string{"HardCoded"}, false),
 						},
 					},
 				},
+				Set: func(v interface{}) int {
+					// Use field_name as the unique identifier for the set
+					m := v.(map[string]interface{})
+					return schema.HashString(m["field_name"].(string))
+				},
 			},
 		},
 	}
@@ -174,13 +181,19 @@ func resourceToEventExtractionRule(d *schema.ResourceData) EventExtractionRule {
 
 	config := make(map[string]FieldMapping)
 	if v, ok := d.GetOk("configuration"); ok {
-		configs := v.([]interface{})
-		for _, raw := range configs {
-			val := raw.(map[string]interface{})
-			fieldName := val["field_name"].(string)
+		configSet := v.(*schema.Set)
+		for _, raw := range configSet.List() {
+			item := raw.(map[string]interface{})
+			fieldName := item["field_name"].(string)
+
+			mappingType := "HardCoded"
+			if mt, ok := item["mapping_type"].(string); ok && mt != "" {
+				mappingType = mt
+			}
+
 			config[fieldName] = FieldMapping{
-				ValueSource: val["value_source"].(string),
-				MappingType: val["mapping_type"].(string),
+				ValueSource: item["value_source"].(string),
+				MappingType: mappingType,
 			}
 		}
 	}
@@ -199,14 +212,21 @@ func flattenCorrelationExpression(ce *CorrelationExpression) []interface{} {
 	}
 }
 
-func flattenConfiguration(config map[string]FieldMapping) []interface{} {
-	var result []interface{}
-	for key, val := range config {
-		result = append(result, map[string]interface{}{
-			"field_name":   key,
-			"value_source": val.ValueSource,
-			"mapping_type": val.MappingType,
+func flattenConfiguration(config map[string]FieldMapping) *schema.Set {
+	// Create a set using the same hash function as the schema
+	setFunc := func(v interface{}) int {
+		m := v.(map[string]interface{})
+		return schema.HashString(m["field_name"].(string))
+	}
+
+	result := &schema.Set{F: setFunc}
+	for fieldName, fieldMapping := range config {
+		result.Add(map[string]interface{}{
+			"field_name":   fieldName,
+			"value_source": fieldMapping.ValueSource,
+			"mapping_type": fieldMapping.MappingType,
 		})
 	}
+
 	return result
 }

sumologic/resource_sumologic_event_extraction_rule_test.go

@@ -2,6 +2,7 @@ package sumologic
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
@@ -22,16 +23,23 @@ func TestAccSumologicEventExtractionRule_crud(t *testing.T) {
 			{
 				Config: testAccSumologicEventExtractionRule(name),
 				Check: resource.ComposeTestCheckFunc(
+					// Validate basic attributes
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "name", name),
 					resource.TestCheckResourceAttr(resourceName, "query", "_sourceCategory=deployments"),
 					resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
 
+					// Validate configuration count
+					resource.TestCheckResourceAttr(resourceName, "configuration.#", "4"),
+
+					// Validate individual configuration fields (order may vary, so we check using TypeSetElemNestedAttrs)
 					resource.TestCheckTypeSetElemNestedAttrs(
 						resourceName,
 						"configuration.*",
 						map[string]string{
 							"field_name":   "eventType",
 							"value_source": "Deployment",
+							"mapping_type": "HardCoded",
 						},
 					),
 					resource.TestCheckTypeSetElemNestedAttrs(
@@ -40,6 +48,7 @@ func TestAccSumologicEventExtractionRule_crud(t *testing.T) {
 						map[string]string{
 							"field_name":   "eventPriority",
 							"value_source": "High",
+							"mapping_type": "HardCoded",
 						},
 					),
 					resource.TestCheckTypeSetElemNestedAttrs(
@@ -48,6 +57,7 @@ func TestAccSumologicEventExtractionRule_crud(t *testing.T) {
 						map[string]string{
 							"field_name":   "eventSource",
 							"value_source": "Jenkins",
+							"mapping_type": "HardCoded",
 						},
 					),
 					resource.TestCheckTypeSetElemNestedAttrs(
@@ -56,22 +66,31 @@ func TestAccSumologicEventExtractionRule_crud(t *testing.T) {
 						map[string]string{
 							"field_name":   "eventName",
 							"value_source": "monitor-manager deployed",
+							"mapping_type": "HardCoded",
 						},
 					),
 				),
 			},
 			{
 				Config: testAccSumologicEventExtractionRuleUpdate(name),
 				Check: resource.ComposeTestCheckFunc(
+					// Validate basic attributes
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+					resource.TestCheckResourceAttr(resourceName, "name", name),
 					resource.TestCheckResourceAttr(resourceName, "description", "updated description"),
-					resource.TestCheckResourceAttr(resourceName, "enabled", "false"),
+					resource.TestCheckResourceAttr(resourceName, "query", "_sourceCategory=deployments"),
+
+					// Validate configuration count (now 5 fields)
+					resource.TestCheckResourceAttr(resourceName, "configuration.#", "5"),
 
+					// Validate the new eventDescription field was added
 					resource.TestCheckTypeSetElemNestedAttrs(
 						resourceName,
 						"configuration.*",
 						map[string]string{
 							"field_name":   "eventDescription",
 							"value_source": "2 containers upgraded",
+							"mapping_type": "HardCoded",
 						},
 					),
 				),
@@ -117,7 +136,6 @@ resource "sumologic_event_extraction_rule" "test" {
   name        = "%s"
   description = "updated description"
   query       = "_sourceCategory=deployments"
-  enabled     = false
 
   configuration {
     field_name   = "eventType"
@@ -153,6 +171,10 @@ func testAccCheckEventExtractionRuleDestroy(s *terraform.State) error {
 
 		found, err := client.GetEventExtractionRule(r.Primary.ID)
 		if err != nil {
+			// If the error is "not found" or "record_not_found", the resource was successfully destroyed
+			if strings.Contains(err.Error(), "not found") || strings.Contains(err.Error(), "record_not_found") {
+				continue
+			}
 			return err
 		}
 		if found != nil {

website/docs/r/event_extraction_rule.html.markdown

@@ -21,19 +21,21 @@ resource "sumologic_event_extraction_rule" "deployment_event" {
   name  = "deployment-event"
   query = "_sourceCategory=deployments"
 
-  configuration = {
-    eventType = {
-      value_source = "Deployment"
-    }
-    eventPriority = {
-      value_source = "High"
-    }
-    eventSource = {
-      value_source = "Jenkins"
-    }
-    eventName = {
-      value_source = "monitor-manager deployed"
-    }
+  configuration {
+    field_name   = "eventType"
+    value_source = "Deployment"
+  }
+  configuration {
+    field_name   = "eventPriority"
+    value_source = "High"
+  }
+  configuration {
+    field_name   = "eventSource"
+    value_source = "Jenkins"
+  }
+  configuration {
+    field_name   = "eventName"
+    value_source = "monitor-manager deployed"
   }
 }
 ```
@@ -53,22 +55,25 @@ resource "sumologic_event_extraction_rule" "deployment_event" {
     string_matching_algorithm = "ExactMatch"
   }
 
-  configuration = {
-    eventType = {
-      value_source = "Deployment"
-    }
-    eventPriority = {
-      value_source = "High"
-    }
-    eventSource = {
-      value_source = "Jenkins"
-    }
-    eventName = {
-      value_source = "monitor-manager deployed"
-    }
-    eventDescription = {
-      value_source = "2 containers were upgraded"
-    }
+  configuration {
+    field_name   = "eventType"
+    value_source = "Deployment"
+  }
+  configuration {
+    field_name   = "eventPriority"
+    value_source = "High"
+  }
+  configuration {
+    field_name   = "eventSource"
+    value_source = "Jenkins"
+  }
+  configuration {
+    field_name   = "eventName"
+    value_source = "monitor-manager deployed"
+  }
+  configuration {
+    field_name   = "eventDescription"
+    value_source = "2 containers upgraded"
   }
 }
 ```
@@ -82,7 +87,7 @@ The following arguments are supported:
 - `query` - (Required) Log query used to extract events.
 - `enabled` - (Optional) Whether the macro will be enabled. Default true.
 - `correlation_expression` - (Block List, Optional) Specifies how to determine related events for a log search query. See [correlationExpression schema](#schema-for-correlationExpression) for details.
-- `configuration` - (Block List, Optional) Defines how event fields are mapped to their corresponding values. See [configuration schema](#schema-for-configuration)
+- `configuration` - (Block List, Required) Defines how event fields are mapped to their corresponding values. See [configuration schema](#schema-for-configuration)
 for details.
 
 ## Attributes reference
@@ -97,17 +102,15 @@ In addition to all arguments above, the following attributes are exported:
 
 ### Schema for `configuration`
 
-- `configuration` - (Required, Map) This object defines how event fields are mapped to their corresponding values. Each field specifies a valueSource, which provides the actual value, and an optional mappingType, indicating the value is hardcoded.
-
-#### Configuration field mapping
+The `configuration` block can be repeated multiple times to define event field mappings. Each block supports:
 
+- `field_name` - (Required) The name of the event field being configured.
 - `value_source` - (Required) The value or extracted field used for the event field.
-- `mapping_type` - (Optional) Specifies how the value is mapped.
-  Supported value: `HardCoded` (default)
+- `mapping_type` - (Optional) Specifies how the value is mapped. Defaults to `HardCoded`.
 
 #### Required event fields
 
-The following keys **must** be defined inside the `configuration` map:
+The following `field_name` values **must** be defined:
 
 - `eventType` - (Required) Type of the event.
   Accepted values: `Deployment`, `Feature Flag Change`, `Configuration Change`, `Infrastructure Change`
@@ -119,4 +122,3 @@ The following keys **must** be defined inside the `configuration` map:
 #### Optional event fields
 
 - `eventDescription` - (Optional) Additional context or details about the event.
-- Custom fields - (Optional) Additional keys can be added to capture domain-specific event metadata.