18600: Merge branch 'main'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --combined services/api/app/controllers/arvados/v1/schema_controller.rb
index ac2367aa0dccee23a92014701f68302b99c64317,100b9168179e04b4baa5d6b51a438f00e2e42104..5508ac0fbd591ba7624390b223e890b75f84550d
--- 1/services/api/app/controllers/arvados/v1/schema_controller.rb
--- 2/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@@ -37,7 -37,7 +37,7 @@@ class Arvados::V1::SchemaController < A
          # format is YYYYMMDD, must be fixed width (needs to be lexically
          # sortable), updated manually, may be used by clients to
          # determine availability of API server features.
-         revision: "20210628",
+         revision: "20220222",
          source_version: AppVersion.hash,
          sourceVersion: AppVersion.hash, # source_version should be deprecated in the future
          packageVersion: AppVersion.package_version,
@@@ -406,20 -406,6 +406,20 @@@
          end
        end
  
 +      # The 'replace_files' option is implemented in lib/controller,
 +      # not Rails -- we just need to add it here so discovery-aware
 +      # clients know how to validate it.
 +      [:create, :update].each do |action|
 +        discovery[:resources]['collections'][:methods][action][:parameters]['replace_files'] = {
 +          type: 'object',
 +          description: 'Files and directories to initialize/replace with content from other collections.',
 +          required: false,
 +          location: 'query',
 +          properties: {},
 +          additionalProperties: {type: 'string'},
 +        }
 +      end
 +
        discovery[:resources]['configs'] = {
          methods: {
            get: {
@@@ -431,6 -417,27 +431,27 @@@
              },
              parameterOrder: [
              ],
+             response: {
+             },
+             scopes: [
+               "https://api.arvados.org/auth/arvados",
+               "https://api.arvados.org/auth/arvados.readonly"
+             ]
+           },
+         }
+       }
+ 
+       discovery[:resources]['vocabularies'] = {
+         methods: {
+           get: {
+             id: "arvados.vocabularies.get",
+             path: "vocabulary",
+             httpMethod: "GET",
+             description: "Get vocabulary definition",
+             parameters: {
+             },
+             parameterOrder: [
+             ],
              response: {
              },
              scopes: [