Configure Godo Retryable HTTP Client

digitalocean/config/config.go

@@ -7,14 +7,13 @@ import (
  "log"
  "net/http"
  "net/url"
+ "os"
  "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"
 )
@@ -76,30 +75,37 @@ func (c *Config) Client() (*CombinedConfig, error) {
 
  userAgent := fmt.Sprintf("Terraform/%s", c.TerraformVersion)
  var client *http.Client
+ var godoOpts []godo.ClientOpt
+
+ client = oauth2.NewClient(context.Background(), tokenSrc)
 
  if c.HTTPRetryMax > 0 {
- 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))
+ retryConfig := godo.RetryConfig{
+ RetryMax: c.HTTPRetryMax,
+ RetryWaitMin: godo.PtrTo(c.HTTPRetryWaitMin),
+ RetryWaitMax: godo.PtrTo(c.HTTPRetryWaitMax),
+ Logger: log.New(os.Stderr, "", log.LstdFlags),
+ }
+
+ godoOpts = []godo.ClientOpt{godo.WithRetryAndBackoffs(retryConfig)}
 
- client = retryableClient.StandardClient()
  client.Transport = &oauth2.Transport{
  Base: client.Transport,
  Source: oauth2.ReuseTokenSource(nil, tokenSrc),
  }
- } else {
- client = oauth2.NewClient(context.Background(), tokenSrc)
  }
 
- client.Transport = logging.NewTransport("DigitalOcean", client.Transport)
+ godoOpts = append(godoOpts, godo.SetUserAgent(userAgent))
 
- godoOpts := []godo.ClientOpt{godo.SetUserAgent(userAgent)}
  if c.RequestsPerSecond > 0.0 {
  godoOpts = append(godoOpts, godo.SetStaticRateLimit(c.RequestsPerSecond))
  }
 
  godoClient, err := godo.New(client, godoOpts...)
+ clientTransport := logging.NewTransport("DigitalOcean", godoClient.HTTPClient.Transport)
+
+ godoClient.HTTPClient.Transport = clientTransport
+
  if err != nil {
  return nil, err
  }

digitalocean/provider.go

@@ -76,7 +76,7 @@ func Provider() *schema.Provider {
  "http_retry_max": {
  Type: schema.TypeInt,
  Optional: true,
- DefaultFunc: schema.EnvDefaultFunc("DIGITALOCEAN_HTTP_RETRY_MAX", 0),
+ DefaultFunc: schema.EnvDefaultFunc("DIGITALOCEAN_HTTP_RETRY_MAX", 4),
  Description: "The maximum number of retries on a failed API request.",
  },
  "http_retry_wait_min": {

docs/index.md

@@ -70,7 +70,7 @@ The following arguments are supported:
  of retries on a failed API request (client errors, 422, 500, 502...), the exponential 
  backoff can be configured 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`, which means no retries, if unset).
+ `4` 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