Merge branch 'master' into emichaeli-add-policies-resource

Author: emichaeli

.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

@@ -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
@@ -53,15 +53,13 @@ jobs:
       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

.go-version

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

CHANGELOG.md

@@ -1,4 +1,31 @@
-## 2.9.7 (Unreleased)
+## 2.9.9 (Unreleased)
+
+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`.
+
+## 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)
 

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
 )

go.sum

@@ -55,7 +55,16 @@ func dataSourceSumologicHTTPSourceRead(d *schema.ResourceData, meta interface{})
 	c := meta.(*Client)
 
 	id, _ := strconv.Atoi(d.Id())
-	source, err := c.GetSourceName(d.Get("collector_id").(int64), d.Get("name").(string))
+	var collectorId int64
+	switch cid := d.Get("collector_id").(type) {
+	case int:
+		collectorId = int64(cid)
+	case int64:
+		collectorId = cid
+	default:
+		return fmt.Errorf("unknown data type of collector_id: %T, value: %v", cid, cid)
+	}
+	source, err := c.GetSourceName(collectorId, d.Get("name").(string))
 
 	if err != nil {
 		return err

sumologic/data_source_sumologic_http_source.go

@@ -34,7 +34,7 @@ func dataSourceSumologicRole() *schema.Resource {
 				Computed: true,
 			},
 			"capabilities": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Computed: true,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,

sumologic/data_source_sumologic_role.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"github.com/go-errors/errors"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/mutexkv"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
@@ -90,8 +89,6 @@ func Provider() terraform.ResourceProvider {
 	}
 }
 
-var SumoMutexKV = mutexkv.NewMutexKV()
-
 func resolveRedirectURL(accessId string, accessKey string) (string, error) {
 	req, err := http.NewRequest(http.MethodHead, "https://api.sumologic.com/api/v1/collectors", nil)
 	if err != nil {

sumologic/provider.go

@@ -77,9 +77,14 @@ func resourceSumologicConnection() *schema.Resource {
 			"webhook_type": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ValidateFunc: validation.StringInSlice([]string{"AWSLambda", "Azure", "Datadog", "HipChat", "PagerDuty", "Slack", "Webhook", "NewRelic", "Jira", "Opsgenie", "MicrosoftTeams"}, false),
+				ValidateFunc: validation.StringInSlice([]string{"AWSLambda", "Azure", "Datadog", "HipChat", "PagerDuty", "Slack", "Webhook", "NewRelic", "Jira", "Opsgenie", "MicrosoftTeams", "ServiceNow"}, false),
 				Default:      "Webhook",
 			},
+			"connection_subtype": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice([]string{"Incident", "Event"}, false),
+			},
 		},
 	}
 }
@@ -136,6 +141,7 @@ func resourceSumologicConnectionRead(d *schema.ResourceData, meta interface{}) e
 	}
 	d.Set("default_payload", connection.DefaultPayload)
 	d.Set("webhook_type", connection.WebhookType)
+	d.Set("connection_subtype", connection.ConnectionSubtype)
 	d.SetId(connection.ID)
 
 	log.Println("====End Connection Read====")
@@ -201,6 +207,7 @@ func resourceToConnection(d *schema.ResourceData) Connection {
 	connection.CustomHeaders = mapToHeaders(d.Get("custom_headers").(map[string]interface{}))
 	connection.DefaultPayload = d.Get("default_payload").(string)
 	connection.WebhookType = d.Get("webhook_type").(string)
+	connection.ConnectionSubtype = d.Get("connection_subtype").(string)
 
 	return connection
 }
@@ -233,4 +240,5 @@ func printConnection(connection Connection) {
 	log.Printf("CustomHeaders: %s", connection.CustomHeaders)
 	log.Printf("DefaultPayload: %s", connection.DefaultPayload)
 	log.Printf("WebhookType: %s", connection.WebhookType)
+	log.Printf("ConnectionSubtype: %s", connection.ConnectionSubtype)
 }