Merge branch 'master' into vishal-search-tf-resource

Author: sumovishal

CHANGELOG.md

@@ -1,6 +1,19 @@
-## 2.20.2 (Unreleased)
+## 2.22.1 (Unreleased)
 
-## 2.20.1 (February 27, 2023)
+## 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:
 * **New Resource:** sumologic_cse_first_seen_rule (GH-476)
 * **New Resource:** sumologic_cse_automation (GH-467)

sumologic/provider.go

@@ -107,6 +107,7 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_policies":                                 resourceSumologicPolicies(),
 			"sumologic_hierarchy":                                resourceSumologicHierarchy(),
 			"sumologic_content_permission":                       resourceSumologicPermissions(),
+			"sumologic_local_file_source":                        resourceSumologicLocalFileSource(),
 			"sumologic_log_search":                               resourceSumologicLogSearch(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{

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)
 }

sumologic/resource_sumologic_connection_test.go

@@ -16,6 +16,7 @@ func TestAccConnection_create(t *testing.T) {
 	description := acctest.RandomWithPrefix("tf-connection-test-description")
 	url := "https://example.com"
 	defaultPayload := "{\"eventType\" : \"{{Name}}\"}"
+	resolutionPayload := "{\"eventType\" : \"{{Name}}\"}"
 	webhookType := "Webhook"
 
 	var connection Connection
@@ -26,7 +27,7 @@ func TestAccConnection_create(t *testing.T) {
 		CheckDestroy: testAccCheckConnectionDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: createConnectionConfig(name, connectionType, description, url, webhookType, defaultPayload),
+				Config: createConnectionConfig(name, connectionType, description, url, webhookType, defaultPayload, resolutionPayload),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckConnectionExists("sumologic_connection.test", &connection, t),
 					testAccCheckConnectionAttributes("sumologic_connection.test"),
@@ -35,6 +36,7 @@ func TestAccConnection_create(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_connection.test", "description", description),
 					resource.TestCheckResourceAttr("sumologic_connection.test", "url", url),
 					resource.TestCheckResourceAttr("sumologic_connection.test", "default_payload", defaultPayload+"\n"),
+					resource.TestCheckResourceAttr("sumologic_connection.test", "resolution_payload", resolutionPayload+"\n"),
 					resource.TestCheckResourceAttr("sumologic_connection.test", "webhook_type", webhookType),
 				),
 			},
@@ -48,6 +50,7 @@ func TestAccConnection_createServiceNowWebhook(t *testing.T) {
 	description := acctest.RandomWithPrefix("tf-servicenow-webhook-connection-test-description")
 	url := "https://example.com"
 	defaultPayload := "{\"eventType\" : \"{{Name}}\"}"
+	resolutionPayload := "{\n  \"sys_id\": \"{{SysId}}\",\n  \"state\": \"6\",\n  \"incident_state\": \"6\",\n  \"work_notes\": \"Resolved value - Test\"\n}"
 	webhookType := "ServiceNow"
 	connectionSubtype := "Incident"
 
@@ -59,7 +62,8 @@ func TestAccConnection_createServiceNowWebhook(t *testing.T) {
 		CheckDestroy: testAccCheckConnectionDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: createServiceNowWebhookConnectionConfig(name, connectionType, description, url, connectionSubtype, defaultPayload),
+				Config: createServiceNowWebhookConnectionConfigWithResolutionPayload(name, connectionType, description, url,
+					connectionSubtype, defaultPayload, resolutionPayload),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckConnectionExists("sumologic_connection.serviceNowTest", &connection, t),
 					testAccCheckConnectionAttributes("sumologic_connection.serviceNowTest"),
@@ -68,6 +72,7 @@ func TestAccConnection_createServiceNowWebhook(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "description", description),
 					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "url", url),
 					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "default_payload", defaultPayload+"\n"),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "resolution_payload", resolutionPayload+"\n"),
 					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "webhook_type", webhookType),
 					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "connection_subtype", connectionSubtype),
 				),
