Skip to content

Check for data source 404 in the correct place #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2019
Merged

Check for data source 404 in the correct place #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions grafana/resource_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down