[Monitors] fix folder update logic and docs

Took 3 hours 47 minutes

Author: Ashish Gaurav

sumologic/resource_sumologic_slo.go

@@ -44,7 +44,7 @@ func resourceSumologicSLO() *schema.Resource {
 		Type:     schema.TypeList,
 		Required: true,
 		MinItems: 1,
-		MaxItems: 1,
+		MaxItems: 6,
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"query_group_type": {
@@ -113,7 +113,6 @@ func resourceSumologicSLO() *schema.Resource {
 			"aggregation": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Default:      "Avg",
 				ValidateFunc: validation.StringMatch(aggrRegex, `value must match : `+sloAggregationRegexString),
 			},
 			"size": {
@@ -309,7 +308,7 @@ func resourceSumologicSLOCreate(d *schema.ResourceData, meta interface{}) error
 func resourceSLORead(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(*Client)
 
-	slo, err := c.SLORead(d.Id(), nil)
+	slo, err := c.SLORead(d.Id())
 	if err != nil {
 		return err
 	}
@@ -623,11 +622,18 @@ func resourceSumologicSLOUpdate(d *schema.ResourceData, meta interface{}) error
 
 	slo.Type = "SlosLibrarySloUpdate"
 	if d.HasChange("parent_id") {
-		err := c.MoveSLOLibraryToFolder(*slo)
+		err := c.MoveSLOLibraryToFolder(slo.ID, slo.ParentID)
 		if err != nil {
 			return err
 		}
 	}
+	sloUpdated, err := c.SLORead(d.Id())
+
+	if err != nil {
+		return err
+	}
+	slo.Version = sloUpdated.Version
+	slo.ModifiedAt = sloUpdated.ModifiedAt
 
 	err = c.UpdateSLO(*slo)
 	if err != nil {

sumologic/resource_sumologic_slo_folder.go

@@ -162,7 +162,22 @@ func resourceSumologicSLOLibraryFolderUpdate(d *schema.ResourceData, meta interf
 	c := meta.(*Client)
 	sloFolder := resourceToSLOLibraryFolder(d)
 	sloFolder.Type = "SlosLibraryFolderUpdate"
-	err := c.UpdateSLOLibraryFolder(sloFolder)
+	if d.HasChange("parent_id") {
+		err := c.MoveSLOLibraryToFolder(sloFolder.ID, sloFolder.ParentID)
+		if err != nil {
+			return err
+		}
+	}
+
+	updatedFolder, err := c.GetSLOLibraryFolder(d.Id())
+	if err != nil {
+		return err
+	}
+
+	sloFolder.ModifiedAt = updatedFolder.ModifiedAt
+	sloFolder.Version = updatedFolder.Version
+
+	err = c.UpdateSLOLibraryFolder(sloFolder)
 	if err != nil {
 		return err
 	}

sumologic/sumologic_slo_library_slo.go

@@ -38,7 +38,7 @@ func (s *Client) CreateSLO(slo SLOLibrarySLO, paramMap map[string]string) (strin
 	return createdSLO.ID, nil
 }
 
-func (s *Client) SLORead(id string, paramMap map[string]string) (*SLOLibrarySLO, error) {
+func (s *Client) SLORead(id string) (*SLOLibrarySLO, error) {
 	urlWithoutParams := SLOBaseApiUrl + "/%s"
 	paramString := ""
 	sprintfArgs := []interface{}{}
@@ -93,21 +93,19 @@ func (s *Client) UpdateSLO(slo SLOLibrarySLO) error {
 	return err
 }
 
-func (s *Client) MoveSLOLibraryToFolder(slo SLOLibrarySLO) error {
-	urlWithoutParams := SLOBaseApiUrl + "/%s"
+func (s *Client) MoveSLOLibraryToFolder(id, parentId string) error {
+	urlWithoutParams := SLOBaseApiUrl + "/%s/move"
 	paramString := ""
 	sprintfArgs := []interface{}{}
-	sprintfArgs = append(sprintfArgs, slo.ID)
+	sprintfArgs = append(sprintfArgs, id)
 
 	paramString += "?"
-	queryParam := fmt.Sprintf("parentId=%s&", slo.ParentID)
+	queryParam := fmt.Sprintf("parentId=%s&", parentId)
 	paramString += queryParam
 
 	urlWithParams := fmt.Sprintf(urlWithoutParams+paramString, sprintfArgs...)
 
-	slo.ID = ""
-
-	_, err := s.Put(urlWithParams, slo)
+	_, err := s.Post(urlWithParams, nil)
 
 	return err
 }

website/docs/r/slo.html.markdown

@@ -89,8 +89,8 @@ The following arguments are supported:
 - `parent_id` - (Optional) The ID of the SLO Folder that contains this SLO. Defaults to the root folder.
 - `signal_type` - (Required) The type of SLO. Valid values are `Latency`, `Error`, `Throughput`, `Availability`
   , `Other`. Defaults to `Latency`.
-- `service` - (Optional) The notifications the SLO will send when the respective trigger condition is met.
-- `application` - (Optional) Whether to group notifications for individual items that meet the trigger condition.
+- `service` - (Optional) Name of the service.
+- `application` - (Optional) Name of the application.
   Defaults to true.
 - `compliance` - (Required) The compliance settings for the SLO.
     - `compliance_type` - (Required) The type of compliance to use. Valid values are `Rolling` or `Calendar`.

website/docs/r/slo_folder.html.markdown

@@ -26,7 +26,7 @@ resource "sumologic_slo_folder" "tf_slo_folder" {
 
 resource "sumologic_slo_folder" "tf_slo_folder" {
   name        = "slo-tf-folder"
-  description = "Root folder for SLO created for testing"
+  description = "folder for SLO created for testing"
   parent_id   = "0000000000000001"
 }