Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard

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

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 20400d228620d0b29ee808eaf4dec27ccd871ae1..c5b2bcf2f2d4a97f5bac9b18e6f0456707e59210 100644 (file)
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -26,6 +26,7 @@ class Arvados::V1::SchemaController < ApplicationController
         rootUrl: root_url,
         servicePath: "arvados/v1/",
         batchPath: "batch",
+        defaultTrashLifetime: Rails.application.config.default_trash_lifetime,
         parameters: {
           alt: {
             type: "string",
@@ -257,7 +258,13 @@ class Arvados::V1::SchemaController < ApplicationController
               path: "#{k.to_s.underscore.pluralize}",
               httpMethod: "POST",
               description: "Create a new #{k.to_s}.",
-              parameters: {},
+              parameters: {
+                ensure_unique_name: {
+                  type: "boolean",
+                  description: "Adjust name to ensure uniqueness instead of returning an error on (owner_uuid, name) collision.",
+                  location: "query"
+                }
+              },
               request: {
                 required: true,
                 properties: {