From de90bc44612d970180d8110a869d13dc21af755d Mon Sep 17 00:00:00 2001 From: Stuart Auld Date: Mon, 1 Apr 2019 15:24:14 +1100 Subject: [PATCH] Check for data source 404 in the correct place --- grafana/resource_data_source.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/grafana/resource_data_source.go b/grafana/resource_data_source.go index 9ce84e2c4..50825cde9 100644 --- a/grafana/resource_data_source.go +++ b/grafana/resource_data_source.go @@ -167,17 +167,16 @@ func ReadDataSource(d *schema.ResourceData, meta interface{}) error { idStr := d.Id() id, err := strconv.ParseInt(idStr, 10, 64) if err != nil { - if err.Error() == "404 Not Found" { - log.Printf("[WARN] removing datasource %s from state because it no longer exists in grafana", d.Get("name").(string)) - d.SetId("") - return nil - } return fmt.Errorf("Invalid id: %#v", idStr) } dataSource, err := client.DataSource(id) if err != nil { - + if err.Error() == "404 Not Found" { + log.Printf("[WARN] removing datasource %s from state because it no longer exists in grafana", d.Get("name").(string)) + d.SetId("") + return nil + } return err }