Cleanup resource_sumologic_content.go

Author: sumovishal

sumologic/resource_sumologic_content.go

@@ -40,110 +40,73 @@ func resourceSumologicContent() *schema.Resource {
 }
 
 func resourceSumologicContentRead(d *schema.ResourceData, meta interface{}) error {
-	log.Println("====Begin Content Read====")
-
 	c := meta.(*Client)
-	//retrieve the content Id from the state
+	// Retrieve the content Id from the state
 	id := d.Id()
-	log.Printf("Search for Content Id: %s", id)
+	log.Printf("[DEBUG] Looking for content with id: %s", id)
 
-	log.Println("Looking up content...")
 	content, err := c.GetContent(id, d.Timeout(schema.TimeoutRead))
-
-	//Error retrieving content
 	if err != nil {
 		return err
 	}
-
 	if content == nil {
 		log.Printf("[WARN] Content not found, removing from state: %v - %v", id, err)
 		d.SetId("")
 		return nil
 	}
 
-	log.Println("Read Values:")
-	log.Printf("ParentId: %s", content.ParentId)
-	log.Printf("Config: %s", content.Config)
-	log.Printf("Name: %s", content.Name)
+	log.Printf("[DEBUG] content: %s", content.Name)
+	log.Printf("[DEBUG] parent of content: %s", content.ParentId)
+	log.Printf("[DEBUG] content config: %s", content.Config)
 
 	// Write the newly read content object into the schema
 	d.Set("config", content.Config)
-
-	log.Println("====End Content Read====")
 	return nil
 }
 
 func resourceSumologicContentDelete(d *schema.ResourceData, meta interface{}) error {
-	log.Println("====Begin Content Delete====")
-	log.Printf("Deleting Content Id: %s", d.Id())
 	c := meta.(*Client)
-	log.Println("====End Content Delete====")
+	log.Printf("Deleting content with id: %s", d.Id())
 	return c.DeleteContent(d.Id(), d.Timeout(schema.TimeoutDelete))
 }
 
 func resourceSumologicContentCreate(d *schema.ResourceData, meta interface{}) error {
-	log.Println("====Begin Content Create====")
 	c := meta.(*Client)
 
-	//If there is no id in the state, then we need to create the object
+	// If there is no id in the state, then we need to create the object
 	if d.Id() == "" {
-
-		//Load all the data we have from the schema into a Content Struct
+		// Load all the data we have from the schema into a Content Struct
 		content := resourceToContent(d)
-		log.Println("Newly populated content values:")
-		log.Printf("ParentId: %s", content.ParentId)
-		log.Printf("Config: %s", content.Config)
 
-		//Call create content with our newly populated struct
 		id, err := c.CreateOrUpdateContent(*content, d.Timeout(schema.TimeoutCreate), false)
-
-		//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.Printf("Created content with id=%s, type=%s", id, content.Type)
 	}
 
-	log.Println("====End Content Create====")
-
-	//After creating an object, we read it again to make sure the state is properly saved
 	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.Printf("Updated content with id=%s, type=%s", id, 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
 
 	_ = json.Unmarshal([]byte(d.Get("config").(string)), &content)

sumologic/sumologic_content.go

@@ -102,7 +102,6 @@ func (s *Client) CreateOrUpdateContent(content Content, timeout time.Duration, o
 
 	// extract id of newly created content
 	contentId := strings.Split(status.StatusMessage, ":")[1]
-	log.Printf("New content id: %s", contentId)
 	return contentId, nil
 }