[ARVADOS] updated: 1.3.0-557-g128ac1699

[Git user]

Summary of changes:
 services/api/app/controllers/arvados/v1/schema_controller.rb | 4 +++-
 services/api/app/controllers/static_controller.rb            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

       via  128ac1699219b68105eda2376160a3269d445845 (commit)
      from  b8fc1058a62bf09e4c02653f77cefc976f22b666 (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 128ac1699219b68105eda2376160a3269d445845
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Mar 26 16:31:06 2019 -0400

    13996: Fix discovery document remoteHosts
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index f2391fc43..d483e32d5 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -25,6 +25,8 @@ class Arvados::V1::SchemaController < ApplicationController
   def discovery_doc
     Rails.cache.fetch 'arvados_v1_rest_discovery' do
       Rails.application.eager_load!
+      remoteHosts = {}
+      Rails.configuration.RemoteClusters.each {|k,v| if k != "*" then remoteHosts[k] = v["Host"] end }
       discovery = {
         kind: "discovery#restDescription",
         discoveryVersion: "v1",
@@ -61,7 +63,7 @@ class Arvados::V1::SchemaController < ApplicationController
         crunchLogPartialLineThrottlePeriod: Rails.configuration.Containers["Logging"]["LogPartialLineThrottlePeriod"],
         crunchLogUpdatePeriod: Rails.configuration.Containers["Logging"]["LogUpdatePeriod"],
         crunchLogUpdateSize: Rails.configuration.Containers["Logging"]["LogUpdateSize"],
-        remoteHosts: Rails.configuration.RemoteClusters.map {|k,v| v["Host"]},
+        remoteHosts: remoteHosts,
         remoteHostsViaDNS: Rails.configuration.RemoteClusters["*"]["Proxy"],
         websocketUrl: Rails.configuration.Services["Websocket"]["ExternalURL"].to_s,
         workbenchUrl: Rails.configuration.Services["Workbench1"]["ExternalURL"].to_s,
diff --git a/services/api/app/controllers/static_controller.rb b/services/api/app/controllers/static_controller.rb
index 8965670db..b4ba21143 100644
--- a/services/api/app/controllers/static_controller.rb
+++ b/services/api/app/controllers/static_controller.rb
@@ -12,7 +12,7 @@ class StaticController < ApplicationController
   def home
     respond_to do |f|
       f.html do
-        if !Rails.configuration.Services["Workbench1"]["ExternalURL"].empty?
+        if !Rails.configuration.Services["Workbench1"]["ExternalURL"].to_s.empty?
           redirect_to Rails.configuration.Services["Workbench1"]["ExternalURL"]
         else
           render_not_found "Oops, this is an API endpoint. You probably want to point your browser to an Arvados Workbench site instead."

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


hooks/post-receive
--