INVS-11: PR comments

Author: Pedro Montiel

sumologic/resource_sumologic_cse_match_list.go

@@ -19,7 +19,7 @@ func resourceSumologicCSEMatchList() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 			"default_ttl": {
 				Type:     schema.TypeInt,
-				Required: true,
+				Optional: true,
 				ForceNew: false,
 			},
 			"description": {
@@ -130,41 +130,24 @@ func resourceSumologicCSEMatchListRead(d *schema.ResourceData, meta interface{})
 
 func setItems(d *schema.ResourceData, items []CSEMatchListItemGet) {
 
-	var i []map[string]interface{}
+	var its []map[string]interface{}
 
 	for _, t := range items {
-		mapping := map[string]interface{}{
+		item := map[string]interface{}{
 			"id":          t.ID,
 			"description": t.Meta.Description,
 			"expiration":  t.Expiration,
 			"value":       t.Value,
 		}
-		i = append(i, mapping)
+		its = append(its, item)
 	}
 
-	d.Set("items", i)
+	d.Set("items", its)
 
 }
 
 func resourceSumologicCSEMatchListDelete(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(*Client)
-
-	//Match list items
-	itemsData := d.Get("items").([]interface{})
-	var items []CSEMatchListItemPost
-	for _, data := range itemsData {
-		items = append(items, resourceToCSEMatchListItem([]interface{}{data}))
-	}
-
-	if len(items) > 0 {
-		for _, item := range items {
-			err2 := c.DeleteCSEMatchListItem(item.ID)
-			if err2 != nil {
-				log.Printf("[WARN] An error occurred while updating match list item wiht id: %s, err: %v", item.ID, err2)
-			}
-		}
-	}
-
 	err := c.DeleteCSEMatchList(d.Id())
 	return err
 
@@ -191,7 +174,9 @@ func resourceSumologicCSEMatchListCreate(d *schema.ResourceData, meta interface{
 		itemsData := d.Get("items").([]interface{})
 		var items []CSEMatchListItemPost
 		for _, data := range itemsData {
-			items = append(items, resourceToCSEMatchListItem([]interface{}{data}))
+			item, _ := resourceToCSEMatchListItem([]interface{}{data})
+			items = append(items, item)
+
 		}
 
 		if len(items) > 0 {
@@ -211,7 +196,7 @@ func resourceSumologicCSEMatchListCreate(d *schema.ResourceData, meta interface{
 	return resourceSumologicCSEMatchListRead(d, meta)
 }
 
-func resourceToCSEMatchListItem(data interface{}) CSEMatchListItemPost {
+func resourceToCSEMatchListItem(data interface{}) (CSEMatchListItemPost, string) {
 	itemsSlice := data.([]interface{})
 	item := CSEMatchListItemPost{}
 	if len(itemsSlice) > 0 {
@@ -222,7 +207,7 @@ func resourceToCSEMatchListItem(data interface{}) CSEMatchListItemPost {
 		item.Expiration = itemObj["expiration"].(string)
 		item.Value = itemObj["value"].(string)
 	}
-	return item
+	return item, item.ID
 }
 
 func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{}) error {
@@ -238,19 +223,30 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 
 	//Match list items
 	itemsData := d.Get("items").([]interface{})
+	var itemIds []string
 	var items []CSEMatchListItemPost
 	for _, data := range itemsData {
-		items = append(items, resourceToCSEMatchListItem([]interface{}{data}))
+		item, id := resourceToCSEMatchListItem([]interface{}{data})
+		items = append(items, item)
+		itemIds = append(itemIds, id)
+
 	}
 
 	if len(items) > 0 {
 		for _, item := range items {
 			CSEMatchListItem, er := c.GetCSEMatchListItem(item.ID)
-			log.Printf("[WARN] An error occurred while getting match list item wiht id: %s, err: %v", item.ID, er)
+			log.Printf("[WARN] An error occurred while getting match list item with id: %s, err: %v", item.ID, er)
 			if CSEMatchListItem != nil {
-				err3 := c.UpdateCSEMatchListItem(item)
-				if err3 != nil {
-					log.Printf("[WARN] An error occurred while updating match list item wiht id: %s, err: %v", item.ID, err3)
+				if contains(itemIds, CSEMatchListItem.ID) {
+					err3 := c.UpdateCSEMatchListItem(item)
+					if err3 != nil {
+						log.Printf("[WARN] An error occurred while updating match list item with id: %s, err: %v", item.ID, err3)
+					}
+				} else {
+					err3 := c.DeleteCSEMatchListItem(CSEMatchListItem.ID)
+					if err3 != nil {
+						log.Printf("[WARN] An error occurred deleting match list item with id: %s, err: %v", CSEMatchListItem.ID, err3)
+					}
 				}
 			} else {
 				err4 := c.CreateCSEMatchListItems(items, d.Id())
@@ -259,14 +255,41 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 				}
 			}
 		}
-		// Calling Sleep method, adding items might take a while before items retrieved in next section
-		// Need to find a better way since feels super hacky
-		time.Sleep(15 * time.Second)
+	} else {
+		var CSEMatchListItems *CSEMatchListItemsInMatchListGet
+
+		CSEMatchListItems, err2 := c.GetCSEMatchListItemsInMatchList(d.Id())
+		if err2 != nil {
+			log.Printf("[WARN] CSE Match List items not found when looking by match list id: %s, err: %v", d.Id(), err2)
+		}
+		if CSEMatchListItems != nil {
+
+			for _, t := range CSEMatchListItems.CSEMatchListItemsGetObjects {
+				err3 := c.DeleteCSEMatchListItem(t.ID)
+				if err3 != nil {
+					log.Printf("[WARN] An error occurred deleting match list item with id: %s, err: %v", t.ID, err3)
+				}
+			}
+		}
 	}
 
+	// Calling Sleep method, adding/deleting items might take a while before items retrieved in next section
+	// Need to find a better way since feels super hacky
+	time.Sleep(15 * time.Second)
+
 	return resourceSumologicCSEMatchListRead(d, meta)
 }
 
+func contains(slice []string, item string) bool {
+	set := make(map[string]struct{}, len(slice))
+	for _, s := range slice {
+		set[s] = struct{}{}
+	}
+
+	_, ok := set[item]
+	return ok
+}
+
 func resourceToCSEMatchList(d *schema.ResourceData) (CSEMatchListPost, error) {
 	id := d.Id()
 	if id == "" {

sumologic/resource_sumologic_cse_match_list_test.go

@@ -44,6 +44,12 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 					testCheckMatchListValues(&matchList, uDefaultTtl, uDescription, nName, nTargetColumn),
 				),
 			},
+			{
+				Config: testDeleteCSEMatchListItemConfig(uDefaultTtl, uDescription, nName, nTargetColumn),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckMatchListItemsEmpty(resourceName),
+				),
+			},
 		},
 	})
 }
@@ -87,6 +93,17 @@ resource "sumologic_cse_match_list" "match_list" {
 `, nDefaultTtl, nDescription, nName, nTargetColumn, liDescription, liExpiration, liValue)
 }
 
+func testDeleteCSEMatchListItemConfig(nDefaultTtl int, nDescription string, nName string, nTargetColumn string) string {
+	return fmt.Sprintf(`
+resource "sumologic_cse_match_list" "match_list" {
+	default_ttl = "%d"
+	description = "%s"
+	name = "%s"
+	target_column = "%s"
+}
+`, nDefaultTtl, nDescription, nName, nTargetColumn)
+}
+
 func testCheckCSEMatchListExists(n string, matchList *CSEMatchListGet) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -109,7 +126,7 @@ func testCheckCSEMatchListExists(n string, matchList *CSEMatchListGet) resource.
 	}
 }
 
-func testCheckCSEMatchListItemExists(n string, matchListItem *CSEMatchListItemGet) resource.TestCheckFunc {
+func testCheckMatchListItemsEmpty(n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
 		if !ok {
@@ -121,12 +138,14 @@ func testCheckCSEMatchListItemExists(n string, matchListItem *CSEMatchListItemGe
 		}
 
 		c := testAccProvider.Meta().(*Client)
-		matchListResp, err := c.GetCSEMatchListItem(rs.Primary.ID)
+		matchListResp, err := c.GetCSEMatchListItemsInMatchList(rs.Primary.ID)
 		if err != nil {
 			return err
 		}
 
-		*matchListItem = *matchListResp
+		if len(matchListResp.CSEMatchListItemsGetObjects) != 0 {
+			return fmt.Errorf("match list items not empty")
+		}
 
 		return nil
 	}

sumologic/sumologic_client.go

@@ -268,40 +268,6 @@ func (s *Client) Get(urlPath string) ([]byte, string, error) {
 	return d, resp.Header.Get("ETag"), nil
 }
 
-func (s *Client) GetWithPayload(urlPath string, payload interface{}) ([]byte, string, error) {
-	relativeURL, _ := url.Parse(urlPath)
-	sumoURL := s.BaseURL.ResolveReference(relativeURL)
-
-	body, _ := json.Marshal(payload)
-	req, err := createNewRequest(http.MethodGet, sumoURL.String(), bytes.NewBuffer(body), s.AccessID, s.AccessKey, s.AuthJwt)
-	if err != nil {
-		return nil, "", err
-	}
-
-	if s.IsInAdminMode {
-		req.Header.Add("isAdminMode", "true")
-	}
-
-	<-rateLimiter.C
-	resp, err := s.httpClient.Do(req)
-	if err != nil {
-		return nil, "", err
-	}
-	defer resp.Body.Close()
-
-	d, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, "", err
-	}
-	if resp.StatusCode == 404 {
-		return nil, "", nil
-	} else if resp.StatusCode >= 400 {
-		return nil, "", errors.New(string(d))
-	}
-
-	return d, resp.Header.Get("ETag"), nil
-}
-
 func (s *Client) Delete(urlPath string) ([]byte, error) {
 	relativeURL, _ := url.Parse(urlPath)
 	sumoURL := s.BaseURL.ResolveReference(relativeURL)

sumologic/sumologic_cse_match_list_item.go

@@ -24,13 +24,9 @@ func (s *Client) GetCSEMatchListItem(id string) (*CSEMatchListItemGet, error) {
 	return &response.CSEMatchListItemGet, nil
 }
 
-func (s *Client) GetCSEMatchListItemsInMatchList(MatcListId string) (*CSEMatchListItemsInMatchListGet, error) {
+func (s *Client) GetCSEMatchListItemsInMatchList(MatchListId string) (*CSEMatchListItemsInMatchListGet, error) {
 
-	request := CSEMatchListItemsRequest{
-		ListIds: []string{MatcListId},
-	}
-
-	data, _, err := s.GetWithPayload("sec/v1/match-list-items", request)
+	data, _, err := s.Get(fmt.Sprintf("sec/v1/match-list-items?listIds[%s]", MatchListId))
 	if err != nil {
 		return nil, err
 	}
@@ -104,10 +100,6 @@ type CSEMatchListItemResponse struct {
 	CSEMatchListItemGet CSEMatchListItemGet `json:"data"`
 }
 
-type CSEMatchListItemsRequest struct {
-	ListIds []string `json:"listIds"`
-}
-
 type CSEMatchListItemsInMatchListResponse struct {
 	CSEMatchListItemsGetData CSEMatchListItemsInMatchListGet `json:"data"`
 }

website/docs/r/cse_log_match_list.html.markdown

@@ -27,7 +27,7 @@ resource "sumologic_cse_match_list" "match_list" {
 
 The following arguments are supported:
 
-- `default_ttl` - (Required) The match list time to live. Specified in seconds.
+- `default_ttl` - (Optional) The default time to live for match list items added through the UI. Specified in seconds.
 - `description` - (Required) Match list description.
 - `name` - (Required) Match list name.
 - `target_column` - (Required) Target column. (possible values: Hostname, FileHash, Url, SrcIp, DstIp, Domain, Username, Ip, Asn, Isp, Org, SrcAsn, SrcIsp, SrcOrg, DstAsn, DstIsp, DstOrg or any custom column.)
@@ -44,7 +44,7 @@ The following attributes are exported:
 
 ## Import
 
-Mach List can be imported using the field id, e.g.:
+Match List can be imported using the field id, e.g.:
 ```hcl
 terraform import sumologic_cse_match_list.match_list id
 ```