Use int64 where API returns a 64 bit wide integer (#177)

Author: pmalek-sumo

sumologic/data_source_sumologic_collector.go

@@ -73,7 +73,7 @@ func dataSourceSumologicCollectorRead(d *schema.ResourceData, meta interface{})
 		}
 	}
 
-	d.SetId(strconv.Itoa(collector.ID))
+	d.SetId(strconv.FormatInt(collector.ID, 10))
 	d.Set("name", collector.Name)
 	d.Set("description", collector.Description)
 	d.Set("category", collector.Category)

sumologic/data_source_sumologic_http_source.go

@@ -2,8 +2,9 @@ package sumologic
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceSumologicHTTPSource() *schema.Resource {
@@ -54,7 +55,7 @@ func dataSourceSumologicHTTPSourceRead(d *schema.ResourceData, meta interface{})
 	c := meta.(*Client)
 
 	id, _ := strconv.Atoi(d.Id())
-	source, err := c.GetSourceName(d.Get("collector_id").(int), d.Get("name").(string))
+	source, err := c.GetSourceName(d.Get("collector_id").(int64), d.Get("name").(string))
 
 	if err != nil {
 		return err

sumologic/resource_sumologic_collector.go

@@ -64,7 +64,7 @@ func resourceSumologicCollectorRead(d *schema.ResourceData, meta interface{}) er
 		} else if collector == nil {
 			log.Printf("[WARN] Got a nil Collector when looking by name: %s", d.Id())
 		} else {
-			d.SetId(strconv.Itoa(collector.ID))
+			d.SetId(strconv.FormatInt(collector.ID, 10))
 		}
 	} else {
 		collector, err = c.GetCollector(id)
@@ -111,28 +111,31 @@ func resourceSumologicCollectorCreate(d *schema.ResourceData, meta interface{})
 			return err
 		}
 
-		d.SetId(strconv.Itoa(id))
+		d.SetId(strconv.FormatInt(id, 10))
 	}
 
 	return resourceSumologicCollectorUpdate(d, meta)
 }
 
 func resourceSumologicCollectorUpdate(d *schema.ResourceData, meta interface{}) error {
-
-	collector := resourceToCollector(d)
+	collector, err := resourceToCollector(d)
+	if err != nil {
+		return err
+	}
 
 	c := meta.(*Client)
-	err := c.UpdateCollector(collector)
-
-	if err != nil {
+	if err = c.UpdateCollector(collector); err != nil {
 		return err
 	}
 
 	return resourceSumologicCollectorRead(d, meta)
 }
 
-func resourceToCollector(d *schema.ResourceData) Collector {
-	id, _ := strconv.Atoi(d.Id())
+func resourceToCollector(d *schema.ResourceData) (Collector, error) {
+	id, err := strconv.ParseInt(d.Id(), 10, 64)
+	if err != nil {
+		return Collector{}, err
+	}
 
 	return Collector{
 		ID:            id,
@@ -142,5 +145,5 @@ func resourceToCollector(d *schema.ResourceData) Collector {
 		Category:      d.Get("category").(string),
 		TimeZone:      d.Get("timezone").(string),
 		Fields:        d.Get("fields").(map[string]interface{}),
-	}
+	}, nil
 }

sumologic/sumologic_collectors.go

@@ -49,7 +49,7 @@ func (s *Client) DeleteCollector(id int) error {
 	return err
 }
 
-func (s *Client) CreateCollector(collector Collector) (int, error) {
+func (s *Client) CreateCollector(collector Collector) (int64, error) {
 
 	request := CollectorRequest{
 		Collector: collector,
@@ -101,7 +101,7 @@ type CollectorLink struct {
 }
 
 type Collector struct {
-	ID               int                    `json:"id,omitempty"`
+	ID               int64                  `json:"id,omitempty"`
 	CollectorType    string                 `json:"collectorType,omitempty"`
 	Name             string                 `json:"name"`
 	Description      string                 `json:"description,omitempty"`
@@ -110,6 +110,6 @@ type Collector struct {
 	Fields           map[string]interface{} `json:"fields,omitempty"`
 	Links            []CollectorLink        `json:"links,omitempty"`
 	CollectorVersion string                 `json:"collectorVersion,omitempty"`
-	LastSeenAlive    int                    `json:"lastSeenAlive,omitempty"`
+	LastSeenAlive    int64                  `json:"lastSeenAlive,omitempty"`
 	Alive            bool                   `json:"alive,omitempty"`
 }

sumologic/sumologic_sources.go

@@ -335,7 +335,7 @@ func (s *Client) DestroySource(sourceID int, collectorID int) error {
 	return err
 }
 
-func (s *Client) GetSourceName(collectorID int, sourceName string) (*Source, error) {
+func (s *Client) GetSourceName(collectorID int64, sourceName string) (*Source, error) {
 
 	data, _, err := s.Get(
 		fmt.Sprintf("v1/collectors/%d/sources", collectorID),