Merge remote-tracking branch 'origin/master' into dgould-SUMO-172016

Author: dagould

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.16
       -
         name: Import GPG key
         id: import_gpg
@@ -44,4 +44,4 @@ jobs:
           args: release --rm-dist
         env:
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -14,7 +14,7 @@ on:
       - 'README.md'
       - 'CHANGELOG.md'
   # For systems with an upstream API that could drift unexpectedly (like most SaaS systems, etc.),
-  # we recommend testing at a regular interval not necessarily tied to code changes. This will 
+  # we recommend testing at a regular interval not necessarily tied to code changes. This will
   # ensure you are alerted to something breaking due to an API change, even if the code did not
   # change.
   schedule:
@@ -30,7 +30,7 @@ jobs:
     - name: Set up Go
       uses: actions/[email protected]
       with:
-        go-version: '1.15'
+        go-version: '1.16'
       id: go
 
     - name: Check out code into the Go module directory
@@ -47,21 +47,19 @@ jobs:
     name: Matrix Test
     needs: build
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
         # list whatever Terraform versions here you would like to support
         terraform:
-#           - '0.12.29'
-          - '0.13.4'
-#           - '0.14.0-beta2'
+          - '1.0.3'
     steps:
 
     - name: Set up Go
       uses: actions/[email protected]
       with:
-        go-version: '1.15'
+        go-version: '1.16'
       id: go
 
     - name: Check out code into the Go module directory
@@ -70,9 +68,9 @@ jobs:
     - name: Get dependencies
       run: |
         go mod download
-        
+
     - name: TF acceptance tests
-      timeout-minutes: 10
+      timeout-minutes: 15
       env:
         TF_ACC: "1"
         TF_ACC_TERRAFORM_VERSION: ${{ matrix.terraform }}
@@ -84,9 +82,8 @@ jobs:
         SUMOLOGIC_ACCESSID: ${{ secrets.SUMOLOGIC_ACCESSID }}
         SUMOLOGIC_ACCESSKEY:  ${{ secrets.SUMOLOGIC_ACCESSKEY }}
         SUMOLOGIC_ENVIRONMENT:  ${{ secrets.SUMOLOGIC_ENVIRONMENT }}
-        SUMOLOGIC_TEST_AWS_ID:  ${{ secrets.SUMOLOGIC_TEST_AWS_ID }}
-        SUMOLOGIC_TEST_AWS_KEY:  ${{ secrets.SUMOLOGIC_TEST_AWS_KEY }}
         SUMOLOGIC_TEST_BUCKET_NAME:  ${{ secrets.SUMOLOGIC_TEST_BUCKET_NAME }}
+        SUMOLOGIC_TEST_ROLE_ARN:  ${{ secrets.SUMOLOGIC_TEST_ROLE_ARN }}
 
       run: |
         go test -v -cover ./sumologic/

.go-version

@@ -1 +1 @@
-1.13.8
+1.16.6

CHANGELOG.md

