Switch to retryable http client

Addresses digitalocean#546
tback · Mar 31, 2022 · edfa932 · edfa932
1 parent 83a079d
commit edfa932
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/digitalocean/config.go b/digitalocean/config.go
@@ -13,6 +13,7 @@ import (
  "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"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
  "golang.org/x/oauth2"
@@ -70,7 +71,12 @@ func (c *Config) Client() (*CombinedConfig, error) {
  })
 
  userAgent := fmt.Sprintf("Terraform/%s", c.TerraformVersion)
- client := oauth2.NewClient(oauth2.NoContext, tokenSrc)
+ client := retryablehttp.NewClient().StandardClient()
+
+ client.Transport = &oauth2.Transport{
+ Base: client.Transport,
+ Source: oauth2.ReuseTokenSource(nil, tokenSrc),
+ }
 
  client.Transport = logging.NewTransport("DigitalOcean", client.Transport)
 

diff --git a/go.mod b/go.mod
@@ -6,6 +6,7 @@ require (
  github.com/golang/protobuf v1.5.2 // indirect
  github.com/google/go-querystring v1.1.0 // indirect
  github.com/hashicorp/awspolicyequivalence v1.5.0
+ github.com/hashicorp/go-retryablehttp v0.7.0
  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

diff --git a/go.sum b/go.sum
@@ -180,6 +180,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=
@@ -189,6 +190,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.0 h1:eu1EI/mbirUgP5C8hVsTNaGZreBDlYiwC1FZWkvQPQ4=
+github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 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=

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -106,6 +106,9 @@ github.com/hashicorp/go-multierror
 # github.com/hashicorp/go-plugin v1.4.1
 github.com/hashicorp/go-plugin
 github.com/hashicorp/go-plugin/internal/plugin
+# github.com/hashicorp/go-retryablehttp v0.7.0
+## explicit
+github.com/hashicorp/go-retryablehttp
 # github.com/hashicorp/go-uuid v1.0.2
 ## explicit
 github.com/hashicorp/go-uuid