X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f2a79e0cc9bffcbe941d9a05b78f102fa6f09d03..95e5ccacf6c1193b313fa90a6d39baafa2ba67d8:/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 a237829ec7..49fc398e14 100644 --- a/services/api/app/controllers/arvados/v1/schema_controller.rb +++ b/services/api/app/controllers/arvados/v1/schema_controller.rb @@ -33,6 +33,8 @@ class Arvados::V1::SchemaController < ApplicationController version: "v1", revision: "20131114", source_version: AppVersion.hash, + sourceVersion: AppVersion.hash, # source_version should be deprecated in the future + packageVersion: AppVersion.package_version, generatedAt: db_current_time.iso8601, title: "Arvados API", description: "The API to interact with Arvados.", @@ -44,6 +46,7 @@ class Arvados::V1::SchemaController < ApplicationController rootUrl: root_url, servicePath: "arvados/v1/", batchPath: "batch", + uuidPrefix: Rails.application.config.uuid_prefix, defaultTrashLifetime: Rails.application.config.default_trash_lifetime, blobSignatureTtl: Rails.application.config.blob_signature_ttl, maxRequestSize: Rails.application.config.max_request_size, @@ -60,6 +63,14 @@ class Arvados::V1::SchemaController < ApplicationController websocketUrl: Rails.application.config.websocket_address, workbenchUrl: Rails.application.config.workbench_address, keepWebServiceUrl: Rails.application.config.keep_web_service_url, + gitUrl: case Rails.application.config.git_repo_https_base + when false + '' + when true + 'https://git.%s.arvadosapi.com/' % Rails.configuration.uuid_prefix + else + Rails.application.config.git_repo_https_base + end, parameters: { alt: { type: "string", @@ -114,7 +125,7 @@ class Arvados::V1::SchemaController < ApplicationController end object_properties = {} k.columns. - select { |col| col.name != 'id' }. + select { |col| col.name != 'id' && !col.name.start_with?('secret_') }. collect do |col| if k.serialized_attributes.has_key? col.name object_properties[col.name] = {