[ARVADOS] updated: 1.3.0-2611-g15dbaf151

[Git user]

Summary of changes:
 lib/config/export.go           | 5 +++++
 lib/controller/handler_test.go | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

       via  15dbaf151a72d5cfc00b4ea4b4bcb64c7ed9ac14 (commit)
      from  723a7500b82d9c85774a85f66fbeb489f233277c (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 15dbaf151a72d5cfc00b4ea4b4bcb64c7ed9ac14
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Mon Jun 1 11:08:06 2020 -0400

    16171: Add OIDC config keys to export whitelist.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/config/export.go b/lib/config/export.go
index 26782c8ba..fc4908c15 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -151,6 +151,11 @@ var whitelist = map[string]bool{
 	"Login.LDAP.URL":                               false,
 	"Login.LDAP.UsernameAttribute":                 false,
 	"Login.LoginCluster":                           true,
+	"Login.OpenIDConnect":                          true,
+	"Login.OpenIDConnect.ClientID":                 false,
+	"Login.OpenIDConnect.ClientSecret":             false,
+	"Login.OpenIDConnect.Enable":                   true,
+	"Login.OpenIDConnect.Issuer":                   false,
 	"Login.PAM":                                    true,
 	"Login.PAM.DefaultEmailDomain":                 false,
 	"Login.PAM.Enable":                             true,
diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index 3c7ae3a2d..c7bce9713 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -71,7 +71,10 @@ func (s *HandlerSuite) TestConfigExport(c *check.C) {
 		req := httptest.NewRequest(method, "/arvados/v1/config", nil)
 		resp := httptest.NewRecorder()
 		s.handler.ServeHTTP(resp, req)
-		c.Check(resp.Code, check.Equals, http.StatusOK)
+		c.Log(resp.Body.String())
+		if !c.Check(resp.Code, check.Equals, http.StatusOK) {
+			continue
+		}
 		c.Check(resp.Header().Get("Access-Control-Allow-Origin"), check.Equals, `*`)
 		c.Check(resp.Header().Get("Access-Control-Allow-Methods"), check.Matches, `.*\bGET\b.*`)
 		c.Check(resp.Header().Get("Access-Control-Allow-Headers"), check.Matches, `.+`)
@@ -80,12 +83,11 @@ func (s *HandlerSuite) TestConfigExport(c *check.C) {
 			continue
 		}
 		var cluster arvados.Cluster
-		c.Log(resp.Body.String())
 		err := json.Unmarshal(resp.Body.Bytes(), &cluster)
 		c.Check(err, check.IsNil)
 		c.Check(cluster.ManagementToken, check.Equals, "")
 		c.Check(cluster.SystemRootToken, check.Equals, "")
-		c.Check(cluster.Collections.BlobSigning, check.DeepEquals, true)
+		c.Check(cluster.Collections.BlobSigning, check.Equals, true)
 		c.Check(cluster.Collections.BlobSigningTTL, check.Equals, arvados.Duration(23*time.Second))
 	}
 }

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


hooks/post-receive
--