14716: Fixes config type init function naming.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/services/keep-web/cache_test.go b/services/keep-web/cache_test.go
index 2a08ea3b402f112cee91156b3a08621ab056ee78..1f1f6b3bd95133f60e9466d88aa288a8d816b6e8 100644 (file)
--- a/services/keep-web/cache_test.go
+++ b/services/keep-web/cache_test.go
@@ -33,7 +33,7 @@ func (s *UnitSuite) TestCache(c *check.C) {
        arv, err := arvadosclient.MakeArvadosClient()
        c.Assert(err, check.Equals, nil)
 
-       cache := DefaultConfig(s.Config).Cache
+       cache := newConfig(s.Config).Cache
        cache.registry = prometheus.NewRegistry()
 
        // Hit the same collection 5 times using the same token. Only
@@ -114,7 +114,7 @@ func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) {
        arv, err := arvadosclient.MakeArvadosClient()
        c.Assert(err, check.Equals, nil)
 
-       cache := DefaultConfig(s.Config).Cache
+       cache := newConfig(s.Config).Cache
        cache.registry = prometheus.NewRegistry()
 
        for _, forceReload := range []bool{false, true, false, true} {
@@ -134,7 +134,7 @@ func (s *UnitSuite) TestCacheForceReloadByUUID(c *check.C) {
        arv, err := arvadosclient.MakeArvadosClient()
        c.Assert(err, check.Equals, nil)
 
-       cache := DefaultConfig(s.Config).Cache
+       cache := newConfig(s.Config).Cache
        cache.registry = prometheus.NewRegistry()
 
        for _, forceReload := range []bool{false, true, false, true} {

diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index ba0f768358486d8303eda6fac4636106b9eca96c..1d264fc052772809534b0a2db174ca3e91fc3604 100644 (file)
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -39,7 +39,7 @@ func (s *UnitSuite) SetUpTest(c *check.C) {
 }
 
 func (s *UnitSuite) TestCORSPreflight(c *check.C) {
-       h := handler{Config: DefaultConfig(s.Config)}
+       h := handler{Config: newConfig(s.Config)}
        u := mustParseURL("http://keep-web.example/c=" + arvadostest.FooCollection + "/foo")
        req := &http.Request{
                Method:     "OPTIONS",
@@ -89,7 +89,7 @@ func (s *UnitSuite) TestInvalidUUID(c *check.C) {
                        RequestURI: u.RequestURI(),
                }
                resp := httptest.NewRecorder()
-               cfg := DefaultConfig(s.Config)
+               cfg := newConfig(s.Config)
                cfg.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
                h := handler{Config: cfg}
                h.ServeHTTP(resp, req)

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 4a23bebe3b3957787061f41314c7286e3cbba471..0f2cf1237d82a649d5170dc673069b9828de3a05 100644 (file)
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -27,8 +27,7 @@ type Config struct {
        cluster *arvados.Cluster
 }
 
-// DefaultConfig returns the default configuration.
-func DefaultConfig(arvCfg *arvados.Config) *Config {
+func newConfig(arvCfg *arvados.Config) *Config {
        cfg := Config{}
        var cls *arvados.Cluster
        var err error
@@ -79,7 +78,7 @@ func configure(logger log.FieldLogger, args []string) *Config {
        if err != nil {
                log.Fatal(err)
        }
-       cfg := DefaultConfig(arvCfg)
+       cfg := newConfig(arvCfg)
 
        if *dumpConfig {
                out, err := yaml.Marshal(cfg)

diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index edf8b83aa0491d5436f09f10cdd47fd82fec639d..b856090cac4e6557814e040d74a0c87b02e38904 100644 (file)
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -433,7 +433,7 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
        ldr.Path = "-"
        arvCfg, err := ldr.Load()
        c.Check(err, check.IsNil)
-       cfg := DefaultConfig(arvCfg)
+       cfg := newConfig(arvCfg)
        c.Assert(err, check.IsNil)
        cfg.Client = arvados.Client{
                APIHost:  testAPIHost,

diff --git a/services/keep-web/status_test.go b/services/keep-web/status_test.go
index bade825b2c28591bf7ebef6eb2ec39998daaba6b..08e94456eb16b445111d87ec8bb897f90062d370 100644 (file)
--- a/services/keep-web/status_test.go
+++ b/services/keep-web/status_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 func (s *UnitSuite) TestStatus(c *check.C) {
-       h := handler{Config: DefaultConfig(s.Config)}
+       h := handler{Config: newConfig(s.Config)}
        u, _ := url.Parse("http://keep-web.example/status.json")
        req := &http.Request{
                Method:     "GET",