Centralize http transport logging config

Author: brandonc

internal/client/client.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"net/http"
 	"net/url"
 	"os"
 	"sort"
@@ -16,7 +15,6 @@ import (
 
 	tfe "github.com/hashicorp/go-tfe"
 	"github.com/hashicorp/go-version"
-	"github.com/hashicorp/terraform-provider-tfe/internal/logging"
 	providerVersion "github.com/hashicorp/terraform-provider-tfe/version"
 	svchost "github.com/hashicorp/terraform-svchost"
 	"github.com/hashicorp/terraform-svchost/disco"
@@ -143,19 +141,12 @@ func GetClient(tfeHost, token string, insecure bool) (*tfe.Client, error) {
 		return nil, discoErr
 	}
 
-	// Wrap the configured transport to enable logging.
-	transport := config.HTTPClient.Transport.(*http.Transport)
-	config.HTTPClient.Transport = logging.NewLoggingTransport("TFE", transport)
-
-	// Create a new TFE client config
-	cfg := &tfe.Config{
+	// Create a new TFE client.
+	client, err := tfe.NewClient(&tfe.Config{
 		Address:    address.String(),
 		Token:      token,
 		HTTPClient: config.HTTPClient,
-	}
-
-	// Create a new TFE client.
-	client, err := tfe.NewClient(cfg)
+	})
 	if err != nil {
 		return nil, err
 	}

internal/client/config.go

@@ -21,6 +21,11 @@ import (
 	"github.com/hashicorp/terraform-svchost/disco"
 )
 
+var (
+	// TFEUserAgent is the user agent string sent with all requests made by the provider
+	TFEUserAgent = fmt.Sprintf("terraform-provider-tfe/%s", providerVersion.ProviderVersion)
+)
+
 type CredentialsMap map[string]map[string]interface{}
 
 // CLIHostConfig is the structure of the configuration for the Terraform CLI.
@@ -210,8 +215,8 @@ func configure(tfeHost, token string, insecure bool) (*ClientConfiguration, erro
 	// Create a new credential source and service discovery object.
 	credsSrc := credentialsSource(config.Credentials)
 	services := disco.NewWithCredentialsSource(credsSrc)
-	services.SetUserAgent(fmt.Sprintf("terraform-provider-tfe/%s", providerVersion.ProviderVersion))
-	services.Transport = logging.NewLoggingTransport("TFE Discovery", transport)
+	services.SetUserAgent(TFEUserAgent)
+	services.Transport = logging.NewLoggingTransport("TFE", transport)
 
 	// Add any static host configurations service discovery object.
 	for userHost, hostConfig := range config.Hosts {