Merge pull request #779 from SumoLogic/absingh-254792-6

SUMO-254792: Adding Support for IntervalTimeType in SavedSearch Terra…

Author: AbhishekSumo

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## X.Y.Z (Unreleased)
-* Add new change notes here
+
+ENHANCEMENTS:
+* Added IntervalTimeType Field to configure time types for Log_Search resource
 
 BUG FIXES:
 * Corrected capabilities documentation for role_v2

sumologic/resource_sumologic_log_search.go

@@ -45,6 +45,14 @@ func resourceSumologicLogSearch() *schema.Resource {
 				Optional: true,
 				Default:  false,
 			},
+			"interval_time_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ValidateFunc: validation.StringInSlice(
+					[]string{"messageTime", "receiptTime", "searchableTime"}, false,
+				),
+			},
 			"time_range": {
 				Type:     schema.TypeList,
 				Required: true,
@@ -428,6 +436,9 @@ func setLogSearch(d *schema.ResourceData, logSearch *LogSearch) error {
 	if err := d.Set("run_by_receipt_time", logSearch.RunByReceiptTime); err != nil {
 		return err
 	}
+	if err := d.Set("interval_time_type", logSearch.IntervalTimeType); err != nil {
+		return err
+	}
 	if err := d.Set("parsing_mode", logSearch.ParsingMode); err != nil {
 		return err
 	}
@@ -601,6 +612,7 @@ func resourceToLogSearch(d *schema.ResourceData) LogSearch {
 		ParentId:         d.Get("parent_id").(string),
 		QueryString:      d.Get("query_string").(string),
 		RunByReceiptTime: d.Get("run_by_receipt_time").(bool),
+		IntervalTimeType: d.Get("interval_time_type").(string),
 		TimeRange:        timeRange,
 		ParsingMode:      d.Get("parsing_mode").(string),
 		QueryParameters:  queryParameters,

sumologic/resource_sumologic_log_search_test.go

@@ -613,3 +613,73 @@ func testAccSumologicUpdatedLogSearch(tfResourceName string, name string, descri
 		queryParameters[1].Name, queryParameters[1].Description, queryParameters[1].DataType, queryParameters[1].Value,
 		literalRangeName, tfSchedule)
 }
+
+func TestAccSumologicLogSearch_intervalTimeType(t *testing.T) {
+	var logSearch LogSearch
+	name := "TF IntervalTimeType Test"
+	description := "Verifies interval_time_type is correctly persisted"
+	queryString := "error | timeslice {{timeslice}} | count by _timeslice"
+	parsingMode := "Manual"
+	literalRangeName := "today"
+	runByReceiptTime := false
+	intervalTimeType := "messageTime"
+
+	queryParameter := LogSearchQueryParameter{
+		Name:        "timeslice",
+		Description: "Time slicing param",
+		DataType:    "ANY",
+		Value:       "1h",
+	}
+
+	tfResourceName := "tf_interval_time_type_test"
+	tfSearchResource := fmt.Sprintf("sumologic_log_search.%s", tfResourceName)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckLogSearchDestroy(logSearch),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					data "sumologic_personal_folder" "personalFolder" {}
+
+					resource "sumologic_log_search" "%s" {
+						name                = "%s"
+						description         = "%s"
+						query_string        = "%s"
+						parsing_mode        = "%s"
+						parent_id           = data.sumologic_personal_folder.personalFolder.id
+						run_by_receipt_time = %t
+						interval_time_type  = "%s"
+
+						query_parameter {
+							name        = "%s"
+							description = "%s"
+							data_type   = "%s"
+							value       = "%s"
+						}
+
+						time_range {
+							begin_bounded_time_range {
+								from {
+									literal_time_range {
+										range_name = "%s"
+									}
+								}
+							}
+						}
+					}
+				`,
+					tfResourceName, name, description, queryString, parsingMode,
+					runByReceiptTime, intervalTimeType,
+					queryParameter.Name, queryParameter.Description, queryParameter.DataType, queryParameter.Value,
+					literalRangeName,
+				),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckLogSearchExists(tfSearchResource, &logSearch, t),
+					resource.TestCheckResourceAttr(tfSearchResource, "interval_time_type", intervalTimeType),
+				),
+			},
+		},
+	})
+}

sumologic/sumologic_log_search.go

@@ -84,6 +84,7 @@ type LogSearch struct {
 	ParentId         string                    `json:"parentId"`
 	QueryString      string                    `json:"queryString"`
 	RunByReceiptTime bool                      `json:"runByReceiptTime"`
+	IntervalTimeType string                    `json:"intervalTimeType,omitempty"`
 	TimeRange        interface{}               `json:"timeRange"`
 	ParsingMode      string                    `json:"parsingMode"`
 	QueryParameters  []LogSearchQueryParameter `json:"queryParameters,omitempty"`

website/docs/r/log_search.html.markdown

@@ -114,6 +114,10 @@ The following arguments are supported:
 - `schedule` - (Block List, Max: 1, Optional) Schedule of the log search. See [schedule schema](#schema-for-schedule)
 - `run_by_receipt_time` - (Optional) This has the value `true` if the search is to be run by receipt time and
     `false` if it is to be run by message time. Default value is `false`.
+- `interval_time_type` - (Optional) This field defines whether the search should run by message time or receipt time .  
+  Allowed values are: `messageTime`, `receiptTime`.  
+  If not set, the system uses the run_by_receipt_time field. 
+  If both fields are set, interval_time_type will take precedence
 
 ### Schema for `query_parameter`
 - `name` - (Required) The name of the parameter.