11453: Rename param from "remote_id" to "remote".

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 57a187ae503e0b8b0e207dc6deb94fd2a511ed98..07afdfb79abfe5948e46d2a8b3593f93b3118e5a 100644 (file)
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -346,12 +346,12 @@ class ApplicationController < ActionController::Base
     @read_auths.select! { |auth| auth.scopes_allow_request? request }
 
     # Use a salted token as a reader token for /groups/ and /users/current
-    if params[:remote_id] && (
+    if params[:remote] && (
          request.path.start_with?('/arvados/v1/groups') ||
          request.path.start_with?('/arvados/v1/users/current'))
       auth = ApiClientAuthorization.
              validate(token: Thread.current[:supplied_token],
-                      remote: params[:remote_id])
+                      remote: params[:remote])
       if auth && auth.user
         Thread.current[:user] = auth.user
         @read_auths << auth

diff --git a/services/api/app/models/api_client_authorization.rb b/services/api/app/models/api_client_authorization.rb
index e7903d46ddc8465b0f04fceac66222193707bd06..29c5ef71649d511e33b92c07bac85cee3e193abd 100644 (file)
--- a/services/api/app/models/api_client_authorization.rb
+++ b/services/api/app/models/api_client_authorization.rb
@@ -110,7 +110,7 @@ class ApiClientAuthorization < ArvadosModel
         # [re]validate it.
         arv = Arvados.new(api_host: remote_host(uuid: uuid),
                           api_token: token)
-        remote_user = arv.user.current(remote_id: Rails.configuration.uuid_prefix)
+        remote_user = arv.user.current(remote: Rails.configuration.uuid_prefix)
         if remote_user && remote_user[:uuid][0..4] == uuid[0..4]
           act_as_system_user do
             # Add/update user and token in our database so we can

diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index 0fa843071823f17935478e7955e4a8bd95615244..6027dcbf82fd54ca6d169d8179b764be7e7f85f9 100644 (file)
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -708,10 +708,10 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
   end
 
   test "list readable groups with salted token" do
-    salted_token = salt_token(fixture: :active, remote_id: 'zbbbb')
+    salted_token = salt_token(fixture: :active, remote: 'zbbbb')
     ArvadosApiToken.new.call("rack.input" => "",
                              "HTTP_AUTHORIZATION" => "Bearer #{salted_token}")
-    get :index, {remote_id: 'zbbbb', limit: 10000}
+    get :index, {remote: 'zbbbb', limit: 10000}
     assert_response 200
     group_uuids = json_response['items'].collect { |i| i['uuid'] }
     assert_includes(group_uuids, 'zzzzz-j7d0g-fffffffffffffff')

diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb
index 646b96c22833f810e70c8f0ccd1addb8fb9fd7f1..b89145b3f24335c7ef1756007764a7f99a47186e 100644 (file)
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -873,10 +873,10 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
 
   ['zbbbb', 'z0000'].each do |token_valid_for|
     test "validate #{token_valid_for}-salted token for remote cluster zbbbb" do
-      salted_token = salt_token(fixture: :active, remote_id: token_valid_for)
+      salted_token = salt_token(fixture: :active, remote: token_valid_for)
       ArvadosApiToken.new.call("rack.input" => "",
                                "HTTP_AUTHORIZATION" => "Bearer #{salted_token}")
-      get :current, {remote_id: 'zbbbb'}
+      get :current, {remote: 'zbbbb'}
       if token_valid_for == 'zbbbb'
         assert_equal(users(:active).uuid, json_response['uuid'])
         assert_response 200

diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index e1f7542e9392e701829ed4d606e40c3d25c89c7b..c834250cb6caa89c28ff25ad942978dd14399949 100644 (file)
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -127,11 +127,11 @@ class ActiveSupport::TestCase
                              "HTTP_AUTHORIZATION" => "OAuth2 #{t}")
   end
 
-  def salt_token(fixture:, remote_id:)
+  def salt_token(fixture:, remote:)
     auth = api_client_authorizations(fixture)
     uuid = auth.uuid
     token = auth.api_token
-    hmac = OpenSSL::HMAC.hexdigest('sha1', token, remote_id)
+    hmac = OpenSSL::HMAC.hexdigest('sha1', token, remote)
     return "v2/#{uuid}/#{hmac}"
   end