Merge branch 'master' into rs-add-is-included-in-default-search-in-partitions

Author: ssharma-sumologic

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 2.31.2 (Unreleased)
 ENHANCEMENTS:
 * Add IsIncludedInDefaultSearch field to partition resource (GH-674)
+BUG FIXES:
+* Fix cse_log_mappings resource conversion affecting import  (GH-675)
 
 ## 2.31.1 (July 2, 2024)
 BUG FIXES:

sumologic/resource_sumologic_cse_log_mapping.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
+	"strconv"
 )
 
 func resourceSumologicCSELogMapping() *schema.Resource {
@@ -351,11 +352,17 @@ func resourceToCSELogMappingField(data interface{}) CSELogMappingField {
 		field.SkippedValues = resourceStringArrayToStringArray(fieldObj["skipped_values"].([]interface{}))
 		field.DefaultValue = fieldObj["default_value"].(string)
 		field.Format = fieldObj["format"].(string)
-		field.CaseInsensitive = fieldObj["case_insensitive"].(bool)
+		caseInsensitive := fieldObj["case_insensitive"]
+		if caseInsensitive != nil {
+			field.CaseInsensitive = fieldObj["case_insensitive"].(bool)
+		}
 		field.AlternateValues = resourceStringArrayToStringArray(fieldObj["alternate_values"].([]interface{}))
 		field.TimeZone = fieldObj["time_zone"].(string)
 		field.SplitDelimiter = fieldObj["split_delimiter"].(string)
-		field.SplitIndex = fmt.Sprint(fieldObj["split_index"].(int))
+		splitIndex := fieldObj["split_index"]
+		if splitIndex != nil {
+			field.SplitIndex = fmt.Sprint(splitIndex.(int))
+		}
 		field.FieldJoin = resourceStringArrayToStringArray(fieldObj["field_join"].([]interface{}))
 		field.JoinDelimiter = fieldObj["join_delimiter"].(string)
 		field.FormatParameters = resourceStringArrayToStringArray(fieldObj["format_parameters"].([]interface{}))
@@ -366,7 +373,7 @@ func resourceToCSELogMappingField(data interface{}) CSELogMappingField {
 			lookup = append(lookup, resourceToCSELogMappingLookUp([]interface{}{data}))
 		}
 
-		field.LookUp = lookup
+		field.LookUp = &lookup
 
 	}
 	return field
@@ -424,6 +431,7 @@ func setFields(d *schema.ResourceData, fields []CSELogMappingField) {
 	var f []map[string]interface{}
 
 	for _, t := range fields {
+
 		mapping := map[string]interface{}{
 			"name":              t.Name,
 			"value":             t.Value,
@@ -435,28 +443,35 @@ func setFields(d *schema.ResourceData, fields []CSELogMappingField) {
 			"alternate_values":  t.AlternateValues,
 			"time_zone":         t.TimeZone,
 			"split_delimiter":   t.SplitDelimiter,
-			"split_index":       t.SplitIndex,
 			"field_join":        t.FieldJoin,
 			"join_delimiter":    t.JoinDelimiter,
 			"format_parameters": t.FormatParameters,
 			"lookup":            getLookUpResource(t.LookUp),
 		}
+
+		splitIndex, err := strconv.Atoi(t.SplitIndex)
+		if err == nil {
+			mapping["split_index"] = splitIndex
+		}
+
 		f = append(f, mapping)
+
 	}
 
 	d.Set("fields", f)
 
 }
 
-func getLookUpResource(lookUp []CSELogMappingLookUp) []map[string]interface{} {
+func getLookUpResource(lookUp *[]CSELogMappingLookUp) []map[string]interface{} {
 	var s []map[string]interface{}
-
-	for _, l := range lookUp {
-		mapping := map[string]interface{}{
-			"key":   l.Key,
-			"value": l.Value,
+	if lookUp != nil {
+		for _, l := range *lookUp {
+			mapping := map[string]interface{}{
+				"key":   l.Key,
+				"value": l.Value,
+			}
+			s = append(s, mapping)
 		}
-		s = append(s, mapping)
 	}
 
 	return s

sumologic/resource_sumologic_cse_log_mapping_test.go

@@ -34,7 +34,7 @@ func TestAccSumologicSCELogMapping_create(t *testing.T) {
 		AlternateValues:  []string{"altValue"},
 		TimeZone:         "UTC",
 		SplitDelimiter:   ",",
-		SplitIndex:       "0",
+		SplitIndex:       "1",
 		FieldJoin:        []string{"and"},
 		JoinDelimiter:    "",
 		FormatParameters: []string{"param"},
@@ -245,6 +245,9 @@ func testCheckLogMappingValues(logMapping *CSELogMapping, lmName string, lmRecor
 		if logMapping.SkippedValues[0] != lmSkippedValues {
 			return fmt.Errorf("bad skippedValues, expected \"%s\", got: %#v", lmSkippedValues, logMapping.SkippedValues[0])
 		}
+
+		lookup := logMapping.Fields[0].LookUp
+
 		if logMapping.Fields[0].Name != lmField.Name ||
 			logMapping.Fields[0].Value != lmField.Value ||
 			logMapping.Fields[0].ValueType != lmField.ValueType ||
@@ -258,7 +261,7 @@ func testCheckLogMappingValues(logMapping *CSELogMapping, lmName string, lmRecor
 			logMapping.Fields[0].SplitIndex != lmField.SplitIndex ||
 			logMapping.Fields[0].FieldJoin[0] != lmField.FieldJoin[0] ||
 			logMapping.Fields[0].JoinDelimiter != lmField.JoinDelimiter ||
-			logMapping.Fields[0].LookUp[0].Key != lmLookUp.Key || logMapping.Fields[0].LookUp[0].Value != lmLookUp.Value {
+			(*lookup)[0].Key != lmLookUp.Key || (*lookup)[0].Value != lmLookUp.Value {
 
 			return fmt.Errorf("bad field, expected \"%#v\", got: %#v", lmField, logMapping.Fields[0])
 		}

sumologic/sumologic_cse_log_mapping.go

@@ -89,21 +89,21 @@ type CSELogMapping struct {
 }
 
 type CSELogMappingField struct {
-	Name             string                `json:"name"`
-	Value            string                `json:"value"`
-	ValueType        string                `json:"valueType"`
-	SkippedValues    []string              `json:"skippedValues"`
-	DefaultValue     string                `json:"defaultValue"`
-	Format           string                `json:"format"`
-	CaseInsensitive  bool                  `json:"caseInsensitive"`
-	AlternateValues  []string              `json:"alternateValues"`
-	TimeZone         string                `json:"timeZone"`
-	SplitDelimiter   string                `json:"splitDelimiter"`
-	SplitIndex       string                `json:"splitIndex"`
-	FieldJoin        []string              `json:"fieldJoin"`
-	JoinDelimiter    string                `json:"joinDelimiter"`
-	FormatParameters []string              `json:"formatParameters"`
-	LookUp           []CSELogMappingLookUp `json:"lookup"`
+	Name             string                 `json:"name"`
+	Value            string                 `json:"value,omitempty"`
+	ValueType        string                 `json:"valueType,omitempty"`
+	SkippedValues    []string               `json:"skippedValues,omitempty"`
+	DefaultValue     string                 `json:"defaultValue,omitempty"`
+	Format           string                 `json:"format,omitempty"`
+	CaseInsensitive  bool                   `json:"caseInsensitive,omitempty"`
+	AlternateValues  []string               `json:"alternateValues,omitempty"`
+	TimeZone         string                 `json:"timeZone,omitempty"`
+	SplitDelimiter   string                 `json:"splitDelimiter,omitempty"`
+	SplitIndex       string                 `json:"splitIndex,omitempty"`
+	FieldJoin        []string               `json:"fieldJoin,omitempty"`
+	JoinDelimiter    string                 `json:"joinDelimiter,omitempty"`
+	FormatParameters []string               `json:"formatParameters,omitempty"`
+	LookUp           *[]CSELogMappingLookUp `json:"lookup,omitempty"`
 }
 
 type CSELogMappingLookUp struct {