[ARVADOS] created: 1.3.0-3125-gffae5e0d4

[Git user]

        at  ffae5e0d4427cf6d41b4f1d270c0cdc29385e2ae (commit)


commit ffae5e0d4427cf6d41b4f1d270c0cdc29385e2ae
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Sep 10 12:55:13 2020 -0400

    16808: add strict mode to arvados-server config-check
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/config/cmd.go b/lib/config/cmd.go
index 1ea0883ac..dd6f1f98c 100644
--- a/lib/config/cmd.go
+++ b/lib/config/cmd.go
@@ -148,15 +148,21 @@ 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
-		return 1
+		if loader.Strict {
+			return 1
+		}
 	} else if len(diff) > 0 {
 		fmt.Fprintf(stderr, "Unexpected diff output:\n%s", diff)
-		return 1
+		if loader.Strict {
+			return 1
+		}
 	} else if err != nil {
 		return 1
 	}
 	if logbuf.Len() > 0 {
-		return 1
+		if loader.Strict {
+			return 1
+		}
 	}
 
 	if problems {
diff --git a/lib/config/load.go b/lib/config/load.go
index be6181bbe..3359dc567 100644
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -29,6 +29,7 @@ type Loader struct {
 	SkipDeprecated bool // Don't load deprecated config keys
 	SkipLegacy     bool // Don't load legacy config files
 	SkipAPICalls   bool // Don't do checks that call RailsAPI/controller
+	Strict         bool // In config-check, any warnings or diff is non-empty will result in a non-zero exit code
 
 	Path                    string
 	KeepstorePath           string
@@ -73,6 +74,7 @@ func (ldr *Loader) SetupFlags(flagset *flag.FlagSet) {
 		flagset.StringVar(&ldr.GitHttpdPath, "legacy-git-httpd-config", defaultGitHttpdConfigPath, "Legacy arv-git-httpd configuration `file`")
 		flagset.StringVar(&ldr.KeepBalancePath, "legacy-keepbalance-config", defaultKeepBalanceConfigPath, "Legacy keep-balance configuration `file`")
 		flagset.BoolVar(&ldr.SkipLegacy, "skip-legacy", false, "Don't load legacy config files")
+		flagset.BoolVar(&ldr.Strict, "strict", true, "Strict validation of configuration file (warnings result in non-zero exit code)")
 	}
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--