Skip to content

Commit 6564128

Browse files
authored
Merge pull request #333 from SumoLogic/APP-1376_cse_log_mapping_split_index_as_int
APP-1376: cse_log_mapping_split_index as int
2 parents cf4d7c9 + 666316a commit 6564128

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## 2.12.0 (Unreleased)
22

3+
BUG FIXES:
4+
5+
* sumologic_cse_log_mapping split_index as int (GH-333)
6+
37
## 2.11.5 (December 14, 2021)
48

59
BUG FIXES:

sumologic/resource_sumologic_cse_log_mapping.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package sumologic
22

33
import (
4+
"fmt"
45
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
56
"log"
67
)
@@ -100,7 +101,7 @@ func resourceSumologicCSELogMapping() *schema.Resource {
100101
Optional: true,
101102
},
102103
"split_index": {
103-
Type: schema.TypeString,
104+
Type: schema.TypeInt,
104105
Optional: true,
105106
},
106107
"field_join": {
@@ -354,7 +355,7 @@ func resourceToCSELogMappingField(data interface{}) CSELogMappingField {
354355
field.AlternateValues = resourceStringArrayToStringArray(fieldObj["alternate_values"].([]interface{}))
355356
field.TimeZone = fieldObj["time_zone"].(string)
356357
field.SplitDelimiter = fieldObj["split_delimiter"].(string)
357-
field.SplitIndex = fieldObj["split_index"].(string)
358+
field.SplitIndex = fmt.Sprint(fieldObj["split_index"].(int))
358359
field.FieldJoin = resourceStringArrayToStringArray(fieldObj["field_join"].([]interface{}))
359360
field.JoinDelimiter = fieldObj["join_delimiter"].(string)
360361
field.FormatParameters = resourceStringArrayToStringArray(fieldObj["format_parameters"].([]interface{}))

sumologic/resource_sumologic_cse_log_mapping_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestAccSumologicSCELogMapping_create(t *testing.T) {
3434
AlternateValues: []string{"altValue"},
3535
TimeZone: "UTC",
3636
SplitDelimiter: ",",
37-
SplitIndex: "index",
37+
SplitIndex: "0",
3838
FieldJoin: []string{"and"},
3939
JoinDelimiter: "",
4040
FormatParameters: []string{"param"},
@@ -90,7 +90,7 @@ func TestAccSumologicSCELogMapping_update(t *testing.T) {
9090
AlternateValues: []string{"altValue"},
9191
TimeZone: "UTC",
9292
SplitDelimiter: ",",
93-
SplitIndex: "index",
93+
SplitIndex: "0",
9494
FieldJoin: []string{"and"},
9595
JoinDelimiter: "",
9696
FormatParameters: []string{"param"},

website/docs/r/cse_log_mapping.html.markdown

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resource "sumologic_cse_log_mapping" "log_mapping" {
2828
alternate_values = ["altValue"]
2929
time_zone = "UTC"
3030
split_delimiter = ","
31-
split_index = "index"
31+
split_index = 0
3232
field_join = ["and"]
3333
join_delimiter = ""
3434
format_parameters = ["param"]
@@ -72,6 +72,7 @@ The following arguments are supported:
7272
- `alternate_values` - (Optional) List of alternate values.
7373
- `time_zone` - (Optional) Time zone.
7474
- `split_delimiter` - (Optional) Split delimiter to be used. (some example: ",", "-", "|")
75+
- `split_index` - (Optional) The index value to select (starting at zero)
7576
- `field_join` - (Optional) List of field join values.
7677
- `join_delimiter` - (Optional) Join delimiter.
7778
- `format_parameters` - (Optional) List of format parameters.

0 commit comments

Comments
 (0)