[arvados] updated: 2.1.0-2961-gd5df19fdf

[git repository hosting]

Summary of changes:
 lib/diagnostics/cmd.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

       via  d5df19fdff62724f9faeb3bee17201363071bf9e (commit)
      from  bef451193ffe6c7239c545ed1c93769b50c9e0a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d5df19fdff62724f9faeb3bee17201363071bf9e
Author: Tom Clegg <tom at curii.com>
Date:   Thu Oct 27 10:07:43 2022 -0400

    19377: Usage error if config is readable but does not match env.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/diagnostics/cmd.go b/lib/diagnostics/cmd.go
index c944db666..9c229c9b4 100644
--- a/lib/diagnostics/cmd.go
+++ b/lib/diagnostics/cmd.go
@@ -157,8 +157,7 @@ func (diag *diagnoser) runtests() {
 			return err
 		}
 		if cluster.SystemRootToken != os.Getenv("ARVADOS_API_TOKEN") {
-			diag.infof("skipping because SystemRootToken read from %s does not match $ARVADOS_API_TOKEN (consider using 'arvados-client sudo diagnostics' to load endpoint and token from config file instead of environment)", ldr.Path)
-			return nil
+			return fmt.Errorf("diagnostics usage error: %s is readable but SystemRootToken does not match $ARVADOS_API_TOKEN (to fix, either run 'arvados-client sudo diagnostics' to load everything from config file, or set ARVADOS_CONFIG=- to load nothing from config file)", ldr.Path)
 		}
 		agg := &health.Aggregator{Cluster: cluster}
 		resp := agg.ClusterHealth()

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


hooks/post-receive
--