Merge pull request scaleway#115 from terraform-providers/http-logging

provider: Enable request/response logging

Author: nicolai86

go.mod

@@ -4,6 +4,7 @@ require (
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/hashicorp/go-retryablehttp v0.5.1
 	github.com/hashicorp/terraform v0.11.12-beta1.0.20190227065421-fc531f54a878
+	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
 	github.com/nicolai86/scaleway-sdk v0.0.0-20181024210327-b20018e944c4
 	github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
 	golang.org/x/crypto v0.0.0-20180211211603-9de5f2eaf759

scaleway/config.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	retryablehttp "github.com/hashicorp/go-retryablehttp"
+	"github.com/hashicorp/terraform/helper/logging"
 	sdk "github.com/nicolai86/scaleway-sdk"
 )
 
@@ -53,27 +54,32 @@ func (c *client) Do(r *http.Request) (*http.Response, error) {
 
 // Client configures and returns a fully initialized Scaleway client
 func (c *Config) Client() (*Client, error) {
+	options := func(sdkApi *sdk.API) {
+		cl := retryablehttp.NewClient()
+
+		cl.HTTPClient.Transport = logging.NewTransport("Scaleway", cl.HTTPClient.Transport)
+		cl.RetryMax = 3
+		cl.RetryWaitMax = 2 * time.Minute
+		cl.Logger = log.New(os.Stderr, "", 0)
+		cl.RetryWaitMin = time.Minute
+		cl.CheckRetry = func(_ context.Context, resp *http.Response, err error) (bool, error) {
+			if resp == nil {
+				return true, err
+			}
+			if resp.StatusCode == http.StatusTooManyRequests {
+				return true, err
+			}
+			return retryablehttp.DefaultRetryPolicy(context.TODO(), resp, err)
+		}
+
+		sdkApi.Client = &client{cl}
+	}
+
 	api, err := sdk.New(
 		c.Organization,
 		c.APIKey,
 		c.Region,
-		func(c *sdk.API) {
-			cl := retryablehttp.NewClient()
-			cl.RetryMax = 3
-			cl.RetryWaitMax = 2 * time.Minute
-			cl.Logger = log.New(os.Stderr, "", 0)
-			cl.RetryWaitMin = time.Minute
-			cl.CheckRetry = func(_ context.Context, resp *http.Response, err error) (bool, error) {
-				if resp == nil {
-					return true, err
-				}
-				if resp.StatusCode == http.StatusTooManyRequests {
-					return true, err
-				}
-				return retryablehttp.DefaultRetryPolicy(context.TODO(), resp, err)
-			}
-			c.Client = &client{cl}
-		},
+		options,
 	)
 	if err != nil {
 		return nil, err

vendor/modules.txt

@@ -101,14 +101,14 @@ github.com/hashicorp/hil/scanner
 github.com/hashicorp/logutils
 # github.com/hashicorp/terraform v0.11.12-beta1.0.20190227065421-fc531f54a878
 github.com/hashicorp/terraform/plugin
+github.com/hashicorp/terraform/helper/logging
 github.com/hashicorp/terraform/helper/resource
 github.com/hashicorp/terraform/helper/schema
 github.com/hashicorp/terraform/helper/validation
 github.com/hashicorp/terraform/terraform
 github.com/hashicorp/terraform/plugin/discovery
 github.com/hashicorp/terraform/config/module
 github.com/hashicorp/terraform/helper/config
-github.com/hashicorp/terraform/helper/logging
 github.com/hashicorp/terraform/config
 github.com/hashicorp/terraform/config/configschema
 github.com/hashicorp/terraform/helper/hashcode