Merge branch '15000-config-api'

refs #15000

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

diff --cc lib/config/cmd.go
index 858bfc2b26a7e6deb90142c0f7d5904e18ef1474,39df4ec170c4ef13f89ef778b43eb67a1e1e675c..a41e4b0331548f977d69b3ce993795c51e28ea1d
--- 1/lib/config/cmd.go
--- 2/lib/config/cmd.go
+++ b/lib/config/cmd.go
@@@ -13,8 -12,6 +13,7 @@@ import 
        "os"
        "os/exec"
  
-       "git.curoverse.com/arvados.git/lib/cmd"
 +      "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/ctxlog"
        "github.com/ghodss/yaml"
  )

diff --cc lib/config/cmd_test.go
index d77003b478112e6ee3960e65541bb9fe1dc0a083,fdcb6cc7673dce492e7abbb5fa6873e339e7b3f5..f2915a03917260aa07fd5c656b5a1b9c7833757f
--- 1/lib/config/cmd_test.go
--- 2/lib/config/cmd_test.go
+++ b/lib/config/cmd_test.go
@@@ -50,9 -57,9 +57,9 @@@ Clusters
    RequestLimits:
      MaxItemsPerResponse: 1234
  `
 -      code := CheckCommand.RunCommand("arvados config-check", nil, bytes.NewBufferString(in), &stdout, &stderr)
 +      code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr)
        c.Check(code, check.Equals, 1)
-       c.Check(stdout.String(), check.Matches, `(?ms).*API:\n\- +.*MaxItemsPerResponse: 1000\n\+ +MaxItemsPerResponse: 1234\n.*`)
+       c.Check(stdout.String(), check.Matches, `(?ms).*\n\- +.*MaxItemsPerResponse: 1000\n\+ +MaxItemsPerResponse: 1234\n.*`)
  }
  
  func (s *CommandSuite) TestCheckUnknownKey(c *check.C) {