[ARVADOS] updated: 1.3.0-2550-g87cfe4746

[Git user]

Summary of changes:
 lib/controller/handler_test.go        | 11 +++++++----
 services/api/config/arvados_config.rb |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

       via  87cfe4746d5930f8b28568f75256a1b1a399faa7 (commit)
       via  92da01ee9c52ca89b36a0edd21a4f42b8eb48e0d (commit)
      from  6002ef855cd7a5bbbf353ec3304fccec412e68fa (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 87cfe4746d5930f8b28568f75256a1b1a399faa7
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Mon May 11 09:59:31 2020 -0400

    15881: Update config keys in rails api.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index 502e3e787..c4f89e13c 100644
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -106,8 +106,8 @@ arvcfg.declare_config "Users.EmailSubjectPrefix", String, :email_subject_prefix
 arvcfg.declare_config "Users.UserNotifierEmailFrom", String, :user_notifier_email_from
 arvcfg.declare_config "Users.NewUserNotificationRecipients", Hash, :new_user_notification_recipients, ->(cfg, k, v) { arrayToHash cfg, "Users.NewUserNotificationRecipients", v }
 arvcfg.declare_config "Users.NewInactiveUserNotificationRecipients", Hash, :new_inactive_user_notification_recipients, method(:arrayToHash)
-arvcfg.declare_config "Login.ProviderAppSecret", String, :sso_app_secret
-arvcfg.declare_config "Login.ProviderAppID", String, :sso_app_id
+arvcfg.declare_config "Login.SSO.ProviderAppSecret", String, :sso_app_secret
+arvcfg.declare_config "Login.SSO.ProviderAppID", String, :sso_app_id
 arvcfg.declare_config "Login.LoginCluster", String
 arvcfg.declare_config "Login.RemoteTokenRefresh", ActiveSupport::Duration
 arvcfg.declare_config "TLS.Insecure", Boolean, :sso_insecure

commit 92da01ee9c52ca89b36a0edd21a4f42b8eb48e0d
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Mon May 11 09:59:20 2020 -0400

    15881: Update config keys in tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index f09203f72..3c7ae3a2d 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -167,8 +167,9 @@ func (s *HandlerSuite) TestProxyNotFound(c *check.C) {
 }
 
 func (s *HandlerSuite) TestProxyRedirect(c *check.C) {
-	s.cluster.Login.ProviderAppID = "test"
-	s.cluster.Login.ProviderAppSecret = "test"
+	s.cluster.Login.SSO.Enable = true
+	s.cluster.Login.SSO.ProviderAppID = "test"
+	s.cluster.Login.SSO.ProviderAppSecret = "test"
 	req := httptest.NewRequest("GET", "https://0.0.0.0:1/login?return_to=foo", nil)
 	resp := httptest.NewRecorder()
 	s.handler.ServeHTTP(resp, req)
@@ -182,7 +183,8 @@ func (s *HandlerSuite) TestProxyRedirect(c *check.C) {
 }
 
 func (s *HandlerSuite) TestLogoutSSO(c *check.C) {
-	s.cluster.Login.ProviderAppID = "test"
+	s.cluster.Login.SSO.Enable = true
+	s.cluster.Login.SSO.ProviderAppID = "test"
 	req := httptest.NewRequest("GET", "https://0.0.0.0:1/logout?return_to=https://example.com/foo", nil)
 	resp := httptest.NewRecorder()
 	s.handler.ServeHTTP(resp, req)
@@ -197,7 +199,8 @@ func (s *HandlerSuite) TestLogoutGoogle(c *check.C) {
 		// Google login N/A
 		return
 	}
-	s.cluster.Login.GoogleClientID = "test"
+	s.cluster.Login.Google.Enable = true
+	s.cluster.Login.Google.ClientID = "test"
 	req := httptest.NewRequest("GET", "https://0.0.0.0:1/logout?return_to=https://example.com/foo", nil)
 	resp := httptest.NewRecorder()
 	s.handler.ServeHTTP(resp, req)

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


hooks/post-receive
--