Merge pull request #58 from SumoLogic/content-resource-update

update content resource to allow updates using overwrite flag

Author: seansain

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 2.2.0 (Unreleased)
+## 2.1.3 (Unreleased)
+ENHANCEMENTS:
+* Allow updates to content resources so that dashboard links do not exprie. This creates a known bug - do not update the name of a resource.
+
+## 2.1.2 (July 24, 2020)
+ENHANCEMENTS:
+* Now parrt of the Terraform Registry - compatible with Terraform 0.13
+
 ## 2.1.1 (July 17, 2020)
 
 DOCS:

sumologic/resource_sumologic_content.go

@@ -14,6 +14,7 @@ func resourceSumologicContent() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceSumologicContentCreate,
 		Read:   resourceSumologicContentRead,
+		Update: resourceSumologicContentUpdate,
 		Delete: resourceSumologicContentDelete,
 
 		Schema: map[string]*schema.Schema{
@@ -26,13 +27,13 @@ func resourceSumologicContent() *schema.Resource {
 				Type:             schema.TypeString,
 				ValidateFunc:     validation.StringIsJSON,
 				Required:         true,
-				ForceNew:         true,
 				DiffSuppressFunc: structure.SuppressJsonDiff,
 			},
 		},
 		Timeouts: &schema.ResourceTimeout{
 			Read:   schema.DefaultTimeout(1 * time.Minute),
 			Create: schema.DefaultTimeout(10 * time.Minute),
+			Update: schema.DefaultTimeout(10 * time.Minute),
 			Delete: schema.DefaultTimeout(1 * time.Minute),
 		},
 	}
@@ -94,9 +95,9 @@ func resourceSumologicContentCreate(d *schema.ResourceData, meta interface{}) er
 		log.Printf("Config: %s", content.Config)
 
 		//Call create content with our newly populated struct
-		id, err := c.CreateContent(*content, d.Timeout(schema.TimeoutCreate))
+		id, err := c.CreateOrUpdateContent(*content, d.Timeout(schema.TimeoutCreate), false)
 
-		//Error during CreateContent
+		//Error during CreateOrUpdateContent
 		if err != nil {
 			return err
 		}
@@ -114,6 +115,33 @@ func resourceSumologicContentCreate(d *schema.ResourceData, meta interface{}) er
 	return resourceSumologicContentRead(d, meta)
 }
 
+func resourceSumologicContentUpdate(d *schema.ResourceData, meta interface{}) error {
+	log.Println("====Begin Content Update====")
+	c := meta.(*Client)
+
+	//Load all data from the schema into a Content Struct
+	content := resourceToContent(d)
+
+	//Call create content with overwrite set to true
+	id, err := c.CreateOrUpdateContent(*content, d.Timeout(schema.TimeoutUpdate), true)
+
+	//Error during CreateOrUpdateContent
+	if err != nil {
+		return err
+	}
+
+	log.Println("Saving Id to state...")
+	d.SetId(id)
+	log.Printf("ContentId: %s", id)
+	log.Printf("ContentType: %s", content.Type)
+
+	log.Println("====End Content Update====")
+
+	//After updating an object, we read it to make sure the state is properly saved
+	return resourceSumologicContentRead(d, meta)
+
+}
+
 func resourceToContent(d *schema.ResourceData) *Content {
 	log.Println("Loading data from schema to Content struct...")
 	var content Content

sumologic/resource_sumologic_content_test.go

@@ -98,15 +98,15 @@ func testAccCheckContentDestroy(content Content) resource.TestCheckFunc {
 
 var updateConfigJson = `{
 	"type": "SavedSearchWithScheduleSyncDefinition",
-	"name": "test-333",
+	"name": "test-121",
 	"search": {
 		"queryText": "\"warn\"",
 		"defaultTimeRange": "-15m",
 		"byReceiptTime": false,
 		"viewName": "",
 		"viewStartTime": "1970-01-01T00:00:00Z",
 		"queryParameters": [],
-		"parsingMode": "Manual"
+		"parsingMode": "AutoParse"
 	},
 	"searchSchedule": {
 		"cronExpression": "0 0 * * * ? *",
@@ -134,7 +134,7 @@ var updateConfigJson = `{
 		"muteErrorEmails": false,
 		"parameters": []
 	},
-	"description": "Runs every hour with timerange of 15m and sends email notifications"
+	"description": "Runs every hour with timerange of 15m and sends email notifications updated"
 }`
 
 var configJson = `{
@@ -147,7 +147,7 @@ var configJson = `{
 		"viewName": "",
 		"viewStartTime": "1970-01-01T00:00:00Z",
 		"queryParameters": [],
-		"parsingMode": "Manual"
+		"parsingMode": "AutoParse"
 	},
 	"searchSchedule": {
 		"cronExpression": "0 0 * * * ? *",

sumologic/sumologic_client.go

@@ -42,7 +42,7 @@ func createNewRequest(method, url string, body io.Reader, accessID string, acces
 		return nil, err
 	}
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("User-Agent", "SumoLogicTerraformProvider/2.0.2")
+	req.Header.Add("User-Agent", "SumoLogicTerraformProvider/2.1.3")
 	req.SetBasicAuth(accessID, accessKey)
 	return req, nil
 }

sumologic/sumologic_content.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"strconv"
 	"strings"
 	"time"
 
@@ -115,11 +116,11 @@ func (s *Client) DeleteContent(id string, timeout time.Duration) error {
 	return err
 }
 
-//CREATE
-func (s *Client) CreateContent(content Content, timeout time.Duration) (string, error) {
-	log.Println("####Begin CreateContent####")
+//CREATE or UPDATE
+func (s *Client) CreateOrUpdateContent(content Content, timeout time.Duration, overwrite bool) (string, error) {
+	log.Println("####Begin CreateOrUpdateContent####")
 
-	url := fmt.Sprintf("v2/content/folders/%s/import", content.ParentId)
+	url := fmt.Sprintf("v2/content/folders/%s/import?overwrite=%s", content.ParentId, strconv.FormatBool(overwrite))
 	log.Printf("Create content url: %s", url)
 
 	//Initiate content creation job

website/docs/r/content.html.markdown

@@ -62,14 +62,15 @@ resource "sumologic_content" "test" {
 The following arguments are supported:
 
 - `parent_id` - (Required) The identifier of the folder to import into. Identifiers from the Library in the Sumo user interface are provided in decimal format which is incompatible with Terraform. The identifier needs to be in hexadecimal format.
-- `config` - (Required) JSON block for the content to import.
+- `config` - (Required) JSON block for the content to import. NOTE: Updating the name will create a new object and leave a untracked content item (delete the existing content item and create a new content item if you want to update the name).
 
 ### Timeouts
 
 `sumologic_content` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
 
 - `read` - (Default `1 minute`) Used for waiting for the import job to be successful
 - `create` - (Default `10 minutes`) Used for waiting for the import job to be successful
+- `update` - (Default `10 minutes`) Used for waiting for the import job to be successful
 - `delete` - (Default `1 minute`) Used for waiting for the deletion job to be successful
 
 ## Attributes reference