Changed API server to use X-External-Client instead of

X-Keep-Proxy-Required. refs #2776

diff --git a/services/api/app/controllers/arvados/v1/keep_services_controller.rb b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
index 2cb68fdd70c01482b548b4f46055f88e56e21b07..fc2ee9300287406479b0d2ec1ff97e88418c52a4 100644 (file)
--- a/services/api/app/controllers/arvados/v1/keep_services_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
@@ -10,7 +10,7 @@ class Arvados::V1::KeepServicesController < ApplicationController
   end
 
   def accessible
-    if request.headers['X-Keep-Proxy-Required']
+    if request.headers['X-External-Client'] == '1'
       @objects = model_class.where('service_type=?', 'proxy')
     else
       @objects = model_class.where('service_type=?', 'disk')

diff --git a/services/api/test/integration/keep_proxy_test.rb b/services/api/test/integration/keep_proxy_test.rb
index 347f69d5762355ce4cb5bdb68cadbf3dd636721e..d4155c2c4a6e39b88aa22b5100ec458634c70bfe 100644 (file)
--- a/services/api/test/integration/keep_proxy_test.rb
+++ b/services/api/test/integration/keep_proxy_test.rb
@@ -10,7 +10,7 @@ class KeepProxyTest < ActionDispatch::IntegrationTest
     assert_equal 'disk', services[0]['service_type']
     assert_equal 'disk', services[1]['service_type']
 
-    get "/arvados/v1/keep_services/accessible", {:format => :json}, auth(:active).merge({'HTTP_X_KEEP_PROXY_REQUIRED' => true})
+    get "/arvados/v1/keep_services/accessible", {:format => :json}, auth(:active).merge({'HTTP_X_EXTERNAL_CLIENT' => '1'})
     assert_response :success
     services = json_response['items']