update changelog, fix some naming

Author: Sean Sain

CHANGELOG.md

@@ -16,4 +16,5 @@ BUG FIXES:
 
 DEPRECATIONS:
 
-* resource/sumologiccollector_ingest_budget_assignment: Deprecated in favor of assigning ingest budgets through the _budget field attribute of collectors [GH-135]
+* resource/sumologic_collector_ingest_budget_assignment: Deprecated in favor of assigning ingest budgets through the _budget field attribute of collectors [GH-135]
+* resource/sumologic_collector: Deprecated `lookup_by_name` and `destroy` attributes

sumologic/resource_sumologic_collector_test.go

@@ -22,7 +22,7 @@ func TestAccSumologicCollector_basic(t *testing.T) {
 				Config: testAccSumologicCollectorConfigBasic(rname),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCollectorExists(resourceName, &collector),
-					testAccCheckCollectorValues(&collector, rname, "", "", "Etc/UTC"),
+					testAccCheckCollectorValues(&collector, rname, "", "", "Etc/UTC", ""),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "name", rname),
 					resource.TestCheckResourceAttr(resourceName, "description", ""),
@@ -56,7 +56,7 @@ func TestAccSumologicCollector_create(t *testing.T) {
 					// query the API to retrieve the collector
 					testAccCheckCollectorExists(resourceName, &collector),
 					// verify remote values
-					testAccCheckCollectorValues(&collector, rname, rdescription, rcategory, "Etc/UTC"),
+					testAccCheckCollectorValues(&collector, rname, rdescription, rcategory, "Etc/UTC", ""),
 					// verify local values
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "name", rname),
@@ -83,7 +83,7 @@ func TestAccSumologicCollector_update(t *testing.T) {
 				Config: testAccSumologicCollectorConfig(rname, rdescription, rcategory),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCollectorExists(resourceName, &collector),
-					testAccCheckCollectorValues(&collector, rname, rdescription, rcategory, "Etc/UTC"),
+					testAccCheckCollectorValues(&collector, rname, rdescription, rcategory, "Etc/UTC", ""),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "name", rname),
 					resource.TestCheckResourceAttr(resourceName, "description", rdescription),
@@ -95,7 +95,7 @@ func TestAccSumologicCollector_update(t *testing.T) {
 				Config: testAccSumologicCollectorConfigUpdate(rname, rdescription, rcategory),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCollectorExists(resourceName, &collector),
-					testAccCheckCollectorValues(&collector, rname, rdescription, rcategory, "Europe/Berlin"),
+					testAccCheckCollectorValues(&collector, rname, rdescription, rcategory, "Europe/Berlin", ""),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "name", rname),
 					resource.TestCheckResourceAttr(resourceName, "description", rdescription),
@@ -161,19 +161,24 @@ func testAccCheckCollectorExists(n string, collector *Collector) resource.TestCh
 	}
 }
 
-func testAccCheckCollectorValues(collector *Collector, name, description, category, timezone string) resource.TestCheckFunc {
+func testAccCheckCollectorValues(collector *Collector, name, description, category, timezone, budgetValue string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if collector.Name != name {
 			return fmt.Errorf("bad name, expected \"%s\", got: %#v", name, collector.Name)
 		}
 		if collector.Description != description {
-			return fmt.Errorf("bad name, expected \"%s\", got: %#v", description, collector.Description)
+			return fmt.Errorf("bad description, expected \"%s\", got: %#v", description, collector.Description)
 		}
 		if collector.Category != category {
-			return fmt.Errorf("bad name, expected \"%s\", got: %#v", category, collector.Category)
+			return fmt.Errorf("bad category, expected \"%s\", got: %#v", category, collector.Category)
 		}
 		if collector.TimeZone != timezone {
-			return fmt.Errorf("bad name, expected \"%s\", got: %#v", timezone, collector.TimeZone)
+			return fmt.Errorf("bad timezone, expected \"%s\", got: %#v", timezone, collector.TimeZone)
+		}
+		if value, ok := collector.Fields["_budget"]; ok {
+			if value != budgetValue {
+				return fmt.Errorf("bad budgetValue, expected \"%s\", got: %#v", budgetValue, collector.Fields["_budget"])
+			}
 		}
 		return nil
 	}

sumologic/resource_sumologic_ingest_budget_test.go

@@ -44,6 +44,7 @@ func TestAccSumologicIngestBudget_create(t *testing.T) {
 
 func TestAccSumologicIngestBudget_assign(t *testing.T) {
 	var ingestBudget IngestBudget
+	var collector Collector
 	name := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	collectorName := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	fieldValue := fmt.Sprintf("tf-%s", acctest.RandString(5))
@@ -58,6 +59,8 @@ func TestAccSumologicIngestBudget_assign(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckIngestBudgetExists("sumologic_ingest_budget.testBudget", &ingestBudget),
 					testAccCheckIngestBudgetValues(&ingestBudget, name, fieldValue, description, 2),
+					testAccCheckCollectorExists("sumologic_collector.testCollector", &collector),
+					testAccCheckCollectorValues(&collector, collectorName, "", "", "Etc/UTC", fieldValue),
 					resource.TestCheckResourceAttr("sumologic_ingest_budget.testBudget", "name", name),
 					resource.TestCheckResourceAttr("sumologic_ingest_budget.testBudget", "field_value", fieldValue),
 					resource.TestCheckResourceAttr("sumologic_ingest_budget.testBudget", "capacity_bytes", "2"),
@@ -118,13 +121,13 @@ func testAccCheckIngestBudgetValues(ingestBudget *IngestBudget, name, fieldValue
 			return fmt.Errorf("bad name, expected \"%s\", got: %#v", name, ingestBudget.Name)
 		}
 		if ingestBudget.Capacity != capacity {
-			return fmt.Errorf("bad name, expected \"%d\", got: %#v", capacity, ingestBudget.Capacity)
+			return fmt.Errorf("bad capacity, expected \"%d\", got: %#v", capacity, ingestBudget.Capacity)
 		}
 		if ingestBudget.FieldValue != fieldValue {
-			return fmt.Errorf("bad name, expected \"%s\", got: %#v", fieldValue, ingestBudget.FieldValue)
+			return fmt.Errorf("bad field value, expected \"%s\", got: %#v", fieldValue, ingestBudget.FieldValue)
 		}
 		if ingestBudget.Description != description {
-			return fmt.Errorf("bad name, expected \"%s\", got: %#v", description, ingestBudget.Description)
+			return fmt.Errorf("bad description, expected \"%s\", got: %#v", description, ingestBudget.Description)
 		}
 		return nil
 	}