Merge branch '21600-banner-tests'

[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 34dfe966b0a38a7d347eb7427706d35b12465557..74aa4078cbea66a6da3138cfd4a46f9ece81e350 100644 (file)
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -36,7 +36,7 @@ class Arvados::V1::SchemaController < ApplicationController
       # 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: "20220510",
+      revision: "20231117",
       source_version: AppVersion.hash,
       sourceVersion: AppVersion.hash, # source_version should be deprecated in the future
       packageVersion: AppVersion.package_version,
@@ -118,7 +118,7 @@ class Arvados::V1::SchemaController < ApplicationController
       resources: {}
     }
 
-    ActiveRecord::Base.descendants.reject(&:abstract_class?).each do |k|
+    ActiveRecord::Base.descendants.reject(&:abstract_class?).sort_by(&:to_s).each do |k|
       begin
         ctl_class = "Arvados::V1::#{k.to_s.pluralize}Controller".constantize
       rescue
@@ -127,7 +127,7 @@ class Arvados::V1::SchemaController < ApplicationController
       end
       object_properties = {}
       k.columns.
-        select { |col| col.name != 'id' && !col.name.start_with?('secret_') }.
+        select { |col| k.selectable_attributes.include? col.name }.
         collect do |col|
         if k.serialized_attributes.has_key? col.name
           object_properties[col.name] = {