Merge pull request #579 from SumoLogic/INVS-1700-Unable-to-add-new-items-to-match-list

INVS-1700: Unable to add new items to match list

Author: pmontiel-git

CHANGELOG.md

@@ -9,6 +9,9 @@ ENHANCEMENTS:
 DEPRECATIONS:
 * resource/sumologic_cse_inventory_entity_group_configuration: Deprecated `groups` in favor of `inventory_key`, `inventory_value`. (GH-495)
 
+BUG FIXES:
+* Fixes `resource_sumologic_cse_match_list` Unable to add new items to match list (GH-579)
+
 ## 2.26.0 (September 7, 2023)
 FEATURES:
 * **New Resource:** sumologic_muting_schedule (GH-569)

sumologic/resource_sumologic_cse_match_list.go

@@ -254,8 +254,15 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		oldItemIds = append(oldItemIds, item.ID)
 	}
 
-	oldItemCount := CSEMatchListItems.Total
-	newItemCount := len(itemsData) + oldItemCount
+	// Delete old items
+	for _, t := range CSEMatchListItems.CSEMatchListItemsGetObjects {
+		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)
+			}
+		}
+	}
 
 	//Add new items
 	if len(newItems) > 0 {
@@ -271,43 +278,8 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		log.Printf("[WARN] CSE Match List items not found when looking by match list id: %s, err: %v", d.Id(), err)
 	}
 
-	// Wait for addition to finish
+	// Wait for update to finish
 	createStateConf := &resource.StateChangeConf{
-		Target: []string{
-			fmt.Sprint(newItemCount),
-		},
-		Refresh: func() (interface{}, string, error) {
-			CSEMatchListItems, err = c.GetCSEMatchListItemsInMatchList(d.Id())
-			if err != nil {
-				log.Printf("[WARN] CSE Match List items not found when looking by match list id: %s, err: %v", d.Id(), err)
-				return 0, "", err
-			}
-
-			return CSEMatchListItems, fmt.Sprint(CSEMatchListItems.Total), nil
-		},
-		Timeout:                   d.Timeout(schema.TimeoutUpdate),
-		Delay:                     10 * time.Second,
-		MinTimeout:                5 * time.Second,
-		ContinuousTargetOccurence: 1,
-	}
-
-	_, err = createStateConf.WaitForState()
-	if err != nil {
-		return fmt.Errorf("error waiting for match list (%s) to be updated: %s", d.Id(), err)
-	}
-
-	// Delete old items
-	for _, t := range CSEMatchListItems.CSEMatchListItemsGetObjects {
-		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)
-			}
-		}
-	}
-
-	// Wait for deletion to finish
-	createStateConf = &resource.StateChangeConf{
 		Target: []string{
 			fmt.Sprint(len(newItems)),
 		},

sumologic/resource_sumologic_cse_match_list_test.go

@@ -24,7 +24,7 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 	liDescription := "Match List Item Description"
 	liExpiration := "2122-02-27T04:00:00"
 	liValue := "value"
-	liCount := 3
+	liCount := 1
 
 	// Update values
 	uDefaultTtl := 3600