lint check fix and update count to 3

Author: kachristensen

README.md

@@ -53,19 +53,20 @@ Then run `terraform init` to initialize it.
 
 In order to run the full suite of Acceptance tests, run `make testacc`.
 
-To run a specific acceptance test, run `go test -v ./sumologic  -run TheSpecificTestName`
+To run a specific acceptance test, run `go test -v ./sumologic  -run YourSpecificTestName`
 
 *Note:* 
 - Acceptance tests *create real resources*, and often cost money to run. The environment variables `SUMOLOGIC_ACCESSID`, `SUMOLOGIC_ACCESSKEY`, `SUMOLOGIC_ENVIRONMENT` / `SUMOLOGIC_BASE_URL`,  and `TF_ACC` must also be set for acceptance tests to work properly.
-  - More information on configuration can be found at the [Terraform Provider codelabs documentation](https://github.com/Sanyaku/codelabs/blob/master/backend/pages/SumoLogicTerraformProvider.md).
-  - Stag example:
+  - For example, you can generate a personal access key in stag-alpha [here](https://cse-stag-alpha.stag.sumologic.net/ui/#/preferences). Once your test runs, you are then capable of viewing the real resources created by Terraform in the [stag-alpha UI](https://cse-stag-alpha.stag.sumologic.net/sec/hud?hours=24).
      ```sh
      $ export SUMOLOGIC_ACCESSID="yourAccessID"
      $ export SUMOLOGIC_ACCESSKEY="yourAccessKey"
      $ export SUMOLOGIC_ENVIRONMENT="stag"
      $ export SUMOLOGIC_BASE_URL="https://stag-api.sumologic.net/api/"
      $ export TF_ACC=1
      ```
+  - More information on configuration can be found at the [Terraform Provider codelabs documentation](https://github.com/Sanyaku/codelabs/blob/master/backend/pages/SumoLogicTerraformProvider.md).
+
 - Environment variable `SUMOLOGIC_TEST_GOOGLE_APPLICATION_CREDENTIALS` must be set for gcp metrics acceptance tests to work properly (ex. below).
     - export SUMOLOGIC_TEST_GOOGLE_APPLICATION_CREDENTIALS=`cat /path/to/service_acccount.json`
     - Set Environment variable `SUMOLOGIC_ENABLE_GCP_METRICS_ACC_TESTS` to false, to disable acceptance test for Gcp Metrics. 

sumologic/resource_sumologic_cse_match_list.go

@@ -87,16 +87,6 @@ func resourceSumologicCSEMatchList() *schema.Resource {
 	}
 }
 
-func getCSEMatchListItemsInMatchList(id string, meta interface{}) *CSEMatchListItemsInMatchListGet {
-	c := meta.(*Client)
-
-	CSEMatchListItems, err := c.GetCSEMatchListItemsInMatchList(id)
-	if err != nil {
-		log.Printf("[WARN] CSE Match List items not found when looking by match list id: %s, err: %v", id, err)
-	}
-	return CSEMatchListItems
-}
-
 func resourceSumologicCSEMatchListRead(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(*Client)
 
@@ -125,7 +115,10 @@ func resourceSumologicCSEMatchListRead(d *schema.ResourceData, meta interface{})
 	d.Set("last_updated", CSEMatchList.LastUpdated)
 	d.Set("last_updated_by", CSEMatchList.LastUpdatedBy)
 
-	CSEMatchListItems := getCSEMatchListItemsInMatchList(id, meta)
+	CSEMatchListItems, err := c.GetCSEMatchListItemsInMatchList(id)
+	if err != nil {
+		log.Printf("[WARN] CSE Match List items not found when looking by match list id: %s, err: %v", id, err)
+	}
 
 	if CSEMatchListItems == nil {
 		d.Set("items", nil)
@@ -185,9 +178,9 @@ func resourceSumologicCSEMatchListCreate(d *schema.ResourceData, meta interface{
 		}
 
 		if len(items) > 0 {
-			err2 := c.CreateCSEMatchListItems(items, id)
-			if err2 != nil {
-				log.Printf("[WARN] An error occurred while adding match list items to match list id: %s, err: %v", id, err2)
+			err = c.CreateCSEMatchListItems(items, id)
+			if err != nil {
+				log.Printf("[WARN] An error occurred while adding match list items to match list id: %s, err: %v", id, err)
 			}
 
 		}
@@ -199,6 +192,7 @@ func resourceSumologicCSEMatchListCreate(d *schema.ResourceData, meta interface{
 			Refresh: func() (interface{}, string, error) {
 				resp, 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 resp, fmt.Sprint(resp.Total), nil
@@ -251,7 +245,10 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		newItems = append(newItems, item)
 	}
 
-	CSEMatchListItems := getCSEMatchListItemsInMatchList(d.Id(), meta)
+	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)
+	}
 	var oldItemIds []string
 	for _, item := range CSEMatchListItems.CSEMatchListItemsGetObjects {
 		oldItemIds = append(oldItemIds, item.ID)
@@ -269,11 +266,34 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 
 	}
 
-	// Wait until all new items have finished being indexed in ES
-	CSEMatchListItems = getCSEMatchListItemsInMatchList(d.Id(), meta)
-	for CSEMatchListItems.Total < newItemCount {
-		time.Sleep(3 * time.Second)
-		CSEMatchListItems = getCSEMatchListItemsInMatchList(d.Id(), meta)
+	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)
+	}
+
+	// Wait for addition 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
@@ -286,13 +306,15 @@ func resourceSumologicCSEMatchListUpdate(d *schema.ResourceData, meta interface{
 		}
 	}
 
-	createStateConf := &resource.StateChangeConf{
+	// Wait for deletion to finish
+	createStateConf = &resource.StateChangeConf{
 		Target: []string{
 			fmt.Sprint(len(newItems)),
 		},
 		Refresh: func() (interface{}, string, error) {
 			resp, 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 resp, fmt.Sprint(resp.Total), nil

sumologic/resource_sumologic_cse_match_list_test.go

@@ -24,15 +24,15 @@ func TestAccSumologicSCEMatchList_createAndUpdate(t *testing.T) {
 	liDescription := "Match List Item Description"
 	liExpiration := "2122-02-27T04:00:00"
 	liValue := "value"
-	liCount := 1001
+	liCount := 3
 
 	// Update values
 	uDefaultTtl := 3600
 	uDescription := "Updated Match List Description"
 	uliDescription := "Updated Match List item Description"
 	uliExpiration := "2122-02-27T05:00:00"
 	uliValue := "updated value"
-	uliCount := 1001
+	uliCount := 3
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -111,8 +111,6 @@ resource "sumologic_cse_match_list" "match_list" {
     target_column = "%s" %s
 }`, nDefaultTtl, nDescription, nName, nTargetColumn, itemsStr)
 
-	fmt.Println(str)
-
 	return str
 }