Skip to content

Commit a39890b

Browse files
DarthSimDarthSim
committed
LoadFromEnv -> LoadConfigFromEnv
1 parent 269e28b commit a39890b

17 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎fetcher/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ func NewDefaultConfig() *Config {
2727
}
2828
}
2929

30-
// LoadFromEnv loads config variables from env
31-
func LoadFromEnv(c *Config) (*Config, error) {
30+
// LoadConfigFromEnv loads config variables from env
31+
func LoadConfigFromEnv(c *Config) (*Config, error) {
3232
c.UserAgent = config.UserAgent
3333
c.DownloadTimeout = time.Duration(config.DownloadTimeout) * time.Second
3434
c.MaxRedirects = config.MaxRedirects

‎handlers/processing/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func NewDefaultConfig() *Config {
3333
}
3434
}
3535

36-
// LoadFromEnv loads config from environment variables
37-
func LoadFromEnv(c *Config) (*Config, error) {
36+
// LoadConfigFromEnv loads config from environment variables
37+
func LoadConfigFromEnv(c *Config) (*Config, error) {
3838
c.PathPrefix = config.PathPrefix
3939
c.CookiePassthrough = config.CookiePassthrough
4040
c.ReportDownloadingErrors = config.ReportDownloadingErrors

‎handlers/stream/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func NewDefaultConfig() *Config {
3838
}
3939
}
4040

41-
// LoadFromEnv loads config variables from environment
42-
func LoadFromEnv(c *Config) (*Config, error) {
41+
// LoadConfigFromEnv loads config variables from environment
42+
func LoadConfigFromEnv(c *Config) (*Config, error) {
4343
c.CookiePassthrough = config.CookiePassthrough
4444
return c, nil
4545
}

‎handlers/stream/handler_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (s *HandlerTestSuite) SetupTest() {
4949
config.Reset()
5050
config.AllowLoopbackSourceAddresses = true
5151

52-
trc, err := transport.LoadFromEnv(transport.NewDefaultConfig())
52+
trc, err := transport.LoadConfigFromEnv(transport.NewDefaultConfig())
5353
s.Require().NoError(err)
5454

5555
tr, err := transport.New(trc)
@@ -349,7 +349,7 @@ func (s *HandlerTestSuite) TestHandlerCacheControl() {
349349
}))
350350
defer ts.Close()
351351

352-
trc, err := transport.LoadFromEnv(transport.NewDefaultConfig())
352+
trc, err := transport.LoadConfigFromEnv(transport.NewDefaultConfig())
353353
s.Require().NoError(err)
354354

355355
// Create new handler with updated config for each test
@@ -446,7 +446,7 @@ func (s *HandlerTestSuite) TestHandlerErrorResponse() {
446446

447447
// TestHandlerCookiePassthrough tests the cookie passthrough behavior of the streaming service.
448448
func (s *HandlerTestSuite) TestHandlerCookiePassthrough() {
449-
trc, err := transport.LoadFromEnv(transport.NewDefaultConfig())
449+
trc, err := transport.LoadConfigFromEnv(transport.NewDefaultConfig())
450450
s.Require().NoError(err)
451451

452452
// Create new handler with updated config
@@ -506,7 +506,7 @@ func (s *HandlerTestSuite) TestHandlerCanonicalHeader() {
506506
defer ts.Close()
507507

508508
for _, sc := range []bool{true, false} {
509-
trc, err := transport.LoadFromEnv(transport.NewDefaultConfig())
509+
trc, err := transport.LoadConfigFromEnv(transport.NewDefaultConfig())
510510
s.Require().NoError(err)
511511

512512
// Create new handler with updated config

‎headerwriter/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func NewDefaultConfig() *Config {
2828
}
2929
}
3030

31-
// LoadFromEnv overrides configuration variables from environment
32-
func LoadFromEnv(c *Config) (*Config, error) {
31+
// LoadConfigFromEnv overrides configuration variables from environment
32+
func LoadConfigFromEnv(c *Config) (*Config, error) {
3333
c.SetCanonicalHeader = config.SetCanonicalHeader
3434
c.DefaultTTL = config.TTL
3535
c.FallbackImageTTL = config.FallbackImageTTL

‎imagedata/image_data_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ func (s *ImageDataTestSuite) SetupSuite() {
7070
rw.Write(data)
7171
}))
7272

73-
ctr, err := transport.LoadFromEnv(transport.NewDefaultConfig())
73+
ctr, err := transport.LoadConfigFromEnv(transport.NewDefaultConfig())
7474
s.Require().NoError(err)
7575

7676
ts, err := transport.New(ctr)
7777
s.Require().NoError(err)
7878

79-
c, err := fetcher.LoadFromEnv(fetcher.NewDefaultConfig())
79+
c, err := fetcher.LoadConfigFromEnv(fetcher.NewDefaultConfig())
8080
s.Require().NoError(err)
8181

8282
fetcher, err := fetcher.New(ts, c)

‎main.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const (
4646

4747
func callHandleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) error {
4848
// NOTE: This is temporary, will be moved level up at once
49-
hwc, err := headerwriter.LoadFromEnv(headerwriter.NewDefaultConfig())
49+
hwc, err := headerwriter.LoadConfigFromEnv(headerwriter.NewDefaultConfig())
5050
if err != nil {
5151
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
5252
}
@@ -56,12 +56,12 @@ func callHandleProcessing(reqID string, rw http.ResponseWriter, r *http.Request)
5656
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
5757
}
5858

59-
sc, err := stream.LoadFromEnv(stream.NewDefaultConfig())
59+
sc, err := stream.LoadConfigFromEnv(stream.NewDefaultConfig())
6060
if err != nil {
6161
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
6262
}
6363

64-
tcfg, err := transport.LoadFromEnv(transport.NewDefaultConfig())
64+
tcfg, err := transport.LoadConfigFromEnv(transport.NewDefaultConfig())
6565
if err != nil {
6666
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
6767
}
@@ -71,7 +71,7 @@ func callHandleProcessing(reqID string, rw http.ResponseWriter, r *http.Request)
7171
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
7272
}
7373

74-
fc, err := fetcher.LoadFromEnv(fetcher.NewDefaultConfig())
74+
fc, err := fetcher.LoadConfigFromEnv(fetcher.NewDefaultConfig())
7575
if err != nil {
7676
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
7777
}
@@ -88,12 +88,12 @@ func callHandleProcessing(reqID string, rw http.ResponseWriter, r *http.Request)
8888
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
8989
}
9090

91-
phc, err := processingHandler.LoadFromEnv(processingHandler.NewDefaultConfig())
91+
phc, err := processingHandler.LoadConfigFromEnv(processingHandler.NewDefaultConfig())
9292
if err != nil {
9393
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
9494
}
9595

96-
semc, err := semaphores.LoadFromEnv(semaphores.NewDefaultConfig())
96+
semc, err := semaphores.LoadConfigFromEnv(semaphores.NewDefaultConfig())
9797
if err != nil {
9898
return ierrors.Wrap(err, 0, ierrors.WithCategory(categoryConfig))
9999
}
@@ -240,7 +240,7 @@ func run(ctx context.Context) error {
240240
return err
241241
}
242242

243-
cfg, err := server.LoadFromEnv(server.NewDefaultConfig())
243+
cfg, err := server.LoadConfigFromEnv(server.NewDefaultConfig())
244244
if err != nil {
245245
return err
246246
}

‎processing_handler_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ func (s *ProcessingHandlerTestSuite) readTestImageData(name string) imagedata.Im
108108
// because currently configuration is changed via env vars
109109
// or config. We need to pick up those config changes.
110110
// This will be addressed in the next PR
111-
trc, err := transport.LoadFromEnv(transport.NewDefaultConfig())
111+
trc, err := transport.LoadConfigFromEnv(transport.NewDefaultConfig())
112112
s.Require().NoError(err)
113113

114114
tr, err := transport.New(trc)
115115
s.Require().NoError(err)
116116

117-
fc, err := fetcher.LoadFromEnv(fetcher.NewDefaultConfig())
117+
fc, err := fetcher.LoadConfigFromEnv(fetcher.NewDefaultConfig())
118118
s.Require().NoError(err)
119119

120120
f, err := fetcher.New(tr, fc)

‎semaphores/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ func NewDefaultConfig() *Config {
2121
}
2222
}
2323

24-
// LoadFromEnv loads config from environment variables
25-
func LoadFromEnv(c *Config) (*Config, error) {
24+
// LoadConfigFromEnv loads config from environment variables
25+
func LoadConfigFromEnv(c *Config) (*Config, error) {
2626
c.RequestsQueueSize = config.RequestsQueueSize
2727
c.Workers = config.Workers
2828

‎server/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ func NewDefaultConfig() *Config {
5050
}
5151
}
5252

53-
// LoadFromEnv overrides current values with environment variables
54-
func LoadFromEnv(c *Config) (*Config, error) {
53+
// LoadConfigFromEnv overrides current values with environment variables
54+
func LoadConfigFromEnv(c *Config) (*Config, error) {
5555
c.Network = config.Network
5656
c.Bind = config.Bind
5757
c.PathPrefix = config.PathPrefix

0 commit comments

Comments
 (0)