Skip to content

Commit dd1c433

Browse files
Fix 404 error check
1 parent 9a7ac26 commit dd1c433

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

grafana/resource_folder.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"log"
77
"strconv"
8+
"strings"
89

910
"github.com/hashicorp/terraform/helper/schema"
1011

@@ -60,7 +61,7 @@ func ReadFolder(d *schema.ResourceData, meta interface{}) error {
6061

6162
folder, err := client.Folder(id)
6263
if err != nil {
63-
if err.Error() == "404 Not Found" {
64+
if strings.HasPrefix(err.Error(), "status: 404") {
6465
log.Printf("[WARN] removing folder %d from state because it no longer exists in grafana", id)
6566
d.SetId("")
6667
return nil

grafana/resource_folder_permission.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func DeleteFolderPermissions(d *schema.ResourceData, meta interface{}) error {
138138

139139
err := client.UpdateFolderPermissions(folderUID, &emptyPermissions)
140140
if err != nil {
141-
if err.Error() == "404 Not Found" {
141+
if strings.HasPrefix(err.Error(), "status: 404") {
142142
d.SetId("")
143143
return nil
144144
}

0 commit comments

Comments
 (0)