@@ -1,4 +1,85 @@
-## 2.9.7 (Unreleased)
+## 2.11.1 (Unreleased)
+
+## 2.11.0 (October 19, 2021)
+
+FEATURES:
+
+* **New Resource:** sumologic_cse_rule_tuning_expression (GH-281)
+* **New Resource:** sumologic_cse_entity_criticality_config (GH-275)
+* **New Resource:** sumologic_cse_custom_entity_type (GH-275)
+* **New Resource:** sumologic_cse_insights_resolution (GH-274)
+* **New Resource:** sumologic_cse_insights_status (GH-274)
+* **New Resource:** sumologic_cse_insights_configuration (GH-274)
+* **New Resource:** sumologic_cse_log_mapping (GH-284) 
+* **New Datasource:** sumologic_cse_log_mapping_vendor_product (GH-284)
+* **New Resource:** sumologic_cse_aggregation_rule (GH-290)
+* **New Resource:** sumologic_cse_chain_rule (GH-290)
+* **New Resource:** sumologic_cse_match_rule (GH-287)
+* **New Resource:** sumologic_cse_threshold_rule (GH-287)
+* **New Resource:** sumologic_cse_custom_insight (GH-289)
+
+BUG FIXES:
+
+* Fix hierarchy without a filter not being accepted
+
+## 2.10.0 (September 22, 2021)
+
+* Add a provider option `admin_mode`
+
+FEATURES:
+
+* **New Resource:** sumologic_hierarchy (GH-260)
+* **New Resource:** sumologic_cse_network_block (GH-271)
+
+POTENTIALLY BREAKING CHANGES:
+
+* resource/sumologic_policies: Changed all policies to be required. Configurations might need to be updated in
+  case some policies were not specified previously. (GH-279)
+
+DEPRECATIONS:
+
+* resource/sumologic_monitor: Deprecated `triggers` in favor of `trigger_conditions` (GH-267)
+
+## 2.9.10 (August 24, 2021)
+
+FEATURES:
+
+* **New Resource:** sumologic_policies (GH-248)
+* Add a new optional field `playbook` to resource/sumologic_monitor.
+* Add a new optional field `evaluation_delay` to resource/sumologic_monitor.
+
+## 2.9.9 (August 12, 2021)
+
+BUG FIXES:
+
+* resource/sumologic_monitor: Removed deprecation warning for `triggers`.
+* seperated docs for sumologic_monitor_folder from docs for sumologic_monitor.
+* resource/sumologic_monitor: Fixed docs for `trigger_conditions`.
+
+FEATURES:
+
+* Adding "entityId" as part of SAML API response object.
+
+## 2.9.8 (July 30, 2021)
+
+FEATURES:
+
+* Add support for ServiceNow Incident and Event webhook connection (GH-250)
+* Add support for new detection methods to sumologic_monitor (GH-239)
+
+DEPRECATIONS:
+
+* resource/sumologic_monitor: Deprecated `triggers` in favor of `trigger_conditions` (GH-239)
+
+BUG FIXES:
+
+* datasource/sumologic_http_source: fix int64 conversion for `collector_id` (GH-251)
+
+## 2.9.7 (July 22, 2021)
+
+ENHANCEMENTS:
+
+* Upgrade GoLang to support arm_64 (GH-241)
 
 ## 2.9.6 (July 9, 2021)
 

README.md

@@ -48,7 +48,7 @@ $ make build
 
 In order to test the provider, you can run `make test`.
 
-For manual testing, run `make install` in the root direcory to install it as a plugin. 
+For manual testing, run `make install` in the root directory to install it as a plugin. 
 Then run `terraform init` to initialize it.
 
 In order to run the full suite of Acceptance tests, run `make testacc`.

go.mod

@@ -1,34 +1,21 @@
 module github.com/SumoLogic/terraform-provider-sumologic
 
-go 1.12
+go 1.16
 
 require (
-	cloud.google.com/go/pubsub v1.2.0 // indirect
-	github.com/aws/aws-sdk-go v1.28.14 // indirect
-	github.com/fatih/color v1.9.0 // indirect
-	github.com/go-errors/errors v1.0.1
-	github.com/go-test/deep v1.0.5 // indirect
-	github.com/golang/mock v1.4.0 // indirect
-	github.com/hashicorp/go-hclog v0.12.0 // indirect
+	cloud.google.com/go v0.88.0 // indirect
+	github.com/aws/aws-sdk-go v1.40.10 // indirect
+	github.com/fatih/color v1.12.0 // indirect
+	github.com/go-errors/errors v1.4.0
+	github.com/go-test/deep v1.0.7 // indirect
+	github.com/hashicorp/go-hclog v0.16.2 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/terraform v0.12.24
-	github.com/hashicorp/terraform-config-inspect v0.0.0-20200210163047-f7d8399e1194 // indirect
-	github.com/hashicorp/terraform-plugin-sdk v1.7.0
-	github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136 // indirect
-	github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
-	github.com/kr/pretty v0.2.0 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/hashicorp/terraform-config-inspect v0.0.0-20210625153042-09f34846faab // indirect
+	github.com/hashicorp/terraform-plugin-sdk v1.17.2
+	github.com/hashicorp/yamux v0.0.0-20210707203944-259a57b3608c // indirect
+	github.com/mattn/go-isatty v0.0.13 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/posener/complete v1.2.3 // indirect
-	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/ulikunitz/xz v0.5.6 // indirect
-	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
-	golang.org/x/crypto v0.0.0-20200210222208-86ce3cb69678 // indirect
-	golang.org/x/exp v0.0.0-20200207192155-f17229e696bd // indirect
-	golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 // indirect
-	google.golang.org/api v0.17.0 // indirect
-	google.golang.org/genproto v0.0.0-20200210034751-acff78025515 // indirect
-	google.golang.org/grpc v1.27.1 // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
+	github.com/ulikunitz/xz v0.5.10 // indirect
 )