Merge branch 'feature/retryable-http' into feature/godo-rate-limiter-…

…and-http-retryable

digitalocean/config/config.go

@@ -6,11 +6,13 @@ import (
  "log"
  "net/url"
  "strings"
+ "time"
 
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/credentials"
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/digitalocean/godo"
+ "github.com/hashicorp/go-retryablehttp"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
  "golang.org/x/oauth2"
 )
@@ -23,6 +25,9 @@ type Config struct {
  SecretKey string
  RequestsPerSecond float64
  TerraformVersion string
+ HTTPRetryMax int
+ HTTPRetryWaitMax float64
+ HTTPRetryWaitMin float64
 }
 
 type CombinedConfig struct {
@@ -68,7 +73,17 @@ func (c *Config) Client() (*CombinedConfig, error) {
  })
 
  userAgent := fmt.Sprintf("Terraform/%s", c.TerraformVersion)
- client := oauth2.NewClient(oauth2.NoContext, tokenSrc)
+
+ retryableClient := retryablehttp.NewClient()
+ retryableClient.RetryMax = c.HTTPRetryMax
+ retryableClient.RetryWaitMin = time.Duration(c.HTTPRetryWaitMin * float64(time.Second))
+ retryableClient.RetryWaitMax = time.Duration(c.HTTPRetryWaitMax * float64(time.Second))
+
+ client := retryableClient.StandardClient()
+ client.Transport = &oauth2.Transport{
+ Base: client.Transport,
+ Source: oauth2.ReuseTokenSource(nil, tokenSrc),
+ }
 
  client.Transport = logging.NewTransport("DigitalOcean", client.Transport)
 

digitalocean/provider.go

@@ -73,6 +73,24 @@ func Provider() *schema.Provider {
  DefaultFunc: schema.EnvDefaultFunc("DIGITALOCEAN_REQUESTS_PER_SECOND", 4.0),
  Description: "The rate of requests per second to limit the HTTP client.",
  },
+ "http_retry_max": {
+ Type: schema.TypeInt,
+ Optional: true,
+ DefaultFunc: schema.EnvDefaultFunc("DIGITALOCEAN_HTTP_RETRY_MAX", 0),
+ Description: "The maximum number of retries on a failed API request.",
+ },
+ "http_retry_wait_min": {
+ Type: schema.TypeFloat,
+ Optional: true,
+ DefaultFunc: schema.EnvDefaultFunc("DIGITALOCEAN_HTTP_RETRY_WAIT_MIN", 1.0),
+ Description: "The minimum wait time (in seconds) between failed API requests.",
+ },
+ "http_retry_wait_max": {
+ Type: schema.TypeFloat,
+ Optional: true,
+ DefaultFunc: schema.EnvDefaultFunc("DIGITALOCEAN_HTTP_RETRY_WAIT_MAX", 30.0),
+ Description: "The maximum wait time (in seconds) between failed API requests.",
+ },
  },
  DataSourcesMap: map[string]*schema.Resource{
  "digitalocean_account": account.DataSourceDigitalOceanAccount(),
@@ -177,6 +195,9 @@ func providerConfigure(d *schema.ResourceData, terraformVersion string) (interfa
  AccessID: d.Get("spaces_access_id").(string),
  SecretKey: d.Get("spaces_secret_key").(string),
  RequestsPerSecond: d.Get("requests_per_second").(float64),
+ HTTPRetryMax: d.Get("http_retry_max").(int),
+ HTTPRetryWaitMin: d.Get("http_retry_wait_min").(float64),
+ HTTPRetryWaitMax: d.Get("http_retry_wait_max").(float64),
  TerraformVersion: terraformVersion,
  }
 

docs/index.md

@@ -65,3 +65,16 @@ The following arguments are supported:
 * `requests_per_second` - (Optional) This can be used to override the limit of
  API calls per second and avoid rate limit errors (Defaults to the value of the
  `DIGITALOCEAN_REQUESTS_PER_SECOND` environment variable or `4.0` if unset).
+* `http_retry_max` - (Optional) This can be used to override the maximum number
+ of retries on a failed API request (client errors, 422, 500, 502...), can 
+ be disabled by the `http_retry_wait_min` and `http_retry_wait_max` arguments 
+ (Defaults to the value of the `DIGITALOCEAN_HTTP_RETRY_MAX` environment
+ variable or `0` if unset).
+* `http_retry_wait_min` - (Optional) This can be used to configure the minimum 
+ waiting time (**in seconds**) between failed requests for the backoff strategy
+ (Defaults to the value of the `DIGITALOCEAN_HTTP_RETRY_WAIT_MIN` environment 
+ variable or `1.0` if unset).
+* `http_retry_wait_max` - (Optional) This can be used to configure the maximum
+ waiting time (**in seconds**) between failed requests for the backoff strategy
+ (Defaults to the value of the `DIGITALOCEAN_HTTP_RETRY_WAIT_MAX` environment
+ variable or `30.0` if unset).

go.mod

@@ -4,6 +4,7 @@ require (
  github.com/aws/aws-sdk-go v1.42.18
  github.com/digitalocean/godo v1.95.0
  github.com/hashicorp/awspolicyequivalence v1.5.0
+ github.com/hashicorp/go-retryablehttp v0.7.2
  github.com/hashicorp/go-uuid v1.0.2
  github.com/hashicorp/go-version v1.3.0
  github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1

go.sum

@@ -179,6 +179,7 @@ github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBM
 github.com/hashicorp/go-getter v1.5.3 h1:NF5+zOlQegim+w/EUhSLh6QhXHmZMEeHLQzllkQ3ROU=
 github.com/hashicorp/go-getter v1.5.3/go.mod h1:BrrV/1clo8cCYu6mxvboYg+KutTiFnXjMEgDD8+i7ZI=
 github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
+github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.1 h1:IVQwpTGNRRIHafnTs2dQLIk4ENtneRIEEJWOVDqz99o=
 github.com/hashicorp/go-hclog v0.16.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
@@ -188,6 +189,8 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9
 github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0=
 github.com/hashicorp/go-plugin v1.4.1 h1:6UltRQlLN9iZO513VveELp5xyaFxVD2+1OVylE+2E+w=
 github.com/hashicorp/go-plugin v1.4.1/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
+github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
+github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
 github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=