14812: Get defaults and config from arvados-server

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

diff --git a/lib/config/cmd.go b/lib/config/cmd.go
index 41a1d7d2143483b2fc67f647ab8e24492e037420..b08ca0deca4dcd728b7e75678bbc88ffec1b4e9f 100644 (file)
--- a/lib/config/cmd.go
+++ b/lib/config/cmd.go
@@ -6,18 +6,19 @@ package config
 
 import (
        "bytes"
+       "flag"
        "fmt"
        "io"
        "io/ioutil"
        "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"
 )
 
-var DumpCommand cmd.Handler = dumpCommand{}
+var DumpCommand dumpCommand
 
 type dumpCommand struct{}
 
@@ -28,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
        }
@@ -48,7 +61,7 @@ func (dumpCommand) RunCommand(prog string, args []string, stdin io.Reader, stdou
        return 0
 }
 
-var CheckCommand cmd.Handler = checkCommand{}
+var CheckCommand checkCommand
 
 type checkCommand struct{}
 
@@ -59,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
        }
@@ -116,3 +146,34 @@ func (pl *plainLogger) Warnf(format string, args ...interface{}) {
        pl.used = true
        fmt.Fprintf(pl.w, format+"\n", args...)
 }
+
+var DumpDefaultsCommand defaultsCommand
+
+type defaultsCommand struct{}
+
+func (defaultsCommand) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
+       var err error
+       defer func() {
+               if err != nil {
+                       fmt.Fprintf(stderr, "%s\n", err)
+               }
+       }()
+
+       var src map[string]interface{}
+       err = yaml.Unmarshal(DefaultYAML, &src)
+       if err != nil {
+               err = fmt.Errorf("loading default config data: %s", err)
+               return 1
+       }
+       removeSampleKeys(src)
+
+       out, err := yaml.Marshal(src)
+       if err != nil {
+               return 1
+       }
+       _, err = stdout.Write(out)
+       if err != nil {
+               return 1
+       }
+       return 0
+}