Refactor transport package (#1358)

This commit is contained in:
Hidetake Iwata
2025-06-16 18:48:24 +09:00
committed by GitHub
parent b2dbe2beda
commit 7bffbf1e99
3 changed files with 8 additions and 8 deletions

View File

@@ -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,
}

View File

@@ -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)
}

View File

@@ -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),
}