linter change code cleanup, name changes, resourceData.Set()

Author: Sean Sain

sumologic/data_source_sumologic_collector_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourcSumologicCollector(t *testing.T) {
+func TestAccDataSourcSumologicCollector_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{

sumologic/resource_sumologic_cloudsyslog_source_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccSumologicCloudsyslogSource(t *testing.T) {
+func TestAccSumologicCloudsyslogSource_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{

sumologic/resource_sumologic_collector.go

@@ -13,7 +13,6 @@ func resourceSumologicCollector() *schema.Resource {
 		Read:   resourceSumologicCollectorRead,
 		Delete: resourceSumologicCollectorDelete,
 		Update: resourceSumologicCollectorUpdate,
-		Exists: resourceSumologicCollectorExists,
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
@@ -152,20 +151,6 @@ func resourceSumologicCollectorUpdate(d *schema.ResourceData, meta interface{})
 	return resourceSumologicCollectorRead(d, meta)
 }
 
-func resourceSumologicCollectorExists(d *schema.ResourceData, meta interface{}) (bool, error) {
-	c := meta.(*Client)
-
-	id, err := strconv.Atoi(d.Id())
-
-	if err != nil {
-		_, err := c.GetCollectorName(d.Id())
-		return err == nil, err
-	}
-
-	_, err = c.GetCollector(id)
-	return err == nil, err
-}
-
 func resourceToCollector(d *schema.ResourceData) Collector {
 	id, _ := strconv.Atoi(d.Id())
 

sumologic/resource_sumologic_collector_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccSumologicCollectorMinimal(t *testing.T) {
+func TestAccSumologicCollector_minimal(t *testing.T) {
 	var collector *Collector
 	resourceName := "sumologic_collector.test"
 	resource.Test(t, resource.TestCase{
@@ -38,7 +38,7 @@ func TestAccSumologicCollectorMinimal(t *testing.T) {
 	})
 }
 
-func TestAccSumologicCollectorSimple(t *testing.T) {
+func TestAccSumologicCollector_simple(t *testing.T) {
 	var collector *Collector
 	resourceName := "sumologic_collector.test"
 	resource.Test(t, resource.TestCase{
@@ -124,7 +124,7 @@ func TestAccSumologicCollectorSimple(t *testing.T) {
 // 	})
 // }
 
-func TestAccSumologicCollectorChangeConfig(t *testing.T) {
+func TestAccSumologicCollector_changeConfig(t *testing.T) {
 	var collector *Collector
 	resourceName := "sumologic_collector.test"
 	resource.Test(t, resource.TestCase{
@@ -165,7 +165,7 @@ func TestAccSumologicCollectorChangeConfig(t *testing.T) {
 	})
 }
 
-func TestAccSumologicCollectorManualDeletion(t *testing.T) {
+func TestAccSumologicCollector_manualDeletion(t *testing.T) {
 	var collector *Collector
 
 	deleteCollector := func() {

sumologic/resource_sumologic_http_source_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccSumologicHTTPSource(t *testing.T) {
+func TestAccSumologicHTTPSource_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
@@ -23,7 +23,7 @@ func TestAccSumologicHTTPSource(t *testing.T) {
 	})
 }
 
-func TestAccSumologicHTTPSourceUpdate(t *testing.T) {
+func TestAccSumologicHTTPSource_update(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{

sumologic/resource_sumologic_ingest_budget_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccSumologicIngestBudget_basic(t *testing.T) {
+func TestAccSumologicIngestBudget_create(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
@@ -25,7 +25,7 @@ func TestAccSumologicIngestBudget_basic(t *testing.T) {
 		}})
 }
 
-func TestAccSumologicIngestBudget_import(t *testing.T) {
+func TestAccSumologicIngestBudget_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{

sumologic/sumologic_sources.go

@@ -274,13 +274,39 @@ func resourceSumologicSourceRead(d *schema.ResourceData, source Source) {
 	d.Set("use_autoline_matching", source.UseAutolineMatching)
 	d.Set("manual_prefix_regexp", source.ManualPrefixRegexp)
 	d.Set("force_timezone", source.ForceTimeZone)
-	d.Set("default_date_formats", source.DefaultDateFormats)
-	d.Set("filters", source.Filters)
+	d.Set("default_date_formats", flattenDateFormats(source.DefaultDateFormats))
+	d.Set("filters", flattenFilters(source.Filters))
 	d.Set("cutoff_timestamp", source.CutoffTimestamp)
 	d.Set("cutoff_relative_time", source.CutoffRelativeTime)
 	d.Set("fields", source.Fields)
 }
 
+func flattenDateFormats(v []DefaultDateFormat) []map[string]interface{} {
+	var defaultDateDormats []map[string]interface{}
+	for _, d := range v {
+		defaultDateFormat := map[string]interface{}{
+			"format":  d.Format,
+			"locator": d.Locator,
+		}
+		defaultDateDormats = append(defaultDateDormats, defaultDateFormat)
+	}
+	return defaultDateDormats
+}
+
+func flattenFilters(v []Filter) []map[string]interface{} {
+	var filters []map[string]interface{}
+	for _, d := range v {
+		filter := map[string]interface{}{
+			"name":        d.Name,
+			"filter_type": d.FilterType,
+			"regexp":      d.Regexp,
+			"mask":        d.Mask,
+		}
+		filters = append(filters, filter)
+	}
+	return filters
+}
+
 func getDefaultDateFormats(d *schema.ResourceData) []DefaultDateFormat {
 
 	rawDefaultDateFormatsConfig := d.Get("default_date_formats").([]interface{})