Merge branch 'master' into zzhou-metrics-management-tf

Author: sumo-zzhou

CHANGELOG.md

@@ -1,7 +1,18 @@
-## 2.23.1 (Unreleased)
+## 2.24.1 (Unreleased)
+BUG FIXES:
+* Enforce non-empty string validation of `default_normalized_domain` and `domain_mappings` in cse_entity_normalization resource. (GH-540)
 FEATURES:
 * **New Resource:** sumologic_metrics_search (GH-528)
 
+## 2.24.0 (June 22, 2023)
+FEATURES:
+* **New Resource:** sumologic_cse_outlier_rule (GH-532)
+* Add new optional `global_signal_suppression_window` field to sumologic_cse_insights_configuration (GH-533)
+
+BUG FIXES:
+* Enforce validation of `group_by_fields` in cse_*_rule resources, on non empty string elements. (GH-535)
+* Fixes `resource_sumologic_cse_match_list` to allow for match lists with more than 1000 items to be created. (GH-536)
+
 ## 2.23.0 (May 24, 2023)
 FEATURES:
 * **New Resource:** sumologic_log_search (GH-432)

README.md

@@ -53,8 +53,20 @@ Then run `terraform init` to initialize it.
 
 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`, and `SUMOLOGIC_ENVIRONMENT` must also be set for acceptance tests to work properly.
+- 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).
+     ```sh
+     $ export SUMOLOGIC_ACCESSID="yourAccessID"
+     $ export SUMOLOGIC_ACCESSKEY="yourAccessKey"
+     $ export SUMOLOGIC_ENVIRONMENT="stag"
+     $ export SUMOLOGIC_BASE_URL="https://stag-api.sumologic.net/api/"
+     $ 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).
+
 - 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`
     - Set Environment variable `SUMOLOGIC_ENABLE_GCP_METRICS_ACC_TESTS` to false, to disable acceptance test for Gcp Metrics. 

go.mod

@@ -4,6 +4,7 @@ go 1.17
 
 require (
 	github.com/go-errors/errors v1.4.0
+	github.com/google/go-cmp v0.5.6
 	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/hashicorp/terraform-plugin-sdk v1.17.2
 	github.com/stretchr/testify v1.7.0
@@ -28,7 +29,6 @@ require (
 	github.com/go-test/deep v1.0.7 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect

sumologic/data_source_sumologic_folder_test.go

@@ -31,7 +31,7 @@ func TestAccDataSourceFolder_folder_does_not_exist(t *testing.T) {
 			{
 				Config: folderConfig("/Library/Users/[email protected]/doesNotExist"),
 				ExpectError: regexp.MustCompile(
-					"folder with path '/Library/Users/dgould\\[email protected]/doesNotExist' does not exist"),
+					`folder with path '/Library/Users/dgould\[email protected]/doesNotExist' does not exist`),
 			},
 		},
 	})

sumologic/provider.go

@@ -63,6 +63,7 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_cse_match_rule":                           resourceSumologicCSEMatchRule(),
 			"sumologic_cse_threshold_rule":                       resourceSumologicCSEThresholdRule(),
 			"sumologic_cse_first_seen_rule":                      resourceSumologicCSEFirstSeenRule(),
+			"sumologic_cse_outlier_rule":                         resourceSumologicCSEOutlierRule(),
 			"sumologic_collector":                                resourceSumologicCollector(),
 			"sumologic_installed_collector":                      resourceSumologicInstalledCollector(),
 			"sumologic_http_source":                              resourceSumologicHTTPSource(),

sumologic/resource_sumologic_cse_aggregation_rule.go

@@ -58,7 +58,8 @@ func resourceSumologicCSEAggregationRule() *schema.Resource {
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem: &schema.Schema{
-					Type: schema.TypeString,
+					Type:         schema.TypeString,
+					ValidateFunc: validation.StringIsNotEmpty,
 				},
 			},
 			"is_prototype": {

sumologic/resource_sumologic_cse_chain_rule.go

@@ -46,7 +46,8 @@ func resourceSumologicCSEChainRule() *schema.Resource {
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem: &schema.Schema{
-					Type: schema.TypeString,
+					Type:         schema.TypeString,
+					ValidateFunc: validation.StringIsNotEmpty,
 				},
 			},
 			"is_prototype": {

sumologic/resource_sumologic_cse_entity_normalization_configuration.go

@@ -2,6 +2,7 @@ package sumologic
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"log"
 )
 
@@ -29,8 +30,9 @@ func resourceSumologicCSEEntityNormalizationConfiguration() *schema.Resource {
 				Required: true,
 			},
 			"default_normalized_domain": {
-				Type:     schema.TypeString,
-				Optional: true,
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringIsNotEmpty,
 			},
 			"normalize_hostnames": {
 				Type:     schema.TypeBool,
@@ -46,12 +48,14 @@ func resourceSumologicCSEEntityNormalizationConfiguration() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"normalized_domain": {
-							Type:     schema.TypeString,
-							Required: true,
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringIsNotEmpty,
 						},
 						"raw_domain": {
-							Type:     schema.TypeString,
-							Required: true,
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringIsNotEmpty,
 						},
 					},
 				},

sumologic/resource_sumologic_cse_first_seen_rule.go

@@ -42,7 +42,8 @@ func resourceSumologicCSEFirstSeenRule() *schema.Resource {
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem: &schema.Schema{
-					Type: schema.TypeString,
+					Type:         schema.TypeString,
+					ValidateFunc: validation.StringIsNotEmpty,
 				},
 			},
 			"is_prototype": {

sumologic/resource_sumologic_cse_insights_configuration.go

@@ -26,6 +26,11 @@ func resourceSumologicCSEInsightsConfiguration() *schema.Resource {
 				Optional: true,
 				ForceNew: false,
 			},
+			"global_signal_suppression_window": {
+				Type:     schema.TypeFloat,
+				Optional: true,
+				ForceNew: false,
+			},
 		},
 	}
 }
@@ -49,6 +54,7 @@ func resourceSumologicCSEInsightsConfigurationRead(d *schema.ResourceData, meta
 
 	d.Set("lookback_days", CSEInsightsConfiguration.LookbackDays)
 	d.Set("threshold", CSEInsightsConfiguration.Threshold)
+	d.Set("global_signal_suppression_window", CSEInsightsConfiguration.GlobalSignalSuppressionWindow)
 
 	return nil
 }
@@ -93,9 +99,11 @@ func resourceToCSEInsightsConfiguration(d *schema.ResourceData) (CSEInsightsConf
 
 	lookbackDays := d.Get("lookback_days").(float64)
 	threshold := d.Get("threshold").(float64)
+	globalSignalSuppressionWindow := d.Get("global_signal_suppression_window").(float64)
 
 	return CSEInsightsConfiguration{
-		LookbackDays: &lookbackDays,
-		Threshold:    &threshold,
+		LookbackDays:                  &lookbackDays,
+		Threshold:                     &threshold,
+		GlobalSignalSuppressionWindow: &globalSignalSuppressionWindow,
 	}, nil
 }