projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 16811-public-favs
[arvados.git]
/
lib
/
config
/
cmd.go
diff --git
a/lib/config/cmd.go
b/lib/config/cmd.go
index 1ca278391a829f63963930538416f496e2497a1b..347e8519a9717dff33eaefee1a3ed2570a4d013c 100644
(file)
--- a/
lib/config/cmd.go
+++ b/
lib/config/cmd.go
@@
-12,8
+12,8
@@
import (
"os"
"os/exec"
"os"
"os/exec"
- "git.
curoverse.com
/arvados.git/sdk/go/arvados"
- "git.
curoverse.com
/arvados.git/sdk/go/ctxlog"
+ "git.
arvados.org
/arvados.git/sdk/go/arvados"
+ "git.
arvados.org
/arvados.git/sdk/go/ctxlog"
"github.com/ghodss/yaml"
"github.com/sirupsen/logrus"
)
"github.com/ghodss/yaml"
"github.com/sirupsen/logrus"
)
@@
-91,6
+91,7
@@
func (checkCommand) RunCommand(prog string, args []string, stdin io.Reader, stdo
flags := flag.NewFlagSet("", flag.ContinueOnError)
flags.SetOutput(stderr)
loader.SetupFlags(flags)
flags := flag.NewFlagSet("", flag.ContinueOnError)
flags.SetOutput(stderr)
loader.SetupFlags(flags)
+ strict := flags.Bool("strict", true, "Strict validation of configuration file (warnings result in non-zero exit code)")
err = flags.Parse(args)
if err == flag.ErrHelp {
err = flags.Parse(args)
if err == flag.ErrHelp {
@@
-148,22
+149,27
@@
func (checkCommand) RunCommand(prog string, args []string, stdin io.Reader, stdo
fmt.Fprintln(stdout, "Your configuration is relying on deprecated entries. Suggest making the following changes.")
stdout.Write(diff)
err = nil
fmt.Fprintln(stdout, "Your configuration is relying on deprecated entries. Suggest making the following changes.")
stdout.Write(diff)
err = nil
- return 1
+ if *strict {
+ return 1
+ }
} else if len(diff) > 0 {
fmt.Fprintf(stderr, "Unexpected diff output:\n%s", diff)
} else if len(diff) > 0 {
fmt.Fprintf(stderr, "Unexpected diff output:\n%s", diff)
- return 1
+ if *strict {
+ return 1
+ }
} else if err != nil {
return 1
}
if logbuf.Len() > 0 {
} else if err != nil {
return 1
}
if logbuf.Len() > 0 {
- return 1
+ if *strict {
+ return 1
+ }
}
if problems {
return 1
}
if problems {
return 1
- } else {
- return 0
}
}
+ return 0
}
func warnAboutProblems(logger logrus.FieldLogger, cfg *arvados.Config) bool {
}
func warnAboutProblems(logger logrus.FieldLogger, cfg *arvados.Config) bool {