Merge pull request #8 from terraform-providers/ssain-set-attributes-on-read

Error checking aggregate types

Author: seansain

CHANGELOG.md

@@ -1,4 +1,9 @@
-## 2.1.0 (Unreleased)
+## 2.0.2 (Unreleased)
+
+ENHANCEMENTS:
+
+* Check for errors when setting aggregate values on read [GH-8]
+
 ## 2.0.1 (April 30, 2020)
 
 FEATURES:

sumologic/data_source_sumologic_collector.go

@@ -3,9 +3,10 @@ package sumologic
 import (
 	"errors"
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceSumologicCollector() *schema.Resource {
@@ -77,7 +78,9 @@ func dataSourceSumologicCollectorRead(d *schema.ResourceData, meta interface{})
 	d.Set("description", collector.Description)
 	d.Set("category", collector.Category)
 	d.Set("timezone", collector.TimeZone)
-	d.Set("fields", collector.Fields)
+	if err := d.Set("fields", collector.Fields); err != nil {
+		return fmt.Errorf("error setting fields for datasource %s: %s", d.Id(), err)
+	}
 
 	log.Printf("[DEBUG] data_source_sumologic_collector: retrieved %v", collector)
 	return nil

sumologic/resource_sumologic_cloudsyslog_source.go

@@ -1,6 +1,7 @@
 package sumologic
 
 import (
+	"fmt"
 	"log"
 	"strconv"
 
@@ -92,7 +93,9 @@ func resourceSumologicCloudSyslogSourceRead(d *schema.ResourceData, meta interfa
 		return nil
 	}
 
-	resourceSumologicSourceRead(d, source.Source)
+	if err := resourceSumologicSourceRead(d, source.Source); err != nil {
+		return fmt.Errorf("%s", err)
+	}
 	d.Set("token", source.Token)
 
 	return nil

sumologic/resource_sumologic_collector.go

@@ -1,6 +1,7 @@
 package sumologic
 
 import (
+	"fmt"
 	"log"
 	"strconv"
 
@@ -89,7 +90,9 @@ func resourceSumologicCollectorRead(d *schema.ResourceData, meta interface{}) er
 	d.Set("description", collector.Description)
 	d.Set("category", collector.Category)
 	d.Set("timezone", collector.TimeZone)
-	d.Set("fields", collector.Fields)
+	if err := d.Set("fields", collector.Fields); err != nil {
+		return fmt.Errorf("error setting fields for resource %s: %s", d.Id(), err)
+	}
 
 	return nil
 }

sumologic/resource_sumologic_connection.go

@@ -135,8 +135,12 @@ func resourceSumologicConnectionRead(d *schema.ResourceData, meta interface{}) e
 	d.Set("name", connection.Name)
 	d.Set("description", connection.Description)
 	d.Set("url", connection.URL)
-	d.Set("headers", headersToMap(connection.Headers))
-	d.Set("custom_headers", headersToMap(connection.CustomHeaders))
+	if err := d.Set("headers", headersToMap(connection.Headers)); err != nil {
+		return fmt.Errorf("error setting headers for resource %s: %s", d.Id(), err)
+	}
+	if err := d.Set("custom_headers", headersToMap(connection.CustomHeaders)); err != nil {
+		return fmt.Errorf("error setting custom headers for resource %s: %s", d.Id(), err)
+	}
 	d.Set("default_payload", connection.DefaultPayload)
 	d.Set("webhook_type", connection.WebhookType)
 	d.SetId(connection.ID)

sumologic/resource_sumologic_http_source.go

@@ -1,6 +1,7 @@
 package sumologic
 
 import (
+	"fmt"
 	"log"
 	"strconv"
 
@@ -103,7 +104,9 @@ func resourceSumologicHTTPSourceRead(d *schema.ResourceData, meta interface{}) e
 		return nil
 	}
 
-	resourceSumologicSourceRead(d, source.Source)
+	if err := resourceSumologicSourceRead(d, source.Source); err != nil {
+		return fmt.Errorf("%s", err)
+	}
 	d.Set("message_per_request", source.MessagePerRequest)
 	d.Set("url", source.URL)
 

sumologic/resource_sumologic_polling_source.go

@@ -1,6 +1,7 @@
 package sumologic
 
 import (
+	"fmt"
 	"log"
 	"strconv"
 
@@ -160,7 +161,9 @@ func resourceSumologicPollingSourceRead(d *schema.ResourceData, meta interface{}
 		return err
 	}
 
-	resourceSumologicSourceRead(d, source.Source)
+	if err := resourceSumologicSourceRead(d, source.Source); err != nil {
+		return fmt.Errorf("%s", err)
+	}
 	d.Set("content_type", source.ContentType)
 	d.Set("scan_interval", source.ScanInterval)
 	d.Set("paused", source.Paused)

sumologic/resource_sumologic_role.go

@@ -12,6 +12,7 @@
 package sumologic
 
 import (
+	"fmt"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -74,7 +75,9 @@ func resourceSumologicRoleRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("name", role.Name)
 	d.Set("description", role.Description)
 	d.Set("filter_predicate", role.FilterPredicate)
-	d.Set("capabilities", role.Capabilities)
+	if err := d.Set("capabilities", role.Capabilities); err != nil {
+		return fmt.Errorf("error setting tags for resource %s: %s", d.Id(), err)
+	}
 
 	return nil
 }

sumologic/resource_sumologic_user.go

@@ -12,6 +12,7 @@
 package sumologic
 
 import (
+	"fmt"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -84,7 +85,9 @@ func resourceSumologicUserRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("first_name", user.FirstName)
 	d.Set("last_name", user.LastName)
 	d.Set("email", user.Email)
-	d.Set("role_ids", user.RoleIds)
+	if err := d.Set("role_ids", user.RoleIds); err != nil {
+		return fmt.Errorf("error setting role ids for resource %s: %s", d.Id(), err)
+	}
 	d.Set("is_active", user.IsActive)
 
 	return nil

sumologic/sumologic_client.go

@@ -42,7 +42,7 @@ func createNewRequest(method, url string, body io.Reader, accessID string, acces
 		return nil, err
 	}
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("User-Agent", "SumoLogicTerraformProvider/2.0.0")
+	req.Header.Add("User-Agent", "SumoLogicTerraformProvider/2.0.2")
 	req.SetBasicAuth(accessID, accessKey)
 	return req, nil
 }