15003: Use config lib for arvados-server.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/lib/config/load.go b/lib/config/load.go
index e16a6e4b711053960816bdcc1fb3dc4a1b602254..159dd65dc0d021c0d482589efa09021c1043dbc2 100644 (file)
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -27,6 +27,15 @@ type deprecatedConfig struct {
        }
 }
 
+func LoadFile(path string, log logger) (*arvados.Config, error) {
+       f, err := os.Open(path)
+       if err != nil {
+               return nil, err
+       }
+       defer f.Close()
+       return Load(f, log)
+}
+
 func Load(rdr io.Reader, log logger) (*arvados.Config, error) {
        var cfg arvados.Config
        buf, err := ioutil.ReadAll(rdr)

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index e853da943222aa2182b01f41d12ebb3cbec5193a..4b7341d7294d44a94f6422534dfc8780eab0c7db 100644 (file)
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -15,6 +15,7 @@ import (
        "os"
 
        "git.curoverse.com/arvados.git/lib/cmd"
+       "git.curoverse.com/arvados.git/lib/config"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/ctxlog"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
@@ -69,7 +70,7 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
        } else if err != nil {
                return 2
        }
-       cfg, err := arvados.GetConfig(*configFile)
+       cfg, err := config.LoadFile(*configFile, log)
        if err != nil {
                return 1
        }

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 6687ca491a769140aa8c803a5fd2b1a6ce3b1850..4607365c55243eb44e4eefb6535710dc3c383612 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -417,10 +417,10 @@ Clusters:
     PostgreSQL:
       ConnectionPool: 32
       Connection:
-        host: {}
-        dbname: {}
-        user: {}
-        password: {}
+        Host: {}
+        DBName: {}
+        User: {}
+        Password: {}
     NodeProfiles:
       "*":
         "arvados-controller":