Merge pull request #760 from SumoLogic/log-mapper-bug-fix

Log mapping bug fixes

Author: ErikAtSumo

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## X.Y.Z (Unreleased)
 * Add new change notes here
+* Fix the log mapping resource to no longer error out when empty strings are included in skipped_values
+* Fix the log mapping resource to no longer default to a skipped_index of 0 when no skipped_index is specified
 
 ## 3.0.9 (April 28, 2025)
 

sumologic/resource_sumologic_cse_log_mapping.go

@@ -1,10 +1,10 @@
 package sumologic
 
 import (
-	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func resourceSumologicCSELogMapping() *schema.Resource {
@@ -102,7 +102,7 @@ func resourceSumologicCSELogMapping() *schema.Resource {
 							Optional: true,
 						},
 						"split_index": {
-							Type:     schema.TypeInt,
+							Type:     schema.TypeString,
 							Optional: true,
 						},
 						"field_join": {
@@ -263,9 +263,10 @@ func resourceToCSELogMapping(d *schema.ResourceData) CSELogMapping {
 
 	skippedValuesData := d.Get("skipped_values").([]interface{})
 	skippedValues := make([]string, len(skippedValuesData))
-
 	for i, v := range skippedValuesData {
-		skippedValues[i] = v.(string)
+		if v != nil {
+			skippedValues[i] = v.(string)
+		}
 	}
 
 	fieldsData := d.Get("fields").([]interface{})
@@ -359,10 +360,7 @@ func resourceToCSELogMappingField(data interface{}) CSELogMappingField {
 		field.AlternateValues = resourceStringArrayToStringArray(fieldObj["alternate_values"].([]interface{}))
 		field.TimeZone = fieldObj["time_zone"].(string)
 		field.SplitDelimiter = fieldObj["split_delimiter"].(string)
-		splitIndex := fieldObj["split_index"]
-		if splitIndex != nil {
-			field.SplitIndex = fmt.Sprint(splitIndex.(int))
-		}
+		field.SplitIndex = fieldObj["split_index"].(string)
 		field.FieldJoin = resourceStringArrayToStringArray(fieldObj["field_join"].([]interface{}))
 		field.JoinDelimiter = fieldObj["join_delimiter"].(string)
 		field.FormatParameters = resourceStringArrayToStringArray(fieldObj["format_parameters"].([]interface{}))