Merge pull request #284 from flokli/retry

grafana/provider.go: set NumRetries

Author: julienduchesne

go.mod

@@ -3,7 +3,7 @@ module github.com/grafana/terraform-provider-grafana
 go 1.16
 
 require (
-	github.com/grafana/grafana-api-golang-client v0.0.0-20211005011003-c69abe946fa6
+	github.com/grafana/grafana-api-golang-client v0.0.0-20211109031802-c957748d66e7
 	github.com/grafana/synthetic-monitoring-agent v0.0.24
 	github.com/grafana/synthetic-monitoring-api-go-client v0.0.2
 	github.com/hashicorp/go-cleanhttp v0.5.2

go.sum

@@ -571,8 +571,8 @@ github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/grafana/grafana-api-golang-client v0.0.0-20211005011003-c69abe946fa6 h1:B8YsmxR/o6nAJRPofr47bckY+MNGPj6Ejs8iAY4gXkI=
-github.com/grafana/grafana-api-golang-client v0.0.0-20211005011003-c69abe946fa6/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
+github.com/grafana/grafana-api-golang-client v0.0.0-20211109031802-c957748d66e7 h1:laghHEgZhwoFl6wS67J0t+mSnHrRNpFuovZ2D6PucjI=
+github.com/grafana/grafana-api-golang-client v0.0.0-20211109031802-c957748d66e7/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
 github.com/grafana/loki v1.6.1/go.mod h1:X+GvtCzAf2ok/xRLLvGB8kuWP1R+75nXnvjCEnenP0s=
 github.com/grafana/synthetic-monitoring-agent v0.0.23/go.mod h1:luWgdBaAQgOz9e6m/cGQCFFrPWkBTl+VZM/UC+75nSM=
 github.com/grafana/synthetic-monitoring-agent v0.0.24 h1:qfDFWIW2iPmffAsLO9WG/h8inAV+D/nXbQUQ4DTdL3E=

grafana/provider.go

@@ -46,6 +46,12 @@ func Provider(version string) func() *schema.Provider {
 					DefaultFunc: schema.EnvDefaultFunc("GRAFANA_AUTH", nil),
 					Description: "API token or basic auth username:password. May alternatively be set via the `GRAFANA_AUTH` environment variable.",
 				},
+				"retries": {
+					Type:        schema.TypeInt,
+					Optional:    true,
+					DefaultFunc: schema.EnvDefaultFunc("GRAFANA_RETRIES", 3),
+					Description: "The amount of retries to use for Grafana API calls. May alternatively be set via the `GRAFANA_RETRIES` environment variable.",
+				},
 				"org_id": {
 					Type:        schema.TypeInt,
 					Required:    true,
@@ -171,8 +177,9 @@ func configure(version string, p *schema.Provider) func(context.Context, *schema
 
 		cli.Transport = logging.NewTransport("Grafana", transport)
 		cfg := gapi.Config{
-			Client: cli,
-			OrgID:  int64(d.Get("org_id").(int)),
+			Client:     cli,
+			NumRetries: d.Get("retries").(int),
+			OrgID:      int64(d.Get("org_id").(int)),
 		}
 		if len(auth) == 2 {
 			cfg.BasicAuth = url.UserPassword(auth[0], auth[1])