@@ -79,41 +84,48 @@ func TestAccConnection_createServiceNowWebhook(t *testing.T) {
 func TestAccConnection_update(t *testing.T) {
 	var connection Connection
 	connectionType := "WebhookConnection"
-	name := acctest.RandomWithPrefix("tf-connection-test-name")
+	name := acctest.RandomWithPrefix("tf-servicenow-webhook-connection-test-name")
+	description := acctest.RandomWithPrefix("tf-connection-test-description")
 	url := "https://example.com"
-	defaultPayload := `{"eventType" : "{{Name}}"}`
-	webhookType := "Webhook"
-	fDescription := acctest.RandomWithPrefix("tf-connection-test-description")
-	sDescription := acctest.RandomWithPrefix("tf-connection-test-description")
+	defaultPayload := "{\"eventType\" : \"{{Name}}\"}"
+	webhookType := "ServiceNow"
+	connectionSubtype := "Incident"
+
+	updatedDefaultPayload := `{"eventType" : "{{Name}} default updated"}`
+	updatedResolutionPayload := "{\n  \"sys_id\": \"{{SysId}}\",\n  \"state\": \"6\",\n  \"incident_state\": \"6\",\n  \"work_notes\": \"Resolved value - Test\"\n}"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckConnectionDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: createConnectionConfig(name, connectionType, fDescription, url, webhookType, defaultPayload),
+				Config: createServiceNowWebhookConnectionConfig(name, connectionType, description, url, connectionSubtype, defaultPayload),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckConnectionExists("sumologic_connection.test", &connection, t),
-					testAccCheckConnectionAttributes("sumologic_connection.test"),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "type", connectionType),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "name", name),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "description", fDescription),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "url", url),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "default_payload", defaultPayload+"\n"),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "webhook_type", webhookType),
+					testAccCheckConnectionExists("sumologic_connection.serviceNowTest", &connection, t),
+					testAccCheckConnectionAttributes("sumologic_connection.serviceNowTest"),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "type", connectionType),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "name", name),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "description", description),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "url", url),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "default_payload", defaultPayload+"\n"),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "webhook_type", webhookType),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "connection_subtype", connectionSubtype),
 				),
 			}, {
-				Config: createConnectionConfig(name, connectionType, sDescription, url, webhookType, defaultPayload),
+				Config: createServiceNowWebhookConnectionConfigWithResolutionPayload(name, connectionType, description, url, connectionSubtype,
+					updatedDefaultPayload, updatedResolutionPayload),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckConnectionExists("sumologic_connection.test", &connection, t),
-					testAccCheckConnectionAttributes("sumologic_connection.test"),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "type", connectionType),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "name", name),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "description", sDescription),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "url", url),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "default_payload", defaultPayload+"\n"),
-					resource.TestCheckResourceAttr("sumologic_connection.test", "webhook_type", webhookType),
+					testAccCheckConnectionExists("sumologic_connection.serviceNowTest", &connection, t),
+					testAccCheckConnectionAttributes("sumologic_connection.serviceNowTest"),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "type", connectionType),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "name", name),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "description", description),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "url", url),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "default_payload", updatedDefaultPayload+"\n"),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "resolution_payload", updatedResolutionPayload+"\n"),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "webhook_type", webhookType),
+					resource.TestCheckResourceAttr("sumologic_connection.serviceNowTest", "connection_subtype", connectionSubtype),
 				),
 			},
 		},
@@ -171,7 +183,7 @@ func testAccCheckConnectionDestroy(s *terraform.State) error {
 	return nil
 }
 
-func createConnectionConfig(name, connectionType, desc, url, webhookType, defaultPayload string) string {
+func createConnectionConfig(name, connectionType, desc, url, webhookType, defaultPayload string, resolutionPayload string) string {
 	return fmt.Sprintf(`
 resource "sumologic_connection" "test" {
 	name = "%s"
@@ -181,9 +193,12 @@ resource "sumologic_connection" "test" {
 	webhook_type = "%s"
 	default_payload = <<JSON
 %s
+JSON
+	resolution_payload = <<JSON
+%s
 JSON
 }
-`, name, connectionType, desc, url, webhookType, defaultPayload)
+`, name, connectionType, desc, url, webhookType, defaultPayload, resolutionPayload)
 }
 
 func createServiceNowWebhookConnectionConfig(name, connectionType, desc, url, connectionSubtype, defaultPayload string) string {
@@ -204,3 +219,24 @@ JSON
 }
 `, name, connectionType, desc, url, connectionSubtype, defaultPayload)
 }
