X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/060d38d627bd1e51dd2b3c6e7de9af6aa7d7b6f3..652e26feea271a3d86430cd494503ff96e11dc9f:/services/api/app/controllers/arvados/v1/containers_controller.rb diff --git a/services/api/app/controllers/arvados/v1/containers_controller.rb b/services/api/app/controllers/arvados/v1/containers_controller.rb index 8c63ea7f5b..65d8385ad5 100644 --- a/services/api/app/controllers/arvados/v1/containers_controller.rb +++ b/services/api/app/controllers/arvados/v1/containers_controller.rb @@ -6,6 +6,7 @@ class Arvados::V1::ContainersController < ApplicationController accept_attribute_as_json :environment, Hash accept_attribute_as_json :mounts, Hash accept_attribute_as_json :runtime_constraints, Hash + accept_attribute_as_json :runtime_status, Hash accept_attribute_as_json :command, Array accept_attribute_as_json :scheduling_parameters, Hash @@ -20,10 +21,9 @@ class Arvados::V1::ContainersController < ApplicationController show end - # Updates use row locking to resolve races between multiple - # dispatchers trying to lock the same container. def update @object.with_lock do + @object.reload super end end @@ -60,4 +60,14 @@ class Arvados::V1::ContainersController < ApplicationController end end end + + def secret_mounts + if @object && + @object.auth_uuid && + @object.auth_uuid == Thread.current[:api_client_authorization].uuid + send_json({"secret_mounts" => @object.secret_mounts}) + else + send_error("Token is not associated with this container.", status: 403) + end + end end