INVS-1420 test 51

Author: kachristensen

sumologic/resource_sumologic_cse_match_list.go

@@ -121,9 +121,9 @@ func resourceSumologicCSEMatchList() *schema.Resource {
 				Computed: true,
 			},
 			"items": {
-				Type:             schema.TypeList,
-				Optional:         true,
-				DiffSuppressFunc: MatchListItemsDiffSuppressFunc,
+				Type:     schema.TypeSet,
+				Optional: true,
+				//DiffSuppressFunc: MatchListItemsDiffSuppressFunc,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"id": {
@@ -239,12 +239,12 @@ func resourceSumologicCSEMatchListCreate(d *schema.ResourceData, meta interface{
 		d.SetId(id)
 
 		//Match list items
-		itemsData := d.Get("items").([]interface{})
+		//itemsData := d.Get("items").([]interface{})
+		itemsData := d.Get("items").(*schema.Set).List()
 		var items []CSEMatchListItemPost
 		for _, data := range itemsData {
 			item, _ := resourceToCSEMatchListItem([]interface{}{data})
 			items = append(items, item)
-
 		}
 
 		if len(items) > 0 {
@@ -299,6 +299,7 @@ func resourceToCSEMatchListItem(data interface{}) (CSEMatchListItemPost, string)
 }
 
 func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{}) error {
+	println("in update")
 	CSEMatchListPost, err := resourceToCSEMatchList(d)
 	if err != nil {
 		return err
@@ -310,17 +311,19 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 	}
 
 	//Match list items
-	itemsData := d.Get("items").([]interface{})
+	//itemsData := d.Get("items").([]interface{})
+	itemsData := d.Get("items").(*schema.Set).List()
 	var itemIds []string
 	var items []CSEMatchListItemPost
 	for _, data := range itemsData {
 		item, id := resourceToCSEMatchListItem([]interface{}{data})
 		item.ID = ""
 		items = append(items, item)
 		itemIds = append(itemIds, id)
-
 	}
 
+	println(itemIds)
+
 	if len(items) > 0 {
 		err2 := c.CreateCSEMatchListItems(items, d.Id())
 		if err2 != nil {
@@ -337,6 +340,8 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 	}
 	if CSEMatchListItems != nil {
 
+		println("343")
+
 		for _, t := range CSEMatchListItems.CSEMatchListItemsGetObjects {
 			if !contains(itemIds, t.ID) {
 				err3 := c.DeleteCSEMatchListItem(t.ID)
@@ -347,6 +352,8 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		}
 	}
 
+	println("355")
+
 	createStateConf := &resource.StateChangeConf{
 		Target: []string{
 			fmt.Sprint(len(items)),
@@ -365,6 +372,9 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 	}
 
 	_, err = createStateConf.WaitForState()
+
+	println("376")
+
 	if err != nil {
 		return fmt.Errorf("error waiting for match list (%s) to be updated: %s", d.Id(), err)
 	}

sumologic/resource_sumologic_cse_match_list_test.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/google/uuid"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
@@ -14,14 +16,14 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 	var matchList CSEMatchListGet
 	nDefaultTtl := 10800
 	nDescription := "New Match List Description"
-	nName := "Match List Name"
+	nName := fmt.Sprintf("Match List Name %s", uuid.New())
 	nTargetColumn := "SrcIp"
 	liDescription := "Match List Item Description"
 	liValue := "value"
 	liExpiration := "2122-02-27T04:00:00"
-	// uDefaultTtl := 3600
-	// uDescription := "Updated Match List Description"
-	// uliDescription := "Updated Match List item Description"
+	uDefaultTtl := 3600
+	uDescription := "Updated Match List Description"
+	uliDescription := "Updated Match List item Description"
 	resourceName := "sumologic_cse_match_list.match_list"
 
 	resource.Test(t, resource.TestCase{
@@ -30,26 +32,26 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 		CheckDestroy: testAccCSEMatchListDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testCreateCSEMatchListConfig(nDefaultTtl, nDescription, nName, nTargetColumn, liDescription, liExpiration, liValue, 11),
+				Config: testCreateCSEMatchListConfig(nDefaultTtl, nDescription, nName, nTargetColumn, liDescription, liExpiration, liValue, 51),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckCSEMatchListExists(resourceName, &matchList),
 					testCheckMatchListValues(&matchList, nDefaultTtl, nDescription, nName, nTargetColumn),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 				),
 			},
-			// {
-			// 	Config: testCreateCSEMatchListConfig(uDefaultTtl, uDescription, nName, nTargetColumn, uliDescription, liExpiration, liValue, 11),
-			// 	Check: resource.ComposeTestCheckFunc(
-			// 		testCheckCSEMatchListExists(resourceName, &matchList),
-			// 		testCheckMatchListValues(&matchList, uDefaultTtl, uDescription, nName, nTargetColumn),
-			// 	),
-			// },
-			// {
-			// 	Config: testDeleteCSEMatchListItemConfig(uDefaultTtl, uDescription, nName, nTargetColumn),
-			// 	Check: resource.ComposeTestCheckFunc(
-			// 		testCheckMatchListItemsEmpty(resourceName),
-			// 	),
-			// },
+			{
+				Config: testCreateCSEMatchListConfig(uDefaultTtl, uDescription, nName, nTargetColumn, uliDescription, liExpiration, liValue, 51),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckCSEMatchListExists(resourceName, &matchList),
+					testCheckMatchListValues(&matchList, uDefaultTtl, uDescription, nName, nTargetColumn),
+				),
+			},
+			{
+				Config: testDeleteCSEMatchListItemConfig(uDefaultTtl, uDescription, nName, nTargetColumn),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckMatchListItemsEmpty(resourceName),
+				),
+			},
 		},
 	})
 }
@@ -81,12 +83,14 @@ func testCreateCSEMatchListConfig(nDefaultTtl int, nDescription string, nName st
 	var itemsStr = ""
 
 	for i := 0; i < numItems; i++ {
+		id := uuid.New()
+
 		itemsStr += fmt.Sprintf(`
     items {
 	description = "%s %d"
 	expiration = "%s"
-	value = "%s %d"
-    }`, liDescription, i, liExpiration, liValue, i)
+	value = "%s %d %s"
+    }`, liDescription, i, liExpiration, liValue, i, id)
 	}
 
 	var str = fmt.Sprintf(`

sumologic/sumologic_client.go

@@ -219,6 +219,9 @@ func (s *Client) Put(urlPath string, payload interface{}) ([]byte, error) {
 	_, etag, _ := s.Get(sumoURL.String())
 
 	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