From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 4 May 2023 22:34:01 +0000 (-0400)
Subject: 20470: Fix discovery document generation to drop unpublished fields
X-Git-Tag: 2.7.0~116^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e3c25b992f96b34810c371aa75e30ba8ce40a639

20470: Fix discovery document generation to drop unpublished fields

Now uses the list of API published fields (selectable_attributes) to
generate discovery doc, this causes some obsolete and nonpublic fields
to disappear from the discovery doc (but actually they were never part
of the public API in the first place).

The immediate reason to do this is because workbench 1 was using the
discovery document to craft a list of fields to select, but the
changes to the way select work in this branch means that asking for
unpublished fields now throws an error.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/sdk/python/arvados-v1-discovery.json b/sdk/python/arvados-v1-discovery.json
index f015978bdf..5d4666bf94 100644
--- a/sdk/python/arvados-v1-discovery.json
+++ b/sdk/python/arvados-v1-discovery.json
@@ -9195,9 +9195,6 @@
         "created_at": {
           "type": "datetime"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "is_locked_by_uuid": {
           "type": "string"
         },
@@ -9236,9 +9233,6 @@
         },
         "components": {
           "type": "Hash"
-        },
-        "script_parameters_digest": {
-          "type": "string"
         }
       }
     },
@@ -9311,9 +9305,6 @@
         "created_at": {
           "type": "datetime"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "is_trusted": {
           "type": "boolean"
         }
@@ -9391,9 +9382,6 @@
         "created_at": {
           "type": "datetime"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "default_owner_uuid": {
           "type": "string"
         },
@@ -9479,9 +9467,6 @@
         },
         "created_at": {
           "type": "datetime"
-        },
-        "updated_at": {
-          "type": "datetime"
         }
       }
     },
@@ -9560,9 +9545,6 @@
         "replication_confirmed": {
           "type": "integer"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "manifest_text": {
           "type": "text"
         },
@@ -9578,9 +9560,6 @@
         "delete_at": {
           "type": "datetime"
         },
-        "file_names": {
-          "type": "text"
-        },
         "trash_at": {
           "type": "datetime"
         },
@@ -9718,9 +9697,6 @@
         "priority": {
           "type": "integer"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "exit_code": {
           "type": "integer"
         },
@@ -9742,9 +9718,6 @@
         "runtime_auth_scopes": {
           "type": "Array"
         },
-        "runtime_token": {
-          "type": "text"
-        },
         "lock_count": {
           "type": "integer"
         },
@@ -9882,9 +9855,6 @@
         "filters": {
           "type": "text"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "container_count": {
           "type": "integer"
         },
@@ -9906,9 +9876,6 @@
         "output_ttl": {
           "type": "integer"
         },
-        "runtime_token": {
-          "type": "text"
-        },
         "output_storage_classes": {
           "type": "Array"
         },
@@ -9989,9 +9956,6 @@
         "description": {
           "type": "string"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "group_class": {
           "type": "string"
         },
@@ -10077,9 +10041,6 @@
         },
         "created_at": {
           "type": "datetime"
-        },
-        "updated_at": {
-          "type": "datetime"
         }
       }
     },
@@ -10164,9 +10125,6 @@
         "created_at": {
           "type": "datetime"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "created_by_job_task_uuid": {
           "type": "string"
         },
@@ -10241,9 +10199,6 @@
         "modified_at": {
           "type": "datetime"
         },
-        "ping_secret": {
-          "type": "string"
-        },
         "node_uuid": {
           "type": "string"
         },
@@ -10274,9 +10229,6 @@
         "created_at": {
           "type": "datetime"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "keep_service_uuid": {
           "type": "string"
         }
@@ -10357,9 +10309,6 @@
         "created_at": {
           "type": "datetime"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "read_only": {
           "type": "boolean"
         }
@@ -10442,9 +10391,6 @@
         },
         "properties": {
           "type": "Hash"
-        },
-        "updated_at": {
-          "type": "datetime"
         }
       }
     },
@@ -10496,6 +10442,9 @@
           "type": "string",
           "description": "Object version."
         },
+        "id": {
+          "type": "integer"
+        },
         "owner_uuid": {
           "type": "string"
         },
@@ -10523,9 +10472,6 @@
         "created_at": {
           "type": "datetime"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "modified_at": {
           "type": "datetime"
         },
@@ -10609,18 +10555,9 @@
         "ip_address": {
           "type": "string"
         },
-        "first_ping_at": {
-          "type": "datetime"
-        },
         "last_ping_at": {
           "type": "datetime"
         },
-        "info": {
-          "type": "Hash"
-        },
-        "updated_at": {
-          "type": "datetime"
-        },
         "properties": {
           "type": "Hash"
         },
@@ -10710,20 +10647,11 @@
         "prefs": {
           "type": "Hash"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
-        "default_owner_uuid": {
-          "type": "string"
-        },
         "is_active": {
           "type": "boolean"
         },
         "username": {
           "type": "string"
-        },
-        "redirect_to_user_uuid": {
-          "type": "string"
         }
       }
     },
@@ -10799,9 +10727,6 @@
         "components": {
           "type": "Hash"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "properties": {
           "type": "Hash"
         },
@@ -10891,9 +10816,6 @@
         "components": {
           "type": "Hash"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "description": {
           "type": "string"
         }
@@ -10964,9 +10886,6 @@
         },
         "created_at": {
           "type": "datetime"
-        },
-        "updated_at": {
-          "type": "datetime"
         }
       }
     },
@@ -11036,9 +10955,6 @@
         "material": {
           "type": "string"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "properties": {
           "type": "Hash"
         }
@@ -11112,9 +11028,6 @@
         },
         "created_at": {
           "type": "datetime"
-        },
-        "updated_at": {
-          "type": "datetime"
         }
       }
     },
@@ -11183,9 +11096,6 @@
         },
         "created_at": {
           "type": "datetime"
-        },
-        "updated_at": {
-          "type": "datetime"
         }
       }
     },
@@ -11260,9 +11170,6 @@
         },
         "definition": {
           "type": "text"
-        },
-        "updated_at": {
-          "type": "datetime"
         }
       }
     },
@@ -11341,9 +11248,6 @@
         "replication_confirmed": {
           "type": "integer"
         },
-        "updated_at": {
-          "type": "datetime"
-        },
         "manifest_text": {
           "type": "text"
         },
@@ -11359,9 +11263,6 @@
         "delete_at": {
           "type": "datetime"
         },
-        "file_names": {
-          "type": "text"
-        },
         "trash_at": {
           "type": "datetime"
         },
diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 34dfe966b0..4d15cb1215 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -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] = {