From 7bffbf1e9994ad0e86a832747d431e4202ca2217 Mon Sep 17 00:00:00 2001
From: Hidetake Iwata <int128@gmail.com>
Date: Mon, 16 Jun 2025 18:48:24 +0900
Subject: [PATCH] Refactor transport package (#1358)

---
 pkg/oidc/client/factory.go                                  | 4 ++--
 .../client/{logging/transport.go => transport/logging.go}   | 6 +++---
 .../transport_test.go => transport/logging_test.go}         | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename pkg/oidc/client/{logging/transport.go => transport/logging.go} (88%)
 rename pkg/oidc/client/{logging/transport_test.go => transport/logging_test.go} (90%)

diff --git a/pkg/oidc/client/factory.go b/pkg/oidc/client/factory.go
index 2217fb1..dfdf318 100644
--- a/pkg/oidc/client/factory.go
+++ b/pkg/oidc/client/factory.go
@@ -12,7 +12,7 @@ import (
 	"github.com/int128/kubelogin/pkg/infrastructure/clock"
 	"github.com/int128/kubelogin/pkg/infrastructure/logger"
 	"github.com/int128/kubelogin/pkg/oidc"
-	"github.com/int128/kubelogin/pkg/oidc/client/logging"
+	"github.com/int128/kubelogin/pkg/oidc/client/transport"
 	"github.com/int128/kubelogin/pkg/pkce"
 	"github.com/int128/kubelogin/pkg/tlsclientconfig"
 	"github.com/int128/kubelogin/pkg/tlsclientconfig/loader"
@@ -44,7 +44,7 @@ func (f *Factory) New(ctx context.Context, prov oidc.Provider, tlsClientConfig t
 		TLSClientConfig: rawTLSClientConfig,
 		Proxy:           http.ProxyFromEnvironment,
 	}
-	loggingTransport := &logging.Transport{
+	loggingTransport := &transport.WithLogging{
 		Base:   baseTransport,
 		Logger: f.Logger,
 	}
diff --git a/pkg/oidc/client/logging/transport.go b/pkg/oidc/client/transport/logging.go
similarity index 88%
rename from pkg/oidc/client/logging/transport.go
rename to pkg/oidc/client/transport/logging.go
index 035f99d..454a3ac 100644
--- a/pkg/oidc/client/logging/transport.go
+++ b/pkg/oidc/client/transport/logging.go
@@ -1,4 +1,4 @@
-package logging
+package transport
 
 import (
 	"net/http"
@@ -12,12 +12,12 @@ const (
 	levelDumpBody    = 3
 )
 
-type Transport struct {
+type WithLogging struct {
 	Base   http.RoundTripper
 	Logger logger.Interface
 }
 
-func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
+func (t *WithLogging) RoundTrip(req *http.Request) (*http.Response, error) {
 	if !t.Logger.IsEnabled(levelDumpHeaders) {
 		return t.Base.RoundTrip(req)
 	}
diff --git a/pkg/oidc/client/logging/transport_test.go b/pkg/oidc/client/transport/logging_test.go
similarity index 90%
rename from pkg/oidc/client/logging/transport_test.go
rename to pkg/oidc/client/transport/logging_test.go
index 2af43fc..cc3203c 100644
--- a/pkg/oidc/client/logging/transport_test.go
+++ b/pkg/oidc/client/transport/logging_test.go
@@ -1,4 +1,4 @@
-package logging
+package transport
 
 import (
 	"bufio"
@@ -20,7 +20,7 @@ func (t *mockTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	return t.resp, nil
 }
 
-func TestLoggingTransport_RoundTrip(t *testing.T) {
+func TestWithLogging_RoundTrip(t *testing.T) {
 	req := httptest.NewRequest("GET", "http://example.com/hello", nil)
 	resp, err := http.ReadResponse(bufio.NewReader(strings.NewReader(`HTTP/1.1 200 OK
 Host: example.com
@@ -35,7 +35,7 @@ dummy`)), req)
 		}
 	}()
 
-	transport := &Transport{
+	transport := &WithLogging{
 		Base:   &mockTransport{resp: resp},
 		Logger: logger.New(t),
 	}