Skip to content

Commit 61ad3b4

Browse files
Update OpenAPI client following error management changes (#1182)
* Update OpenAPI client Error management was modified and we should now match errors differently * Get error code by casting
1 parent 75061b4 commit 61ad3b4

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/go-openapi/strfmt v0.21.7
1010
github.com/grafana/amixr-api-go-client v0.0.11
1111
github.com/grafana/grafana-api-golang-client v0.26.0
12-
github.com/grafana/grafana-openapi-client-go v0.0.0-20231123130316-d81910df4f15
12+
github.com/grafana/grafana-openapi-client-go v0.0.0-20231123143558-91f2985bb3ef
1313
github.com/grafana/machine-learning-go-client v0.5.0
1414
github.com/grafana/synthetic-monitoring-agent v0.19.0
1515
github.com/grafana/synthetic-monitoring-api-go-client v0.7.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ github.com/grafana/amixr-api-go-client v0.0.11 h1:jlE+5t0tRuCtjbpM81j70Dr2J4eCyS
148148
github.com/grafana/amixr-api-go-client v0.0.11/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
149149
github.com/grafana/grafana-api-golang-client v0.26.0 h1:Eu2YsfUezYngy8ifvmLybgluIcn/2IS9u1xkzuYstEM=
150150
github.com/grafana/grafana-api-golang-client v0.26.0/go.mod h1:uNLZEmgKtTjHBtCQMwNn3qsx2mpMb8zU+7T4Xv3NR9Y=
151-
github.com/grafana/grafana-openapi-client-go v0.0.0-20231123130316-d81910df4f15 h1:a0dCB1kISO6nEBBWDcNBu01MxCiShRIjOrxgnd02bbE=
152-
github.com/grafana/grafana-openapi-client-go v0.0.0-20231123130316-d81910df4f15/go.mod h1:2vJ8YEgriYoHaNg5eijRU/q7eJTxT078VrGRSTTLeRk=
151+
github.com/grafana/grafana-openapi-client-go v0.0.0-20231123143558-91f2985bb3ef h1:wPNbC5nrNXSGIPctfmFhJNoBAhnCOe1aZm5ymiFzlKM=
152+
github.com/grafana/grafana-openapi-client-go v0.0.0-20231123143558-91f2985bb3ef/go.mod h1:2vJ8YEgriYoHaNg5eijRU/q7eJTxT078VrGRSTTLeRk=
153153
github.com/grafana/machine-learning-go-client v0.5.0 h1:Q1K+MPSy8vfMm2jsk3WQ7O77cGr2fM5hxwtPSoPc5NU=
154154
github.com/grafana/machine-learning-go-client v0.5.0/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
155155
github.com/grafana/synthetic-monitoring-agent v0.19.0 h1:ClYFFeeSj34nKltOpAb9/Z6pzSLWYUpskB4O6hICZ5g=

internal/common/errcheck.go

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

8+
"github.com/go-openapi/runtime"
89
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1011
)
@@ -36,5 +37,8 @@ func CheckReadError(resourceType string, d *schema.ResourceData, err error) (ret
3637
}
3738

3839
func IsNotFoundError(err error) bool {
39-
return strings.Contains(err.Error(), NotFoundError)
40+
if err, ok := err.(runtime.ClientResponseStatus); ok {
41+
return err.IsCode(404)
42+
}
43+
return strings.Contains(err.Error(), NotFoundError) // TODO: Remove when the old client is removed
4044
}

0 commit comments

Comments
 (0)