[ARVADOS] updated: 2.1.0-923-g2d3723c30

[Git user]

Summary of changes:
 lib/config/load.go      | 7 +++++++
 lib/config/load_test.go | 8 +++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

       via  2d3723c301085ebfcb1f3a8940451edc15f10f93 (commit)
       via  df90bb0a37a7e6fc3c18afd3e000a71fb7cc11e2 (commit)
      from  4b5ec8651ba83f2a79fe40708021e03c86275093 (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 2d3723c301085ebfcb1f3a8940451edc15f10f93
Author: Tom Clegg <tom at curii.com>
Date:   Tue Jun 15 18:31:08 2021 -0400

    17803: Note todo's.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/load.go b/lib/config/load.go
index 15174ae9c..169b252a0 100644
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -182,6 +182,11 @@ func (ldr *Loader) Load() (*arvados.Config, error) {
 		ldr.configdata = buf
 	}
 
+	// FIXME: We should reject YAML if the same key is used twice
+	// in a map/object, like {foo: bar, foo: baz}. Maybe we'll get
+	// this fixed free when we upgrade ghodss/yaml to a version
+	// that uses go-yaml v3.
+
 	// Load the config into a dummy map to get the cluster ID
 	// keys, discarding the values; then set up defaults for each
 	// cluster ID; then load the real config on top of the
@@ -291,6 +296,8 @@ func (ldr *Loader) Load() (*arvados.Config, error) {
 			checkKeyConflict(fmt.Sprintf("Clusters.%s.PostgreSQL.Connection", id), cc.PostgreSQL.Connection),
 			ldr.checkEmptyKeepstores(cc),
 			ldr.checkUnlistedKeepstores(cc),
+			// TODO: check non-empty Rendezvous on
+			// services other than Keepstore
 		} {
 			if err != nil {
 				return nil, err

commit df90bb0a37a7e6fc3c18afd3e000a71fb7cc11e2
Author: Tom Clegg <tom at curii.com>
Date:   Tue Jun 15 18:22:51 2021 -0400

    17803: Fix unnecessarily convoluted test case.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/load_test.go b/lib/config/load_test.go
index 3e0368cc0..396faca48 100644
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@ -209,18 +209,16 @@ Clusters:
       KeepStore:
         InternalURLs:
           "http://host.example:12345": {}
-      # we use Keepproxy instead of Keepstore for the RendezVous test,
-      # to avoid the "keepstore has no volumes" warning
-      Keepproxy:
+      Keepstore:
         InternalURLs:
           "http://host.example:12345":
-            # ideally we would reject Rendezvous here too, but
-            # currently we don't
             RendezVous: x
     ServiceS:
       Keepstore:
         InternalURLs:
           "http://host.example:12345": {}
+    Volumes:
+      zzzzz-nyw5e-aaaaaaaaaaaaaaa: {}
 `, &logbuf).Load()
 	c.Assert(err, check.IsNil)
 	c.Log(logbuf.String())

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


hooks/post-receive
--