Merge branch '15000-config-api'

[arvados.git] / lib / config / cmd.go

diff --git a/lib/config/cmd.go b/lib/config/cmd.go
index 39df4ec170c4ef13f89ef778b43eb67a1e1e675c..a41e4b0331548f977d69b3ce993795c51e28ea1d 100644 (file)
--- a/lib/config/cmd.go
+++ b/lib/config/cmd.go
@@ -6,12 +6,14 @@ package config
 
 import (
        "bytes"
+       "flag"
        "fmt"
        "io"
        "io/ioutil"
        "os"
        "os/exec"
 
+       "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/ctxlog"
        "github.com/ghodss/yaml"
 )
@@ -27,12 +29,24 @@ func (dumpCommand) RunCommand(prog string, args []string, stdin io.Reader, stdou
                        fmt.Fprintf(stderr, "%s\n", err)
                }
        }()
-       if len(args) != 0 {
-               err = fmt.Errorf("usage: %s <config-src.yaml >config-min.yaml", prog)
+
+       flags := flag.NewFlagSet("", flag.ContinueOnError)
+       flags.SetOutput(stderr)
+       configFile := flags.String("config", arvados.DefaultConfigFile, "Site configuration `file`")
+       err = flags.Parse(args)
+       if err == flag.ErrHelp {
+               err = nil
+               return 0
+       } else if err != nil {
+               return 2
+       }
+
+       if len(flags.Args()) != 0 {
+               flags.Usage()
                return 2
        }
        log := ctxlog.New(stderr, "text", "info")
-       cfg, err := Load(stdin, log)
+       cfg, err := loadFileOrStdin(*configFile, stdin, log)
        if err != nil {
                return 1
        }
@@ -58,12 +72,29 @@ func (checkCommand) RunCommand(prog string, args []string, stdin io.Reader, stdo
                        fmt.Fprintf(stderr, "%s\n", err)
                }
        }()
-       if len(args) != 0 {
-               err = fmt.Errorf("usage: %s <config-src.yaml && echo 'no changes needed'", prog)
+
+       flags := flag.NewFlagSet("", flag.ContinueOnError)
+       flags.SetOutput(stderr)
+       configFile := flags.String("config", arvados.DefaultConfigFile, "Site configuration `file`")
+       err = flags.Parse(args)
+       if err == flag.ErrHelp {
+               err = nil
+               return 0
+       } else if err != nil {
+               return 2
+       }
+
+       if len(flags.Args()) != 0 {
+               flags.Usage()
                return 2
        }
        log := &plainLogger{w: stderr}
-       buf, err := ioutil.ReadAll(stdin)
+       var buf []byte
+       if *configFile == "-" {
+               buf, err = ioutil.ReadAll(stdin)
+       } else {
+               buf, err = ioutil.ReadFile(*configFile)
+       }
        if err != nil {
                return 1
        }