Merge branch '16265-security-updates' into dependabot/bundler/apps/workbench/loofah...

[arvados.git] / services / ws / main.go

diff --git a/services/ws/main.go b/services/ws/main.go
index df462eafc2859e6d8aa071dbe851737cf3be2037..5b42c442100ecaddbd9521254d7efd7450bf4b73 100644 (file)
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -9,48 +9,69 @@ import (
        "fmt"
        "os"
 
-       "git.curoverse.com/arvados.git/sdk/go/config"
-       "git.curoverse.com/arvados.git/sdk/go/ctxlog"
+       "git.arvados.org/arvados.git/lib/config"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/ctxlog"
+       "github.com/ghodss/yaml"
+       "github.com/sirupsen/logrus"
 )
 
 var logger = ctxlog.FromContext
 var version = "dev"
 
-func main() {
-       log := logger(nil)
+func configure(log logrus.FieldLogger, args []string) *arvados.Cluster {
+       flags := flag.NewFlagSet(args[0], flag.ExitOnError)
+       dumpConfig := flags.Bool("dump-config", false, "show current configuration and exit")
+       getVersion := flags.Bool("version", false, "Print version information and exit.")
+
+       loader := config.NewLoader(nil, log)
+       loader.SetupFlags(flags)
+       args = loader.MungeLegacyConfigArgs(log, args[1:], "-legacy-ws-config")
 
-       configPath := flag.String("config", "/etc/arvados/ws/ws.yml", "`path` to config file")
-       dumpConfig := flag.Bool("dump-config", false, "show current configuration and exit")
-       getVersion := flag.Bool("version", false, "Print version information and exit.")
-       cfg := defaultConfig()
-       flag.Parse()
+       flags.Parse(args)
 
        // Print version information if requested
        if *getVersion {
-               fmt.Printf("Version: %s\n", version)
-               os.Exit(0)
+               fmt.Printf("arvados-ws %s\n", version)
+               return nil
        }
 
-       err := config.LoadFile(&cfg, *configPath)
+       cfg, err := loader.Load()
        if err != nil {
                log.Fatal(err)
        }
 
-       ctxlog.SetLevel(cfg.LogLevel)
-       ctxlog.SetFormat(cfg.LogFormat)
+       cluster, err := cfg.GetCluster("")
+       if err != nil {
+               log.Fatal(err)
+       }
+
+       ctxlog.SetLevel(cluster.SystemLogs.LogLevel)
+       ctxlog.SetFormat(cluster.SystemLogs.Format)
 
        if *dumpConfig {
-               txt, err := config.Dump(&cfg)
+               out, err := yaml.Marshal(cfg)
                if err != nil {
                        log.Fatal(err)
                }
-               fmt.Print(string(txt))
-               return
+               _, err = os.Stdout.Write(out)
+               if err != nil {
+                       log.Fatal(err)
+               }
+               return nil
        }
+       return cluster
+}
+
+func main() {
+       log := logger(nil)
 
-       log.Printf("arvados-ws %q started", version)
+       cluster := configure(log, os.Args)
+       if cluster == nil {
+               return
+       }
 
-       log.Info("started")
-       srv := &server{wsConfig: &cfg}
+       log.Printf("arvados-ws %s started", version)
+       srv := &server{cluster: cluster}
        log.Fatal(srv.Run())
 }