Merge branch 'master' into zzhou-dashboard-metadata-variable-filter-default

Author: sumo-zzhou

CHANGELOG.md

@@ -1,4 +1,13 @@
-## 2.28.1 (Unreleased)
+## 2.28.2 (Unreleased)
+
+
+## 2.28.1 (January 19, 2024)
+
+ENHANCEMENTS:
+* Added support for `dynamic_severity` for the CSE Custom Insight. (GH-607)
+
+BUG FIXES:
+* Minor fixes enabling proper resource import for CSE Rules (`severity`, `severity_mapping`, `aggregation_functions`). (GH-606)
 
 ## 2.28.0 (November 23, 2023)
 FEATURES:

README.md

@@ -56,16 +56,15 @@ In order to run the full suite of Acceptance tests, run `make testacc`.
 To run a specific acceptance test, run `go test -v ./sumologic  -run YourSpecificTestName`
 
 *Note:* 
-- Acceptance tests *create real resources*, and often cost money to run. The environment variables `SUMOLOGIC_ACCESSID`, `SUMOLOGIC_ACCESSKEY`, `SUMOLOGIC_ENVIRONMENT` / `SUMOLOGIC_BASE_URL`,  and `TF_ACC` must also be set for acceptance tests to work properly.
-  - For example, you can generate a personal access key in stag-alpha [here](https://cse-stag-alpha.stag.sumologic.net/ui/#/preferences). Once your test runs, you are then capable of viewing the real resources created by Terraform in the [stag-alpha UI](https://cse-stag-alpha.stag.sumologic.net/sec/hud?hours=24).
+- Acceptance tests *create real resources*, and often cost money to run. The environment variables `SUMOLOGIC_ACCESSID`, `SUMOLOGIC_ACCESSKEY`, `SUMOLOGIC_ENVIRONMENT` / `SUMOLOGIC_BASE_URL`,  and `TF_ACC` must also be set for acceptance tests to work properly. You can generate a personal access key from your environment. Once your test runs, you are then capable of viewing the real resources created by Terraform in the UI.
      ```sh
      $ export SUMOLOGIC_ACCESSID="yourAccessID"
      $ export SUMOLOGIC_ACCESSKEY="yourAccessKey"
-     $ export SUMOLOGIC_ENVIRONMENT="stag"
-     $ export SUMOLOGIC_BASE_URL="https://stag-api.sumologic.net/api/"
+     $ export SUMOLOGIC_ENVIRONMENT="yourEnvironment"
+     $ export SUMOLOGIC_BASE_URL="yourEnvironmentAPIUrl"
      $ export TF_ACC=1
      ```
-  - More information on configuration can be found at the [Terraform Provider codelabs documentation](https://github.com/Sanyaku/codelabs/blob/master/backend/pages/SumoLogicTerraformProvider.md).
+    - More information on configuration can be found [here](https://github.com/SumoLogic/terraform-provider-sumologic/blob/master/website/docs/index.html.markdown#environment-variables).
 
 - Environment variable `SUMOLOGIC_TEST_GOOGLE_APPLICATION_CREDENTIALS` must be set for gcp metrics acceptance tests to work properly (ex. below).
     - export SUMOLOGIC_TEST_GOOGLE_APPLICATION_CREDENTIALS=`cat /path/to/service_acccount.json`

sumologic/resource_sumologic_cse_aggregation_rule_test.go

@@ -73,6 +73,11 @@ func TestAccSumologicCSEAggregationRule_createAndUpdate(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

sumologic/resource_sumologic_cse_chain_rule.go

@@ -112,6 +112,7 @@ func resourceSumologicCSEChainRuleRead(d *schema.ResourceData, meta interface{})
 	d.Set("is_prototype", CSEChainRuleGet.IsPrototype)
 	d.Set("ordered", CSEChainRuleGet.Ordered)
 	d.Set("name", CSEChainRuleGet.Name)
+	d.Set("severity", CSEChainRuleGet.Severity)
 	d.Set("summary_expression", CSEChainRuleGet.SummaryExpression)
 	d.Set("tags", CSEChainRuleGet.Tags)
 	d.Set("window_size", CSEChainRuleGet.WindowSizeName)

sumologic/resource_sumologic_cse_chain_rule_test.go

@@ -66,6 +66,11 @@ func TestAccSumologicCSEChainRule_createAndUpdate(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

sumologic/resource_sumologic_cse_custom_insight.go

@@ -45,6 +45,23 @@ func resourceSumologicCSECustomInsight() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validation.StringInSlice([]string{"HIGH", "MEDIUM", "LOW", "CRITICAL"}, false),
 			},
+			"dynamic_severity": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"minimum_signal_severity": {
+							Type:     schema.TypeInt,
+							Required: true,
+						},
+						"insight_severity": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"HIGH", "MEDIUM", "LOW", "CRITICAL"}, false),
+						},
+					},
+				},
+			},
 			"signal_names": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -86,6 +103,7 @@ func resourceSumologicCSECustomInsightRead(d *schema.ResourceData, meta interfac
 	d.Set("ordered", CSECustomInsightGet.Ordered)
 	d.Set("rule_ids", CSECustomInsightGet.RuleIds)
 	d.Set("severity", CSECustomInsightGet.Severity)
+	d.Set("dynamic_severity", dynamicSeverityArrayToResource(CSECustomInsightGet.DynamicSeverity))
 	d.Set("signal_names", CSECustomInsightGet.SignalNames)
 	d.Set("tags", CSECustomInsightGet.Tags)
 
@@ -103,14 +121,15 @@ func resourceSumologicCSECustomInsightCreate(d *schema.ResourceData, meta interf
 
 	if d.Id() == "" {
 		id, err := c.CreateCSECustomInsight(CSECustomInsight{
-			Description: d.Get("description").(string),
-			Enabled:     d.Get("enabled").(bool),
-			RuleIds:     resourceToStringArray(d.Get("rule_ids").([]interface{})),
-			Name:        d.Get("name").(string),
-			Ordered:     d.Get("ordered").(bool),
-			Severity:    d.Get("severity").(string),
-			SignalNames: resourceToStringArray(d.Get("signal_names").([]interface{})),
-			Tags:        resourceToStringArray(d.Get("tags").([]interface{})),
+			Description:     d.Get("description").(string),
+			Enabled:         d.Get("enabled").(bool),
+			RuleIds:         resourceToStringArray(d.Get("rule_ids").([]interface{})),
+			Name:            d.Get("name").(string),
+			Ordered:         d.Get("ordered").(bool),
+			Severity:        d.Get("severity").(string),
+			DynamicSeverity: resourceToDynamicSeverityArray(d.Get("dynamic_severity").([]interface{})),
+			SignalNames:     resourceToStringArray(d.Get("signal_names").([]interface{})),
+			Tags:            resourceToStringArray(d.Get("tags").([]interface{})),
 		})
 
 		if err != nil {
@@ -143,14 +162,41 @@ func resourceToCSECustomInsight(d *schema.ResourceData) (CSECustomInsight, error
 	}
 
 	return CSECustomInsight{
-		ID:          id,
-		Description: d.Get("description").(string),
-		Enabled:     d.Get("enabled").(bool),
-		RuleIds:     resourceToStringArray(d.Get("rule_ids").([]interface{})),
-		Name:        d.Get("name").(string),
-		Ordered:     d.Get("ordered").(bool),
-		Severity:    d.Get("severity").(string),
-		SignalNames: resourceToStringArray(d.Get("signal_names").([]interface{})),
-		Tags:        resourceToStringArray(d.Get("tags").([]interface{})),
+		ID:              id,
+		Description:     d.Get("description").(string),
+		Enabled:         d.Get("enabled").(bool),
+		RuleIds:         resourceToStringArray(d.Get("rule_ids").([]interface{})),
+		Name:            d.Get("name").(string),
+		Ordered:         d.Get("ordered").(bool),
+		Severity:        d.Get("severity").(string),
+		DynamicSeverity: resourceToDynamicSeverityArray(d.Get("dynamic_severity").([]interface{})),
+		SignalNames:     resourceToStringArray(d.Get("signal_names").([]interface{})),
+		Tags:            resourceToStringArray(d.Get("tags").([]interface{})),
 	}, nil
 }
+
+func resourceToDynamicSeverityArray(resourceDynamicSeverity []interface{}) []DynamicSeverity {
+	result := make([]DynamicSeverity, len(resourceDynamicSeverity))
+
+	for i, resourceDynamicSeverity := range resourceDynamicSeverity {
+		result[i] = DynamicSeverity{
+			MinimumSignalSeverity: resourceDynamicSeverity.(map[string]interface{})["minimum_signal_severity"].(int),
+			InsightSeverity:       resourceDynamicSeverity.(map[string]interface{})["insight_severity"].(string),
+		}
+	}
+
+	return result
+}
+
+func dynamicSeverityArrayToResource(dynamicSeverities []DynamicSeverity) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(dynamicSeverities))
+
+	for i, dynamicSeverity := range dynamicSeverities {
+		result[i] = map[string]interface{}{
+			"minimum_signal_severity": dynamicSeverity.MinimumSignalSeverity,
+			"insight_severity":        dynamicSeverity.InsightSeverity,
+		}
+	}
+
+	return result
+}

sumologic/resource_sumologic_cse_custom_insight_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAccSumologicCSECustomInsight_createAndUpdate(t *testing.T) {
@@ -35,7 +36,7 @@ func TestAccSumologicCSECustomInsight_createAndUpdate(t *testing.T) {
 					ordered, name, severity, signalName1, signalName2, tag),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckCSECustomInsightExists(resourceName, &CustomInsight),
-					testCheckCustomInsightValues(&CustomInsight, description, enabled,
+					testCheckCustomInsightValues(t, &CustomInsight, description, enabled,
 						ordered, name, severity, signalName1, signalName2, tag),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
@@ -46,12 +47,62 @@ func TestAccSumologicCSECustomInsight_createAndUpdate(t *testing.T) {
 					signalName2, tag),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckCSECustomInsightExists(resourceName, &CustomInsight),
-					testCheckCustomInsightValues(&CustomInsight, description, enabled,
+					testCheckCustomInsightValues(t, &CustomInsight, description, enabled,
 						ordered, nameUpdated, severityUpdated, signalName1,
 						signalName2, tag),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func TestAccSumologicCSECustomInsight_createAndUpdateWithDynamicSeverity(t *testing.T) {
+	SkipCseTest(t)
+
+	var CustomInsight CSECustomInsight
+	minimumSignalSeverity1 := 5
+	dynamicSeverity1 := "MEDIUM"
+	minimumSignalSeverity2 := 8
+	dynamicSeverity2 := "HIGH"
+
+	updatedMinimumSignalSeverity2 := 9
+	updatedDynamicSeverity2 := "CRITICAL"
+
+	resourceName := "sumologic_cse_custom_insight.custom_insight2"
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCSECustomInsightDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testCreateCSECustomInsightConfigWithDynamicSeverity(minimumSignalSeverity1, dynamicSeverity1, minimumSignalSeverity2, dynamicSeverity2),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckCSECustomInsightExists(resourceName, &CustomInsight),
+					testCheckCustomInsightDynamicSeverity(t, &CustomInsight,
+						minimumSignalSeverity1, dynamicSeverity1, minimumSignalSeverity2, dynamicSeverity2),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+				),
+			},
+			{
+				Config: testCreateCSECustomInsightConfigWithDynamicSeverity(minimumSignalSeverity1, dynamicSeverity1, updatedMinimumSignalSeverity2, updatedDynamicSeverity2),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckCSECustomInsightExists(resourceName, &CustomInsight),
+					testCheckCustomInsightDynamicSeverity(t, &CustomInsight,
+						minimumSignalSeverity1, dynamicSeverity1, updatedMinimumSignalSeverity2, updatedDynamicSeverity2),
+					resource.TestCheckResourceAttrSet(resourceName, "id"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -96,6 +147,28 @@ resource "sumologic_cse_custom_insight" "custom_insight" {
 		signalName2, tag)
 }
 
+func testCreateCSECustomInsightConfigWithDynamicSeverity(
+	minimumSignalSeverity1 int, dynamicSeverity1 string, minimumSignalSeverity2 int, dynamicSeverity2 string) string {
+	return fmt.Sprintf(`
+resource "sumologic_cse_custom_insight" "custom_insight2" {
+	description = "Dynamic severity insight"
+    enabled = true
+    ordered = true
+    name = "Dynamic severity insight"
+    severity = "LOW"
+    dynamic_severity {
+        minimum_signal_severity = %d
+        insight_severity = "%s"
+    }
+    dynamic_severity {
+        minimum_signal_severity = %d
+        insight_severity = "%s"
+    }
+    tags = ["test tag"]
+}
+`, minimumSignalSeverity1, dynamicSeverity1, minimumSignalSeverity2, dynamicSeverity2)
+}
+
 func testCheckCSECustomInsightExists(n string, CustomInsight *CSECustomInsight) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -104,7 +177,7 @@ func testCheckCSECustomInsightExists(n string, CustomInsight *CSECustomInsight)
 		}
 
 		if rs.Primary.ID == "" {
-			return fmt.Errorf("chain rule ID is not set")
+			return fmt.Errorf("CustomInsight ID is not set")
 		}
 
 		c := testAccProvider.Meta().(*Client)
@@ -119,35 +192,30 @@ func testCheckCSECustomInsightExists(n string, CustomInsight *CSECustomInsight)
 	}
 }
 
-func testCheckCustomInsightValues(CustomInsight *CSECustomInsight, description string,
+func testCheckCustomInsightValues(t *testing.T, CustomInsight *CSECustomInsight, description string,
 	enabled bool, ordered bool, name string, severity string, signalName1 string,
 	signalName2 string, tag string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		if CustomInsight.Description != description {
-			return fmt.Errorf("bad description, expected \"%s\", got %#v", description, CustomInsight.Description)
-		}
-		if CustomInsight.Enabled != enabled {
-			return fmt.Errorf("bad enabled, expected \"%t\", got %#v", enabled, CustomInsight.Enabled)
-		}
-		if CustomInsight.Ordered != ordered {
-			return fmt.Errorf("bad ordered, expected \"%t\", got %#v", ordered, CustomInsight.Ordered)
-		}
-		if CustomInsight.Name != name {
-			return fmt.Errorf("bad name, expected \"%s\", got %#v", name, CustomInsight.Name)
-		}
-		if CustomInsight.Severity != severity {
-			return fmt.Errorf("bad severity, expected \"%s\", got %#v", severity, CustomInsight.Severity)
-		}
-		if CustomInsight.SignalNames[0] != signalName1 {
-			return fmt.Errorf("bad signalName1, expected \"%s\", got %#v", signalName1, CustomInsight.SignalNames[0])
-		}
-		if CustomInsight.SignalNames[1] != signalName2 {
-			return fmt.Errorf("bad signalName2, expected \"%s\", got %#v", signalName2, CustomInsight.SignalNames[1])
-		}
-		if CustomInsight.Tags[0] != tag {
-			return fmt.Errorf("bad tag, expected \"%s\", got %#v", tag, CustomInsight.Tags[0])
-		}
+		assert.Equal(t, description, CustomInsight.Description)
+		assert.Equal(t, enabled, CustomInsight.Enabled)
+		assert.Equal(t, ordered, CustomInsight.Ordered)
+		assert.Equal(t, name, CustomInsight.Name)
+		assert.Equal(t, severity, CustomInsight.Severity)
+		assert.Equal(t, signalName1, CustomInsight.SignalNames[0])
+		assert.Equal(t, signalName2, CustomInsight.SignalNames[1])
+		assert.Equal(t, tag, CustomInsight.Tags[0])
+		return nil
+	}
+}
 
+func testCheckCustomInsightDynamicSeverity(t *testing.T, CustomInsight *CSECustomInsight,
+	minimumSignalSeverity1 int, dynamicSeverity1 string, minimumSignalSeverity2 int, dynamicSeverity2 string) resource.TestCheckFunc {
+
+	return func(s *terraform.State) error {
+		assert.Equal(t, minimumSignalSeverity1, CustomInsight.DynamicSeverity[0].MinimumSignalSeverity)
+		assert.Equal(t, dynamicSeverity1, CustomInsight.DynamicSeverity[0].InsightSeverity)
+		assert.Equal(t, minimumSignalSeverity2, CustomInsight.DynamicSeverity[1].MinimumSignalSeverity)
+		assert.Equal(t, dynamicSeverity2, CustomInsight.DynamicSeverity[1].InsightSeverity)
 		return nil
 	}
 }

sumologic/resource_sumologic_cse_first_seen_rule_test.go

@@ -59,6 +59,11 @@ func TestAccSumologicCSEFirstSeenRule_createAndUpdate(t *testing.T) {
 					testCheckFirstSeenRuleValues(t, &updatedPayload, &result),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

sumologic/resource_sumologic_cse_match_rule_test.go

@@ -62,6 +62,11 @@ func TestAccSumologicCSEMatchRule_createAndUpdate(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

sumologic/resource_sumologic_cse_outlier_rule.go

@@ -132,7 +132,7 @@ func resourceSumologicCSEOutlierRuleRead(d *schema.ResourceData, meta interface{
 		return nil
 	}
 
-	d.Set("aggregate_function", aggregationFunctionsArrayToResource(CSEOutlierRuleGet.AggregationFunctions))
+	d.Set("aggregation_functions", aggregationFunctionsArrayToResource(CSEOutlierRuleGet.AggregationFunctions))
 	d.Set("baseline_window_size", CSEOutlierRuleGet.BaselineWindowSize)
 	d.Set("description_expression", CSEOutlierRuleGet.DescriptionExpression)
 	d.Set("deviation_threshold", CSEOutlierRuleGet.DeviationThreshold)