changelog and nits

Author: kachristensen

CHANGELOG.md

@@ -5,7 +5,8 @@ ENHANCEMENTS:
 
 BUG FIXES:
 * Fix error while importing monitor having timeZone as `null` in the Email notification object. (GH-637)
-* Fix perpetual diff in Extraction Rules by normalizing the parse expression.  
+* Fix perpetual diff in Extraction Rules by normalizing the parse expression.
+* Fix `resource_sumologic_cse_match_list` timing out when updating match list items
 
 ## 2.28.3 (March 5, 2024)
 

sumologic/resource_sumologic_cse_match_list.go

@@ -3,7 +3,6 @@ package sumologic
 import (
 	"fmt"
 	"log"
-	"os"
 	"regexp"
 	"time"
 
@@ -190,8 +189,6 @@ func resourceSumologicCSEMatchListCreate(d *schema.ResourceData, meta interface{
 			}
 		}
 
-		fmt.Fprintln(os.Stdout, "resourceSumologicCSEMatchListCreate items: ", items)
-
 		createStateConf := &resource.StateChangeConf{
 			Target: []string{
 				fmt.Sprint(len(items)),
@@ -284,8 +281,6 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		}
 	}
 
-	fmt.Fprintln(os.Stdout, "resourceSumologicCSEMatchListUpdate deleteItemIds: ", deleteItemIds, "updateItems: ", updateItems, "addItems: s", addItems)
-
 	// Delete old items
 	for _, oldItem := range CSEMatchListItems.CSEMatchListItemsGetObjects {
 		if contains(deleteItemIds, oldItem.ID) {
@@ -312,13 +307,8 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		}
 	}
 
-	CSEMatchListItems, err = c.GetCSEMatchListItemsInMatchList(d.Id())
-	if err != nil {
-		return fmt.Errorf("[ERROR] CSE Match List items not found when looking by match list id %s, err: %v", d.Id(), err)
-	}
-
 	// Wait for update to finish
-	createStateConf := &resource.StateChangeConf{
+	updateStateConf := &resource.StateChangeConf{
 		Target: []string{
 			fmt.Sprint(len(newItems)),
 		},
@@ -336,7 +326,7 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		ContinuousTargetOccurence: 1,
 	}
 
-	_, err = createStateConf.WaitForState()
+	_, err = updateStateConf.WaitForState()
 	if err != nil {
 		return fmt.Errorf("[ERROR] Error waiting for match list with id %s to be updated: %s", d.Id(), err)
 	}

sumologic/resource_sumologic_cse_match_list_test.go

@@ -2,7 +2,6 @@ package sumologic
 
 import (
 	"fmt"
-	"os"
 	"strings"
 	"testing"
 
@@ -25,7 +24,7 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 	liDescription := "Match List Item Description"
 	liExpiration := "2122-02-27T04:00:00"
 	liValue := "value"
-	liCount := 1
+	liCount := 2
 
 	// Update values
 	uDefaultTtl := 3600
@@ -40,7 +39,7 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCSEMatchListDestroy,
 		Steps: []resource.TestStep{
-			// Creates a match list with 1 match list item
+			// Creates a match list with 2 match list items
 			{
 				Config: testCreateCSEMatchListConfig(nDefaultTtl, nDescription, nName, nTargetColumn, liDescription, liExpiration, liValue, liCount),
 				Check: resource.ComposeTestCheckFunc(
@@ -50,7 +49,7 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
 			},
-			// Updates the match list and its 1 match list item
+			// Updates the match list and its 2 match list items
 			{
 				Config: testCreateCSEMatchListConfig(uDefaultTtl, uDescription, nName, nTargetColumn, liDescription, liExpiration, liValue, liCount),
 				Check: resource.ComposeTestCheckFunc(
@@ -60,7 +59,7 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
 			},
-			// Deletes the 1 match list item and adds 3 new ones
+			// Deletes the 2 old match list items and adds 3 new ones
 			{
 				Config: testCreateCSEMatchListConfig(uDefaultTtl, uDescription, nName, nTargetColumn, uliDescription, uliExpiration, uliValue, uliCount),
 				Check: resource.ComposeTestCheckFunc(
@@ -123,8 +122,6 @@ resource "sumologic_cse_match_list" "match_list" {
     target_column = "%s" %s
 }`, nDefaultTtl, nDescription, nName, nTargetColumn, itemsStr)
 
-	fmt.Fprintln(os.Stdout, "testCreateCSEMatchListConfig: ", str)
-
 	return str
 }