Better error handling & escape URLs

Author: sumovishal

sumologic/resource_sumologic_permissions.go

@@ -98,9 +98,10 @@ func resourceSumologicPermissionsRead(d *schema.ResourceData, meta interface{})
 		return nil
 	}
 
-	creatorId, _ := getCreatorId(id, meta)
-	if creatorId == "" {
-		log.Printf("[WARN] Creator id is empty for this content %v", id)
+	creatorId, err := getCreatorId(id, meta)
+	if err != nil {
+		log.Printf("[ERROR] Cannot find owner of content %s", id)
+		return err
 	}
 
 	d.Set("permission",
@@ -137,21 +138,16 @@ func getCreatorId(contentId string, meta interface{}) (string, error) {
 	c := meta.(*Client)
 	path, err := c.GetContentPath(contentId)
 	if err != nil {
-		log.Printf("[WARN] Cannot get path for content %v - %v", contentId, err)
+		log.Printf("[ERROR] Cannot get path for content %s - %v", contentId, err)
 		return "", err
 	}
-	if path == "" {
-		log.Printf("[WARN] Path is empty %v", contentId)
-		return "", nil
-	}
+
 	creatorId, err := c.GetCreatorId(path)
 	if err != nil {
-		log.Printf("[WARN] Cannot get content by path %v - %v", contentId, err)
+		log.Printf("[ERROR] Cannot find owner of content %s - %v", contentId, err)
 		return "", err
 	}
-	if creatorId == "" {
-		log.Printf("[WARN] Creator ID is empty %v", contentId)
-	}
+	log.Printf("[DEBUG] content=%s, path='%s', owner=%s", contentId, path, creatorId)
 	return creatorId, nil
 }
 

sumologic/resource_sumologic_permissions_test.go

@@ -98,7 +98,6 @@ func TestAccPermission_delete(t *testing.T) {
 }
 
 func testAccCheckPermissionDestroy(s *terraform.State) error {
-	// keep it here at this moment
 	client := testAccProvider.Meta().(*Client)
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "sumologic_content_permission" {
@@ -140,9 +139,9 @@ func testAccCheckPermissionDelete(name string) resource.TestCheckFunc {
 		if s == nil {
 			return fmt.Errorf("All permissions have been deleted")
 		}
-		creatorId, _ := getCreatorId(contentId, meta)
-		if creatorId == "" {
-			return fmt.Errorf("Empty creator's id")
+		creatorId, err := getCreatorId(contentId, meta)
+		if err != nil {
+			return err
 		}
 		for _, permission := range permissions.ExplicitPermissions {
 			if creatorId != permission.SourceId || permission.SourceType != "user" {

sumologic/sumologic_permissions.go

@@ -3,6 +3,7 @@ package sumologic
 import (
 	"encoding/json"
 	"fmt"
+	"net/url"
 )
 
 func (s *Client) GetPermissions(id string) (*PermissionsResponse, error) {
@@ -44,31 +45,32 @@ func (s *Client) GetContentPath(id string) (string, error) {
 		return "", err
 	}
 	if data == nil {
-		return "", nil
+		return "", fmt.Errorf("Cannot find path of content='%s'", id)
 	}
-	m := make(map[string]interface{})
-	err = json.Unmarshal(data, &m)
+	rsp := make(map[string]interface{})
+	err = json.Unmarshal(data, &rsp)
 	if err != nil {
 		return "", err
 	}
-	return m["path"].(string), nil
+	return rsp["path"].(string), nil
 }
 
 func (s *Client) GetCreatorId(path string) (string, error) {
-	url := fmt.Sprintf("v2/content/path?path=%s", path)
+	url := fmt.Sprintf("v2/content/path?path=%s", url.QueryEscape(path))
 	data, _, err := s.Get(url)
 	if err != nil {
 		return "", err
 	}
 	if data == nil {
-		return "", nil
+		return "", fmt.Errorf("Cannot find content by path='%s'", path)
 	}
-	m := make(map[string]interface{})
-	err = json.Unmarshal(data, &m)
+
+	rsp := make(map[string]interface{})
+	err = json.Unmarshal(data, &rsp)
 	if err != nil {
 		return "", err
 	}
-	return m["createdBy"].(string), nil
+	return rsp["createdBy"].(string), nil
 }
 
 type PermissionsResponse struct {

website/docs/r/content_permission_source.html.markdown

@@ -12,7 +12,7 @@ org. You can read more [here](https://help.sumologic.com/Manage/Content_Sharing/
 There are three permission levels `View`, `Edit` and `Manage`. You can read more about different
 levels [here](https://help.sumologic.com/Manage/Content_Sharing/Share-Content#available-permission-levels).
 
--> When you add a new permission to a content, all the lower level permissions are added by default.
+~> When you add a new permission to a content, all the lower level permissions are added by default.
 For example, giving a user "Manage" permission on a content, implicitly gives them "Edit" and "View"
 permissions on the content. Due to this behavior, when you add a higher level permission, you must
 also add all the lower level permissions. For example, when you give a user "Edit" permission via