Skip to content

Commit b32a006

Browse files
authored
Check for errors when getting collector from client (#92)
1 parent 8240e32 commit b32a006

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

sumologic/resource_sumologic_collector.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,28 @@ func resourceSumologicCollector() *schema.Resource {
5555
func resourceSumologicCollectorRead(d *schema.ResourceData, meta interface{}) error {
5656
c := meta.(*Client)
5757

58-
id, err := strconv.Atoi(d.Id())
59-
6058
var collector *Collector
59+
id, err := strconv.Atoi(d.Id())
6160
if err != nil {
62-
collector, _ = c.GetCollectorName(d.Id())
61+
collector, err = c.GetCollectorName(d.Id())
62+
if err != nil {
63+
log.Printf("[WARN] Collector not found when looking by name: %s, err: %v", d.Id(), err)
64+
d.SetId("")
65+
return err
66+
}
6367
d.SetId(strconv.Itoa(collector.ID))
6468
} else {
65-
collector, _ = c.GetCollector(id)
69+
collector, err = c.GetCollector(id)
70+
if err != nil {
71+
log.Printf("[WARN] Collector not found when looking by id: %d, err: %v", id, err)
72+
d.SetId("")
73+
return err
74+
}
6675
}
6776

6877
if collector == nil {
6978
log.Printf("[WARN] Collector not found, removing from state: %v - %v", id, err)
7079
d.SetId("")
71-
7280
return nil
7381
}
7482

0 commit comments

Comments
 (0)