INVS-1408 remove prints and comments

Author: kachristensen

sumologic/resource_sumologic_cse_match_list.go

@@ -155,20 +155,12 @@ func setItems(d *schema.ResourceData, items []CSEMatchListItemGet) {
 }
 
 func resourceSumologicCSEMatchListDelete(d *schema.ResourceData, meta interface{}) error {
-	println("delete: started resourceSumologicCSEMatchListDelete")
-
 	c := meta.(*Client)
 	err := c.DeleteCSEMatchList(d.Id())
-
-	println("delete: finished resourceSumologicCSEMatchListDelete")
-
 	return err
-
 }
 
 func resourceSumologicCSEMatchListCreate(d *schema.ResourceData, meta interface{}) error {
-	println("create: starting resourceSumologicCSEMatchListCreate")
-
 	c := meta.(*Client)
 
 	if d.Id() == "" {
@@ -185,8 +177,6 @@ func resourceSumologicCSEMatchListCreate(d *schema.ResourceData, meta interface{
 		}
 		d.SetId(id)
 
-		//Match list items
-		//itemsData := d.Get("items").([]interface{})
 		itemsData := d.Get("items").(*schema.Set).List()
 		var items []CSEMatchListItemPost
 		for _, data := range itemsData {
@@ -236,28 +226,16 @@ func resourceToCSEMatchListItem(data interface{}) CSEMatchListItemPost {
 	item := CSEMatchListItemPost{}
 	if len(itemsSlice) > 0 {
 		itemObj := itemsSlice[0].(map[string]interface{})
-		// for _, map := range itemObj {
-		// 	println("itemObj id: ", )
-		// }
-		// b, err := json.Marshal(itemObj)
-		// if err != nil {
-		// 	log.Fatal(err)
-		// }
-		// fmt.Println("b: ", string(b))
 		item.ID = itemObj["id"].(string)
 		item.Description = itemObj["description"].(string)
 		item.Active = true
 		item.Expiration = itemObj["expiration"].(string)
 		item.Value = itemObj["value"].(string)
-		// println("resourceToCSEMatchListItem itemid1: " + itemObj["id"].(string))
-		// println("resourceToCSEMatchListItem itemid2: " + item.ID)
 	}
-	//println("resourceToCSEMatchListItem returning id", item.ID)
-	return item //, item.ID
+	return item
 }
 
 func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{}) error {
-	println("update: starting resourceSumologicCSEMatchListUpdate")
 	CSEMatchListPost, err := resourceToCSEMatchList(d)
 	if err != nil {
 		return err
@@ -268,74 +246,51 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		return err
 	}
 
-	//Match list items
-	//itemsData := d.Get("items").([]interface{})
 	itemsData := d.Get("items").(*schema.Set).List()
-	var items []CSEMatchListItemPost
+	var newItems []CSEMatchListItemPost
 	for _, data := range itemsData {
-		//println("in itemsData, id is")
-		item := resourceToCSEMatchListItem([]interface{}{data}) //TODO remove id return
-		// item.ID = ""
-		items = append(items, item)
-		// println("appending id to itemsID: " + id)
-		// itemIds = append(itemIds, id)
+		item := resourceToCSEMatchListItem([]interface{}{data})
+		newItems = append(newItems, item)
 	}
 
-	// itemIdsString := ""
-	// for i := 0; i < len(itemIds); i++ {
-	// 	itemIdsString += itemIds[i] + " "
-	// }
-	// println("update: itemIds are " + itemIdsString)
-
 	CSEMatchListItems := getCSEMatchListItemsInMatchList(d.Id(), meta)
-	var itemIds []string
+	var oldItemIds []string
 	for _, item := range CSEMatchListItems.CSEMatchListItemsGetObjects {
-		//println("current id: ", item.ID)
-		itemIds = append(itemIds, item.ID)
+		oldItemIds = append(oldItemIds, item.ID)
 	}
 
-	currentItemCount := CSEMatchListItems.Total
-	newItemCount := len(itemsData) + currentItemCount
+	oldItemCount := CSEMatchListItems.Total
+	newItemCount := len(itemsData) + oldItemCount
 
-	println(fmt.Sprintf("current count %d, new count %d", currentItemCount, newItemCount))
-
-	if len(items) > 0 {
-		err = c.CreateCSEMatchListItems(items, d.Id())
+	//Add new items
+	if len(newItems) > 0 {
+		err = c.CreateCSEMatchListItems(newItems, d.Id())
 		if err != nil {
 			log.Printf("[WARN] An error occurred while adding match list items to match list id: %s, err: %v", d.Id(), err)
 		}
 
 	}
 
+	// Wait until all new items have finished being indexed in ES
 	CSEMatchListItems = getCSEMatchListItemsInMatchList(d.Id(), meta)
-
-	// Waits until all new items have finished being indexed in ES
-	println(fmt.Sprintf("total %d, len %d, goal %d", CSEMatchListItems.Total, len(CSEMatchListItems.CSEMatchListItemsGetObjects), newItemCount))
 	for CSEMatchListItems.Total < newItemCount {
-		println(fmt.Sprintf("update: only got %d/%d items, sleeping for 3 seconds", CSEMatchListItems.Total, newItemCount))
 		time.Sleep(3 * time.Second)
 		CSEMatchListItems = getCSEMatchListItemsInMatchList(d.Id(), meta)
 	}
 
-	println(fmt.Sprintf("update: checking %d items for deletion", len(CSEMatchListItems.CSEMatchListItemsGetObjects)))
-
-	// Delete all the old items
+	// Delete old items
 	for _, t := range CSEMatchListItems.CSEMatchListItemsGetObjects {
-		//println("update: checking id for deletion: " + t.ID)
-		if contains(itemIds, t.ID) {
-			//println("update: itemIds contains " + t.ID)
+		if contains(oldItemIds, t.ID) {
 			err = c.DeleteCSEMatchListItem(t.ID)
 			if err != nil {
 				log.Printf("[WARN] An error occurred deleting match list item with id: %s, err: %v", t.ID, err)
 			}
 		}
 	}
 
-	println("update: finished deleting, now getting items")
-
 	createStateConf := &resource.StateChangeConf{
 		Target: []string{
-			fmt.Sprint(len(items)),
+			fmt.Sprint(len(newItems)),
 		},
 		Refresh: func() (interface{}, string, error) {
 			resp, err := c.GetCSEMatchListItemsInMatchList(d.Id())
@@ -356,8 +311,6 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		return fmt.Errorf("error waiting for match list (%s) to be updated: %s", d.Id(), err)
 	}
 
-	println("update: finished resourceSumologicCSEMatchListUpdate")
-
 	return resourceSumologicCSEMatchListRead(d, meta)
 }
 

sumologic/sumologic_client.go

@@ -220,8 +220,6 @@ func (s *Client) Put(urlPath string, payload interface{}) ([]byte, error) {
 
 	body, _ := json.Marshal(payload)
 
-	println(string(body))
-
 	req, err := createNewRequest(http.MethodPut, sumoURL.String(), bytes.NewBuffer(body), s.AccessID, s.AccessKey, s.AuthJwt)
 	if err != nil {
 		return nil, err

sumologic/sumologic_cse_match_list_item.go

@@ -52,19 +52,13 @@ func (s *Client) GetCSEMatchListItemsInMatchList(MatchListId string) (*CSEMatchL
 		return nil, err
 	}
 
-	println(fmt.Sprintf("get: GetCSEMatchListItemsInMatchList response total: %d", response.Total))
-
 	// When the match list has over 1000 items, fetch items from the remaining pages
 	for offset = limit; offset < response.Total; offset += limit {
-		println(fmt.Sprintf("Checking next page from %d to %d", offset, offset+1000))
-
 		nextPageResponse, err := s.SendGetCSEMatchListItemsRequest(MatchListId, offset)
 		if err != nil {
 			return nil, err
 		}
 
-		println(fmt.Sprintf("Next page has %d items", len(nextPageResponse.CSEMatchListItemsGetObjects)))
-
 		for i := 0; i < len(nextPageResponse.CSEMatchListItemsGetObjects); i++ {
 			response.CSEMatchListItemsGetObjects = append(response.CSEMatchListItemsGetObjects, nextPageResponse.CSEMatchListItemsGetObjects[i])
 		}
@@ -96,7 +90,6 @@ func (s *Client) SendCreateCSEMatchListItemsRequest(CSEMatchListItemPost []CSEMa
 	err = json.Unmarshal(responseBody, &response)
 
 	if err != nil {
-		fmt.Println(err)
 		return err
 	}