From a71b36b245b5382b1aefbec3066d2267cfca1d53 Mon Sep 17 00:00:00 2001 From: Viktor Sokolov Date: Fri, 5 Sep 2025 03:25:46 +0200 Subject: [PATCH] Removed redaundant LocalEnaled --- transport/config.go | 5 +---- transport/transport.go | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/transport/config.go b/transport/config.go index 340ee47c..2cce243d 100644 --- a/transport/config.go +++ b/transport/config.go @@ -16,8 +16,7 @@ import ( type Config struct { HTTP *generichttp.Config - LocalEnabled bool - Local *fs.Config + Local *fs.Config ABSEnabled bool ABS *azure.Config @@ -36,7 +35,6 @@ type Config struct { func NewDefaultConfig() *Config { return &Config{ HTTP: generichttp.NewDefaultConfig(), - LocalEnabled: false, Local: fs.NewDefaultConfig(), ABSEnabled: false, ABS: azure.NewDefaultConfig(), @@ -77,7 +75,6 @@ func LoadFromEnv(c *Config) (*Config, error) { return nil, err } - c.LocalEnabled = config.LocalFileSystemRoot != "" c.ABSEnabled = config.ABSEnabled c.GCSEnabled = config.GCSEnabled c.S3Enabled = config.S3Enabled diff --git a/transport/transport.go b/transport/transport.go index ff1a8703..bb2a5cae 100644 --- a/transport/transport.go +++ b/transport/transport.go @@ -16,10 +16,9 @@ import ( // Transport is a wrapper around http.Transport which allows to track registered protocols type Transport struct { - config *Config - transport *http.Transport - upstreamTransport *http.Transport - schemes map[string]struct{} + config *Config + transport *http.Transport + schemes map[string]struct{} } // New creates a new HTTP transport with no protocols registered @@ -33,11 +32,6 @@ func New(config *Config) (*Transport, error) { return nil, err } - upstreamTransport, err := generichttp.New(false, config.HTTP) - if err != nil { - return nil, err - } - // http and https are always registered schemes := map[string]struct{}{ "http": {}, @@ -45,10 +39,9 @@ func New(config *Config) (*Transport, error) { } t := &Transport{ - config: config, - transport: transport, - upstreamTransport: upstreamTransport, - schemes: schemes, + config: config, + transport: transport, + schemes: schemes, } err = t.registerAllProtocols() @@ -78,12 +71,17 @@ func (t *Transport) IsProtocolRegistered(scheme string) bool { // RegisterAllProtocols registers all enabled protocols in the given transport func (t *Transport) registerAllProtocols() error { + transp, err := generichttp.New(false, t.config.HTTP) + if err != nil { + return err + } + if t.config.Local.Root != "" { t.RegisterProtocol("local", fsTransport.New(t.config.Local)) } if t.config.S3Enabled { - if tr, err := s3Transport.New(t.config.S3, t.upstreamTransport); err != nil { + if tr, err := s3Transport.New(t.config.S3, transp); err != nil { return err } else { t.RegisterProtocol("s3", tr) @@ -91,7 +89,7 @@ func (t *Transport) registerAllProtocols() error { } if t.config.GCSEnabled { - if tr, err := gcsTransport.New(t.config.GCS, t.upstreamTransport); err != nil { + if tr, err := gcsTransport.New(t.config.GCS, transp); err != nil { return err } else { t.RegisterProtocol("gs", tr) @@ -99,7 +97,7 @@ func (t *Transport) registerAllProtocols() error { } if t.config.ABSEnabled { - if tr, err := azureTransport.New(t.config.ABS, t.upstreamTransport); err != nil { + if tr, err := azureTransport.New(t.config.ABS, transp); err != nil { return err } else { t.RegisterProtocol("abs", tr) @@ -107,7 +105,7 @@ func (t *Transport) registerAllProtocols() error { } if t.config.SwiftEnabled { - if tr, err := swiftTransport.New(t.config.Swift, t.upstreamTransport); err != nil { + if tr, err := swiftTransport.New(t.config.Swift, transp); err != nil { return err } else { t.RegisterProtocol("swift", tr)