Merge branch 'master' into INVS-1146_Entity_Group_Inventory_enhancements

Author: pmontiel-git

CHANGELOG.md

@@ -1,10 +1,57 @@
-## 2.21.1 (Unreleased)
+## 2.25.1 (Unreleased)
 ENHANCEMENTS:
 * resource/sumologic_cse_inventory_entity_group_configuration: Add new fields to support enhanced functionality. (GH-495)
 
 DEPRECATIONS:
 * resource/sumologic_cse_inventory_entity_group_configuration: Deprecated `groups` in favor of `inventory_key`, `inventory_value`. (GH-495)
 
+## 2.25.0 (August 8, 2023)
+FEATURES:
+* **New Resource:** sumologic_metrics_search (GH-528)
+* **New Resource:** sumologic_rum_source (GH-547)
+* Add `budgetType` support for sumologic_ingest_budget_v2 (GH-549)
+
+BUG FIXES:
+* Enforce non-empty string validation of `default_normalized_domain` and `domain_mappings` in cse_entity_normalization resource. (GH-540)
+* Fixes `sumologic_s3_source` to allow setting `use_versioned_api` parameter to `false`. (GH-555)
+
+DEPRECATIONS:
+* resource_sumologic_ingest_budget : Deprecated in favour of `resource_sumologic_ingest_budget_v2`.
+
+## 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)
+* **New Resource:** sumologic_s3_archive_source (GH-524)
+
+BUG FIXES:
+* Enforce validation of `inventory_type` for sumologic_cse_inventory_entity_group_configuration ( fix documentation too ) (GH-521)
+
+## 2.22.1 (May 15, 2023)
+FEATURES:
+* resource/sumologic_slo: Added support for associating tags with an SLO
+
+## 2.22.0 (March 23, 2023)
+FEATURES:
+* resource/sumologic_monitor: Added support for creating SLO Monitors with multiple burn rates (GH-499)
+* Add new optional `resolution_payload` field to connection resource and `resolution_payload_override` field to notifications section of monitor resource (GH-482)
+* **New Resource:** sumologic_local_file_source (GH-477)
+
+BUG FIXES:
+* Remove thresholdType field under searchSchedule in content resource (GH-483)
+
+DEPRECATIONS:
+
+* resource/sumologic_monitor: Deprecated `burn_rate_threshold` and `time_range` in favor of `burn_rate` inside `slo_burn_rate_condition` block (GH-499)
+
 
 ## 2.21.0 (February 27, 2023)
 FEATURES:

GNUmakefile

@@ -4,6 +4,7 @@ WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=sumologic
 PLUGIN_DIR=~/.terraform.d/plugins
 UNAME=$(shell uname -m)
+DEBUG_FLAGS=-gcflags="all=-N -l"
 
 default: build
 
@@ -22,9 +23,9 @@ install: fmtcheck
 install-dev: fmtcheck
 	mkdir -vp $(PLUGIN_DIR)
 ifeq ($(UNAME), arm64)
-	go build -o $(PLUGIN_DIR)/sumologic.com/dev/sumologic/1.0.0/darwin_arm64/terraform-provider-sumologic 
+	go build ${DEBUG_FLAGS} -o $(PLUGIN_DIR)/sumologic.com/dev/sumologic/1.0.0/darwin_arm64/terraform-provider-sumologic 
 else
-	go build -o $(PLUGIN_DIR)/sumologic.com/dev/sumologic/1.0.0/darwin_amd64/terraform-provider-sumologic
+	go build ${DEBUG_FLAGS} -o $(PLUGIN_DIR)/sumologic.com/dev/sumologic/1.0.0/darwin_amd64/terraform-provider-sumologic
 endif
 
 uninstall:

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,13 +63,15 @@ 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_gcp_source":                               resourceSumologicGCPSource(),
 			"sumologic_polling_source":                           resourceSumologicPollingSource(),
 			"sumologic_s3_source":                                resourceSumologicGenericPollingSource(),
 			"sumologic_s3_audit_source":                          resourceSumologicGenericPollingSource(),
+			"sumologic_s3_archive_source":                        resourceSumologicGenericPollingSource(),
 			"sumologic_cloudwatch_source":                        resourceSumologicGenericPollingSource(),
 			"sumologic_aws_inventory_source":                     resourceSumologicGenericPollingSource(),
 			"sumologic_aws_xray_source":                          resourceSumologicGenericPollingSource(),
@@ -107,6 +109,10 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_policies":                                 resourceSumologicPolicies(),
 			"sumologic_hierarchy":                                resourceSumologicHierarchy(),
 			"sumologic_content_permission":                       resourceSumologicPermissions(),
+			"sumologic_local_file_source":                        resourceSumologicLocalFileSource(),
+			"sumologic_log_search":                               resourceSumologicLogSearch(),
+			"sumologic_metrics_search":                           resourceSumologicMetricsSearch(),
+			"sumologic_rum_source":                               resourceSumologicRumSource(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
 			"sumologic_cse_log_mapping_vendor_product": dataSourceCSELogMappingVendorAndProduct(),

sumologic/resource_sumologic_connection.go

@@ -82,6 +82,12 @@ func resourceSumologicConnection() *schema.Resource {
 				Optional:     true,
 				ValidateFunc: validation.StringInSlice([]string{"Incident", "Event"}, false),
 			},
+			"resolution_payload": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringIsJSON,
+				Computed:     true,
+			},
 		},
 	}
 }
@@ -137,6 +143,7 @@ func resourceSumologicConnectionRead(d *schema.ResourceData, meta interface{}) e
 		return fmt.Errorf("error setting custom headers for resource %s: %s", d.Id(), err)
 	}
 	d.Set("default_payload", connection.DefaultPayload)
+	d.Set("resolution_payload", connection.ResolutionPayload)
 	d.Set("webhook_type", connection.WebhookType)
 	d.Set("connection_subtype", connection.ConnectionSubtype)
 	d.SetId(connection.ID)
@@ -203,6 +210,7 @@ func resourceToConnection(d *schema.ResourceData) Connection {
 	connection.Headers = mapToHeaders(d.Get("headers").(map[string]interface{}))
 	connection.CustomHeaders = mapToHeaders(d.Get("custom_headers").(map[string]interface{}))
 	connection.DefaultPayload = d.Get("default_payload").(string)
+	connection.ResolutionPayload = d.Get("resolution_payload").(string)
 	connection.WebhookType = d.Get("webhook_type").(string)
 	connection.ConnectionSubtype = d.Get("connection_subtype").(string)
 
@@ -236,6 +244,7 @@ func printConnection(connection Connection) {
 	log.Printf("Headers: %s", connection.Headers)
 	log.Printf("CustomHeaders: %s", connection.CustomHeaders)
 	log.Printf("DefaultPayload: %s", connection.DefaultPayload)
+	log.Printf("ResolutionPayload: %s", connection.ResolutionPayload)
 	log.Printf("WebhookType: %s", connection.WebhookType)
 	log.Printf("ConnectionSubtype: %s", connection.ConnectionSubtype)
 }