diff --git a/pkg/internal/cyberark/dataupload/dataupload.go b/pkg/internal/cyberark/dataupload/dataupload.go index 488e44da..a334be2a 100644 --- a/pkg/internal/cyberark/dataupload/dataupload.go +++ b/pkg/internal/cyberark/dataupload/dataupload.go @@ -46,7 +46,7 @@ func NewCyberArkClient(trustedCAs *x509.CertPool, baseURL string, authenticateRe if trustedCAs != nil { tr.TLSClientConfig.RootCAs = trustedCAs } - cyberClient.Transport = transport.DebugWrappers(tr) + cyberClient.Transport = transport.NewDebuggingRoundTripper(tr, transport.DebugByContext) return &CyberArkClient{ baseURL: baseURL, diff --git a/pkg/internal/cyberark/dataupload/dataupload_test.go b/pkg/internal/cyberark/dataupload/dataupload_test.go index 0f9a2819..cadb296a 100644 --- a/pkg/internal/cyberark/dataupload/dataupload_test.go +++ b/pkg/internal/cyberark/dataupload/dataupload_test.go @@ -17,6 +17,8 @@ import ( "github.com/jetstack/preflight/pkg/internal/cyberark/dataupload" "github.com/jetstack/preflight/pkg/internal/cyberark/identity" "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" + + _ "k8s.io/klog/v2/ktesting/init" ) func TestCyberArkClient_PostDataReadingsWithOptions(t *testing.T) { @@ -126,6 +128,11 @@ func TestCyberArkClient_PostDataReadingsWithOptions(t *testing.T) { // An API token is obtained by authenticating with the ARK_USERNAME and ARK_SECRET from the environment. // ARK_SUBDOMAIN should be your tenant subdomain. // ARK_PLATFORM_DOMAIN should be either integration-cyberark.cloud or cyberark.cloud +// +// To enable verbose request logging: +// +// go test ./pkg/internal/cyberark/dataupload/... \ +// -v -count 1 -run TestPostDataReadingsWithOptionsWithRealAPI -args -testing.v 6 func TestPostDataReadingsWithOptionsWithRealAPI(t *testing.T) { platformDomain := os.Getenv("ARK_PLATFORM_DOMAIN") subdomain := os.Getenv("ARK_SUBDOMAIN") @@ -137,7 +144,7 @@ func TestPostDataReadingsWithOptionsWithRealAPI(t *testing.T) { return } - logger := ktesting.NewLogger(t, ktesting.NewConfig()) + logger := ktesting.NewLogger(t, ktesting.DefaultConfig) ctx := klog.NewContext(t.Context(), logger) const ( @@ -165,7 +172,7 @@ func TestPostDataReadingsWithOptionsWithRealAPI(t *testing.T) { cyberArkClient, err := dataupload.NewCyberArkClient(nil, serviceURL, identityClient.AuthenticateRequest) require.NoError(t, err) - err = cyberArkClient.PostDataReadingsWithOptions(t.Context(), api.DataReadingsPost{}, dataupload.Options{ + err = cyberArkClient.PostDataReadingsWithOptions(ctx, api.DataReadingsPost{}, dataupload.Options{ ClusterName: "bb068932-c80d-460d-88df-34bc7f3f3297", }) require.NoError(t, err) diff --git a/pkg/internal/cyberark/identity/identity.go b/pkg/internal/cyberark/identity/identity.go index 12258cda..430fcc1f 100644 --- a/pkg/internal/cyberark/identity/identity.go +++ b/pkg/internal/cyberark/identity/identity.go @@ -12,6 +12,7 @@ import ( "time" "github.com/cenkalti/backoff/v5" + "k8s.io/client-go/transport" "k8s.io/klog/v2" "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" @@ -212,7 +213,8 @@ func NewWithDiscoveryClient(ctx context.Context, discoveryClient *servicediscove return &Client{ client: &http.Client{ - Timeout: 10 * time.Second, + Timeout: 10 * time.Second, + Transport: transport.NewDebuggingRoundTripper(http.DefaultTransport, transport.DebugByContext), }, endpoint: endpoint, diff --git a/pkg/internal/cyberark/servicediscovery/discovery.go b/pkg/internal/cyberark/servicediscovery/discovery.go index 41facba6..5c2cf98a 100644 --- a/pkg/internal/cyberark/servicediscovery/discovery.go +++ b/pkg/internal/cyberark/servicediscovery/discovery.go @@ -9,6 +9,8 @@ import ( "net/url" "time" + "k8s.io/client-go/transport" + "github.com/jetstack/preflight/pkg/version" ) @@ -62,7 +64,8 @@ func WithCustomEndpoint(endpoint string) ClientOpt { func New(clientOpts ...ClientOpt) *Client { client := &Client{ client: &http.Client{ - Timeout: 10 * time.Second, + Timeout: 10 * time.Second, + Transport: transport.NewDebuggingRoundTripper(http.DefaultTransport, transport.DebugByContext), }, endpoint: prodDiscoveryEndpoint, }