+func createServiceNowWebhookConnectionConfigWithResolutionPayload(name, connectionType, desc, url, connectionSubtype, defaultPayload string, resolutionPayload string) string {
+	return fmt.Sprintf(`
+resource "sumologic_connection" "serviceNowTest" {
+	name = "%s"
+	type = "%s"
+	description = "%s"
+	url = "%s"
+	headers = {
+		"Authorization": "Basic SOMERANDOMAUTHSTRING"
+	}
+	webhook_type = "ServiceNow"
+	connection_subtype = "%s"
+	default_payload = <<JSON
+%s
+JSON
+	resolution_payload = <<JSON
+%s
+JSON
+}
+`, name, connectionType, desc, url, connectionSubtype, defaultPayload, resolutionPayload)
+}

sumologic/resource_sumologic_local_file_source.go

@@ -0,0 +1,116 @@
+package sumologic
+
+import (
+	"fmt"
+	"log"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+func resourceSumologicLocalFileSource() *schema.Resource {
+	localFileSource := resourceSumologicSource()
+	localFileSource.Create = resourceSumologicLocalFileSourceCreate
+	localFileSource.Read = resourceSumologicLocalFileSourceRead
+	localFileSource.Update = resourceSumologicLocalFileSourceUpdate
+	localFileSource.Importer = &schema.ResourceImporter{
+		State: resourceSumologicSourceImport,
+	}
+
+	localFileSource.Schema["path_expression"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+
+	localFileSource.Schema["encoding"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Optional: true,
+		Default:  "UTF-8",
+	}
+
+	localFileSource.Schema["deny_list"] = &schema.Schema{
+		Type:     schema.TypeSet,
+		Optional: true,
+		Elem:     &schema.Schema{Type: schema.TypeString},
+	}
+
+	return localFileSource
+}
+
+func resourceSumologicLocalFileSourceCreate(d *schema.ResourceData, meta interface{}) error {
+	c := meta.(*Client)
+
+	if d.Id() == "" {
+		source := resourceToLocalFileSource(d)
+
+		id, err := c.CreateLocalFileSource(source, d.Get("collector_id").(int))
+
+		if err != nil {
+			return err
+		}
+
+		d.SetId(strconv.Itoa(id))
+	}
+
+	return resourceSumologicLocalFileSourceRead(d, meta)
+}
+
+func resourceSumologicLocalFileSourceUpdate(d *schema.ResourceData, meta interface{}) error {
+	c := meta.(*Client)
+
+	source := resourceToLocalFileSource(d)
+
+	err := c.UpdateLocalFileSource(source, d.Get("collector_id").(int))
+
+	if err != nil {
+		return err
+	}
+
+	return resourceSumologicLocalFileSourceRead(d, meta)
+}
+
+func resourceToLocalFileSource(d *schema.ResourceData) LocalFileSource {
+	rawDenyList := d.Get("deny_list").(*schema.Set).List()
+	var denylist []string
+	for _, j := range rawDenyList {
+		denylist = append(denylist, j.(string))
+	}
+	source := resourceToSource(d)
+	source.Type = "LocalFile"
+
+	localFileSource := LocalFileSource{
+		Source:         source,
+		PathExpression: d.Get("path_expression").(string),
+		Encoding:       d.Get("encoding").(string),
+		DenyList:       denylist,
+	}
+
+	return localFileSource
+}
+
+func resourceSumologicLocalFileSourceRead(d *schema.ResourceData, meta interface{}) error {
+	c := meta.(*Client)
+
+	id, _ := strconv.Atoi(d.Id())
+	source, err := c.GetLocalFileSource(d.Get("collector_id").(int), id)
+
+	if err != nil {
+		return err
+	}
+
+	if source == nil {
+		log.Printf("[WARN] LocalFile source not found, removing from state: %v - %v", id, err)
+		d.SetId("")
+
+		return nil
+	}
+
+	if err := resourceSumologicSourceRead(d, source.Source); err != nil {
+		return fmt.Errorf("%s", err)
+	}
+	d.Set("path_expression", source.PathExpression)
+	d.Set("encoding", source.Encoding)
+	d.Set("deny_list", source.DenyList)
+
+	return nil
+}