X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6056ef74aca95f22b39c1ccafa3fd406d6be9d4f..472fff42d6105a4457deeb1579e9d14caffc82dc:/lib/cloud/cloudtest/cmd.go diff --git a/lib/cloud/cloudtest/cmd.go b/lib/cloud/cloudtest/cmd.go index 35a78695fd..4816f20ee7 100644 --- a/lib/cloud/cloudtest/cmd.go +++ b/lib/cloud/cloudtest/cmd.go @@ -12,11 +12,11 @@ import ( "io" "os" - "git.curoverse.com/arvados.git/lib/cloud" - "git.curoverse.com/arvados.git/lib/config" - "git.curoverse.com/arvados.git/lib/dispatchcloud" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/lib/cloud" + "git.arvados.org/arvados.git/lib/config" + "git.arvados.org/arvados.git/lib/dispatchcloud" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/ctxlog" "golang.org/x/crypto/ssh" ) @@ -63,7 +63,9 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s logger.Info("exiting") }() - cfg, err := config.LoadFile(*configFile, logger) + loader := config.NewLoader(stdin, logger) + loader.Path = *configFile + cfg, err := loader.Load() if err != nil { return 1 }