Add the client-go debug round tripper to the venafi client

Signed-off-by: Richard Wall <richard.wall@venafi.com>
jetstack · Nov 27, 2024 · 59f1302 · 59f1302
1 parent 2e85bbf
commit 59f1302
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/hack/e2e/values.venafi-kubernetes-agent.yaml b/hack/e2e/values.venafi-kubernetes-agent.yaml
@@ -9,7 +9,4 @@ authentication:
     enabled: true
 
 extraArgs:
-- --logging-format=text
-# Show trace logs for the venafi-connection-lib client
-# See https://github.com/jetstack/venafi-connection-lib/blob/13c2342fe0140ff084d2aabfd29ae3d10721691b/internal/http_client/metrics_transport.go#L93-L115
-- --vmodule=metrics_transport=6
+- --logging-format=json
diff --git a/pkg/client/client_api_token.go b/pkg/client/client_api_token.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/jetstack/preflight/api"
+	"k8s.io/client-go/transport"
 )
 
 type (
@@ -30,12 +31,15 @@ func NewAPITokenClient(agentMetadata *api.AgentMetadata, apiToken, baseURL strin
 	if baseURL == "" {
 		return nil, fmt.Errorf("cannot create APITokenClient: baseURL cannot be empty")
 	}
-
+	httpClient := &http.Client{
+		Timeout:   time.Minute,
+		Transport: transport.DebugWrappers(http.DefaultTransport),
+	}
 	return &APITokenClient{
 		apiToken:      apiToken,
 		agentMetadata: agentMetadata,
 		baseURL:       baseURL,
-		client:        &http.Client{Timeout: time.Minute},
+		client:        httpClient,
 	}, nil
 }
 

diff --git a/pkg/client/client_oauth.go b/pkg/client/client_oauth.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
+	"k8s.io/client-go/transport"
 
 	"github.com/jetstack/preflight/api"
 )
@@ -94,7 +95,10 @@ func NewOAuthClient(agentMetadata *api.AgentMetadata, credentials *OAuthCredenti
 		credentials:   credentials,
 		baseURL:       baseURL,
 		accessToken:   &accessToken{},
-		client:        &http.Client{Timeout: time.Minute},
+		client: &http.Client{
+			Timeout:   time.Minute,
+			Transport: transport.DebugWrappers(http.DefaultTransport),
+		},
 	}, nil
 }
 

diff --git a/pkg/client/client_venafi_cloud.go b/pkg/client/client_venafi_cloud.go
@@ -27,6 +27,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/go-multierror"
 	"github.com/microcosm-cc/bluemonday"
+	"k8s.io/client-go/transport"
 
 	"github.com/jetstack/preflight/api"
 )
@@ -112,7 +113,10 @@ func NewVenafiCloudClient(agentMetadata *api.AgentMetadata, credentials *VenafiS
 		credentials:   credentials,
 		baseURL:       baseURL,
 		accessToken:   &venafiCloudAccessToken{},
-		Client:        &http.Client{Timeout: time.Minute},
+		Client: &http.Client{
+			Timeout:   time.Minute,
+			Transport: transport.DebugWrappers(http.DefaultTransport),
+		},
 		uploaderID:    uploaderID,
 		uploadPath:    uploadPath,
 		privateKey:    privateKey,

diff --git a/pkg/client/client_venconn.go b/pkg/client/client_venconn.go
@@ -19,6 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
+	"k8s.io/client-go/transport"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
 	"github.com/jetstack/preflight/api"
@@ -99,11 +100,11 @@ func NewVenConnClient(restcfg *rest.Config, agentMetadata *api.AgentMetadata, in
 	}
 
 	vcpClient := &http.Client{}
+	tr := http.DefaultTransport.(*http.Transport).Clone()
 	if trustedCAs != nil {
-		tr := http.DefaultTransport.(*http.Transport).Clone()
 		tr.TLSClientConfig.RootCAs = trustedCAs
-		vcpClient.Transport = tr
 	}
+	vcpClient.Transport = transport.DebugWrappers(tr)
 
 	return &VenConnClient{
 		agentMetadata: agentMetadata,