Merge branch 'master' into 15572-new-install-docs

[arvados.git] / services / api / app / controllers / arvados / v1 / container_requests_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/container_requests_controller.rb b/services/api/app/controllers/arvados/v1/container_requests_controller.rb
index c5da06e36758ecccf001f6d0050b16fef5fa5166..3d5d4616ef0ace8783357c4f041c1a491cbd6615 100644 (file)
--- a/services/api/app/controllers/arvados/v1/container_requests_controller.rb
+++ b/services/api/app/controllers/arvados/v1/container_requests_controller.rb
@@ -9,4 +9,23 @@ class Arvados::V1::ContainerRequestsController < ApplicationController
   accept_attribute_as_json :command, Array
   accept_attribute_as_json :filters, Array
   accept_attribute_as_json :scheduling_parameters, Hash
+  accept_attribute_as_json :secret_mounts, Hash
+
+  def self._index_requires_parameters
+    (super rescue {}).
+      merge({
+        include_trash: {
+          type: 'boolean', required: false, description: "Include container requests whose owner project is trashed."
+        },
+      })
+  end
+
+  def self._show_requires_parameters
+    (super rescue {}).
+      merge({
+        include_trash: {
+          type: 'boolean', required: false, description: "Show container request even if its owner project is trashed."
+        },
+      })
+  end
 end