OpenAPI Client: Clone before modifying org ID (#1150)

* OpenAPI Client: Clone before modifying org ID
Needs grafana/grafana-openapi-client-go#27 to be merged and ref to be changed in go.mod before merging
Closes #1125

In a parallel context where both the main org (id 0) and non-main orgs are being called, the wrong client may be used
To fix this, we can clone the client everytime we modify it. This will make sure we avoid conflicts, since we're never modifying the main reference (created in provider.go)

* Update client ref

Author: julienduchesne

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/go-openapi/strfmt v0.21.7
 	github.com/grafana/amixr-api-go-client v0.0.11
 	github.com/grafana/grafana-api-golang-client v0.26.0
-	github.com/grafana/grafana-openapi-client-go v0.0.0-20231031181526-6f78415901a3
+	github.com/grafana/grafana-openapi-client-go v0.0.0-20231112232708-b03b585a9658
 	github.com/grafana/machine-learning-go-client v0.5.0
 	github.com/grafana/synthetic-monitoring-agent v0.18.3
 	github.com/grafana/synthetic-monitoring-api-go-client v0.7.0

go.sum

@@ -144,12 +144,10 @@ github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grafana/amixr-api-go-client v0.0.11 h1:jlE+5t0tRuCtjbpM81j70Dr2J4eCySuWyNGdfLMGdhE=
 github.com/grafana/amixr-api-go-client v0.0.11/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
-github.com/grafana/grafana-api-golang-client v0.25.0 h1:jDxnR0U5xgIwKzE+IliZJvjMUUTQxGq+c1s+3M46flI=
-github.com/grafana/grafana-api-golang-client v0.25.0/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
 github.com/grafana/grafana-api-golang-client v0.26.0 h1:Eu2YsfUezYngy8ifvmLybgluIcn/2IS9u1xkzuYstEM=
 github.com/grafana/grafana-api-golang-client v0.26.0/go.mod h1:uNLZEmgKtTjHBtCQMwNn3qsx2mpMb8zU+7T4Xv3NR9Y=
-github.com/grafana/grafana-openapi-client-go v0.0.0-20231031181526-6f78415901a3 h1:jZrhPmoUBL+kwwV5e2AIalKnxV0VW/e0QZ7aHP7Zg3c=
-github.com/grafana/grafana-openapi-client-go v0.0.0-20231031181526-6f78415901a3/go.mod h1:2vJ8YEgriYoHaNg5eijRU/q7eJTxT078VrGRSTTLeRk=
+github.com/grafana/grafana-openapi-client-go v0.0.0-20231112232708-b03b585a9658 h1:ZneazI71K21ZQJmmg/bNq3489iIg69SkLCen3Kxy7T8=
+github.com/grafana/grafana-openapi-client-go v0.0.0-20231112232708-b03b585a9658/go.mod h1:2vJ8YEgriYoHaNg5eijRU/q7eJTxT078VrGRSTTLeRk=
 github.com/grafana/machine-learning-go-client v0.5.0 h1:Q1K+MPSy8vfMm2jsk3WQ7O77cGr2fM5hxwtPSoPc5NU=
 github.com/grafana/machine-learning-go-client v0.5.0/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
 github.com/grafana/synthetic-monitoring-agent v0.18.3 h1:yPCWz7YFP7NU2rlZ5WPnEcZXWD8OnrGdNjRLsUZUgsw=

internal/resources/grafana/oss_org_id.go

@@ -70,9 +70,9 @@ func ClientFromNewOrgResource(meta interface{}, d *schema.ResourceData) (*gapi.C
 // Those IDs are in the <orgID>:<resourceID> format
 func OAPIClientFromExistingOrgResource(meta interface{}, id string) (*goapi.GrafanaHTTPAPI, int64, string) {
 	orgID, restOfID := SplitOrgResourceID(id)
-	client := meta.(*common.Client).GrafanaOAPI
+	client := meta.(*common.Client).GrafanaOAPI.Clone()
 	if orgID == 0 {
-		orgID = meta.(*common.Client).GrafanaOAPI.OrgID()
+		orgID = client.OrgID()
 	} else if orgID > 0 {
 		client = client.WithOrgID(orgID)
 	}
@@ -83,9 +83,9 @@ func OAPIClientFromExistingOrgResource(meta interface{}, id string) (*goapi.Graf
 // This client is meant to be used in `Create` functions when the ID hasn't already been baked into the resource ID
 func OAPIClientFromNewOrgResource(meta interface{}, d *schema.ResourceData) (*goapi.GrafanaHTTPAPI, int64) {
 	orgID := parseOrgID(d)
-	client := meta.(*common.Client).GrafanaOAPI
+	client := meta.(*common.Client).GrafanaOAPI.Clone()
 	if orgID == 0 {
-		orgID = meta.(*common.Client).GrafanaOAPI.OrgID()
+		orgID = client.OrgID()
 	} else if orgID > 0 {
 		client = client.WithOrgID(orgID)
 	}