[ARVADOS] updated: 1.3.0-1288-g05eca3060
Git user
git at public.curoverse.com
Thu Jul 11 19:22:29 UTC 2019
Summary of changes:
lib/config/cmd.go | 8 ++++++++
lib/config/load.go | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
via 05eca3060c7200e47dd83cdcf8f4f7bcad14f62f (commit)
from 3a81f54c8c0da6babdfb9014a64079b6b41f73c7 (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 05eca3060c7200e47dd83cdcf8f4f7bcad14f62f
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Jul 11 15:22:22 2019 -0400
13647: Add comments.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/lib/config/cmd.go b/lib/config/cmd.go
index 7889d85c8..5cb76fc35 100644
--- a/lib/config/cmd.go
+++ b/lib/config/cmd.go
@@ -104,6 +104,14 @@ func (checkCommand) RunCommand(prog string, args []string, stdin io.Reader, stdo
return 2
}
+ // Load the config twice -- once without loading deprecated
+ // keys/files, once with -- and then compare the two resulting
+ // configs. This reveals whether the deprecated keys/files
+ // have any effect on the final configuration.
+ //
+ // If they do, show the operator how to update their config
+ // such that the deprecated keys/files are superfluous and can
+ // be deleted.
loader.SkipDeprecated = true
withoutDepr, err := loader.Load()
if err != nil {
diff --git a/lib/config/load.go b/lib/config/load.go
index a11878bcc..897d99d51 100644
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -26,7 +26,7 @@ var ErrNoClustersDefined = errors.New("config does not define any clusters")
type Loader struct {
Stdin io.Reader
Logger logrus.FieldLogger
- SkipDeprecated bool
+ SkipDeprecated bool // Don't load legacy/deprecated config keys/files
Path string
KeepstorePath string
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list