Merge remote-tracking branch 'origin/TRIDENT-17576-add-outlier-rules' into TRIDENT-17576-add-outlier-rules

Author: alex-reichle

sumologic/resource_sumologic_cse_outlier_rule.go

@@ -147,7 +147,7 @@ func resourceSumologicCSEOutlierRuleRead(d *schema.ResourceData, meta interface{
 	d.Set("severity", CSEOutlierRuleGet.Severity)
 	d.Set("summary_expression", CSEOutlierRuleGet.SummaryExpression)
 	d.Set("tags", CSEOutlierRuleGet.Tags)
-	d.Set("window_size", CSEOutlierRuleGet.WindowSize)
+	d.Set("window_size", CSEOutlierRuleGet.WindowSizeName)
 
 	return nil
 }
@@ -180,7 +180,7 @@ func resourceSumologicCSEOutlierRuleCreate(d *schema.ResourceData, meta interfac
 			Severity:              d.Get("severity").(int),
 			SummaryExpression:     d.Get("summary_expression").(string),
 			Tags:                  resourceToStringArray(d.Get("tags").([]interface{})),
-			WindowSize:            d.Get("window_size").(string),
+			WindowSize:            windowSizeField(d.Get("window_size").(string)),
 		})
 
 		if err != nil {
@@ -230,6 +230,6 @@ func resourceToCSEOutlierRule(d *schema.ResourceData) (CSEOutlierRule, error) {
 		Severity:              d.Get("severity").(int),
 		SummaryExpression:     d.Get("summary_expression").(string),
 		Tags:                  resourceToStringArray(d.Get("tags").([]interface{})),
-		WindowSize:            d.Get("window_size").(string),
+		WindowSize:            windowSizeField(d.Get("window_size").(string)),
 	}, nil
 }

sumologic/resource_sumologic_cse_outlier_rule_test.go

@@ -15,7 +15,7 @@ func TestAccSumologicCSEOutlierRule_createAndUpdate(t *testing.T) {
 	SkipCseTest(t)
 
 	var payload = CSEOutlierRule{
-		AggregationFunctions:  []AggregationFunction{{Name: "total", Function: "count", Arguments: []string{"true"}}},
+		AggregationFunctions:  []AggregationFunction{{Name: "current", Function: "count", Arguments: []string{"true"}}},
 		BaselineWindowSize:    "604800000",
 		DescriptionExpression: "OutlierRuleTerraformTest - {{ user_username }}",
 		Enabled:               true,
@@ -173,7 +173,7 @@ func testCheckOutlierRuleValues(t *testing.T, expected *CSEOutlierRule, actual *
 		assert.Equal(t, expected.Severity, actual.Severity)
 		assert.Equal(t, expected.SummaryExpression, actual.SummaryExpression)
 		assert.Equal(t, expected.Tags, actual.Tags)
-		assert.Equal(t, expected.WindowSize, actual.WindowSize)
+		assert.Equal(t, expected.WindowSize, windowSizeField(actual.WindowSizeName))
 
 		return nil
 	}

sumologic/sumologic_cse_outlier_rule.go

@@ -91,5 +91,6 @@ type CSEOutlierRule struct {
 	Severity              int                   `json:"score"`
 	SummaryExpression     string                `json:"summaryExpression"`
 	Tags                  []string              `json:"tags"`
-	WindowSize            string                `json:"windowSize"`
+	WindowSize            windowSizeField       `json:"windowSize,omitempty"`
+	WindowSizeName        string                `json:"windowSizeName,omitempty"`
 }