X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/25d42fc3206cd6073d4a9d8358469628643fe1da..343e87375ce53c0b9c4234ed69206b31e206c877:/lib/config/cmd.go?ds=inline

diff --git a/lib/config/cmd.go b/lib/config/cmd.go
index 5cb76fc35d..d64106fbce 100644
--- a/lib/config/cmd.go
+++ b/lib/config/cmd.go
@@ -12,7 +12,8 @@ import (
 	"os"
 	"os/exec"
 
-	"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"
 )
@@ -113,15 +114,21 @@ func (checkCommand) RunCommand(prog string, args []string, stdin io.Reader, stdo
 	// such that the deprecated keys/files are superfluous and can
 	// be deleted.
 	loader.SkipDeprecated = true
+	loader.SkipLegacy = true
 	withoutDepr, err := loader.Load()
 	if err != nil {
 		return 1
 	}
 	loader.SkipDeprecated = false
+	loader.SkipLegacy = false
 	withDepr, err := loader.Load()
 	if err != nil {
 		return 1
 	}
+	problems := false
+	if warnAboutProblems(logger, withDepr) {
+		problems = true
+	}
 	cmd := exec.Command("diff", "-u", "--label", "without-deprecated-configs", "--label", "relying-on-deprecated-configs", "/dev/fd/3", "/dev/fd/4")
 	for _, obj := range []interface{}{withoutDepr, withDepr} {
 		y, _ := yaml.Marshal(obj)
@@ -151,7 +158,27 @@ func (checkCommand) RunCommand(prog string, args []string, stdin io.Reader, stdo
 	if logbuf.Len() > 0 {
 		return 1
 	}
-	return 0
+
+	if problems {
+		return 1
+	} else {
+		return 0
+	}
+}
+
+func warnAboutProblems(logger logrus.FieldLogger, cfg *arvados.Config) bool {
+	warned := false
+	for id, cc := range cfg.Clusters {
+		if cc.SystemRootToken == "" {
+			logger.Warnf("Clusters.%s.SystemRootToken is empty; see https://doc.arvados.org/master/install/install-keepstore.html", id)
+			warned = true
+		}
+		if cc.ManagementToken == "" {
+			logger.Warnf("Clusters.%s.ManagementToken is empty; see https://doc.arvados.org/admin/management-token.html", id)
+			warned = true
+		}
+	}
+	return warned
 }
 
 var DumpDefaultsCommand defaultsCommand