From e4c28160e598f50e9b0d47bcb9beb245a126e18f Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Thu, 5 Sep 2024 14:28:08 -0400 Subject: [PATCH] 19929: Clarify some wording in discovery document descriptions Arvados-DCO-1.1-Signed-off-by: Brett Smith --- sdk/python/arvados-v1-discovery.json | 86 +++++++++---------- .../arvados/v1/schema_controller.rb | 6 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/sdk/python/arvados-v1-discovery.json b/sdk/python/arvados-v1-discovery.json index 06b8119c1c..7c471b93da 100644 --- a/sdk/python/arvados-v1-discovery.json +++ b/sdk/python/arvados-v1-discovery.json @@ -3780,15 +3780,15 @@ "type": "string" }, "last_used_at": { - "description": "The last time this token was used to authorize a request. The string encodes a UTC time in ISO 8601 format.", + "description": "The last time this token was used to authorize a request. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "expires_at": { - "description": "The time after which this token is no longer valid for authorization. The string encodes a UTC time in ISO 8601 format.", + "description": "The time after which this token is no longer valid for authorization. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "created_at": { - "description": "The time this API client authorization was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this API client authorization was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "scopes": { @@ -3859,7 +3859,7 @@ "type": "string" }, "modified_at": { - "description": "The time this authorized key was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this authorized key was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "name": { @@ -3879,11 +3879,11 @@ "type": "text" }, "expires_at": { - "description": "The time after which this key is no longer valid for authorization. The string encodes a UTC time in ISO 8601 format.", + "description": "The time after which this key is no longer valid for authorization. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "created_at": { - "description": "The time this authorized key was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this authorized key was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" } } @@ -3938,7 +3938,7 @@ "type": "string" }, "created_at": { - "description": "The time this collection was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this collection was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_by_user_uuid": { @@ -3946,7 +3946,7 @@ "type": "string" }, "modified_at": { - "description": "The time this collection was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this collection was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "portable_data_hash": { @@ -3958,7 +3958,7 @@ "type": "integer" }, "replication_confirmed_at": { - "description": "The last time the cluster confirmed that it met `replication_confirmed`\nfor this collection. The string encodes a UTC time in ISO 8601 format.", + "description": "The last time the cluster confirmed that it met `replication_confirmed`\nfor this collection. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "replication_confirmed": { @@ -3986,11 +3986,11 @@ "type": "Hash" }, "delete_at": { - "description": "The time this collection will be permanently deleted. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this collection will be permanently deleted. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "trash_at": { - "description": "The time this collection will be trashed. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this collection will be trashed. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "is_trashed": { @@ -4006,7 +4006,7 @@ "type": "Array" }, "storage_classes_confirmed_at": { - "description": "The last time the cluster confirmed that data was stored on the storage\nclass(es) in `storage_classes_confirmed`. The string encodes a UTC time in ISO 8601 format.", + "description": "The last time the cluster confirmed that data was stored on the storage\nclass(es) in `storage_classes_confirmed`. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "current_version_uuid": { @@ -4139,11 +4139,11 @@ "type": "string" }, "created_at": { - "description": "The time this container was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this container was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_at": { - "description": "The time this container was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this container was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_by_user_uuid": { @@ -4155,11 +4155,11 @@ "type": "string" }, "started_at": { - "description": " The string encodes a UTC time in ISO 8601 format.", + "description": " The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "finished_at": { - "description": " The string encodes a UTC time in ISO 8601 format.", + "description": " The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "log": { @@ -4322,11 +4322,11 @@ "type": "string" }, "created_at": { - "description": "The time this container request was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this container request was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_at": { - "description": "The time this container request was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this container request was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_by_user_uuid": { @@ -4394,7 +4394,7 @@ "type": "integer" }, "expires_at": { - "description": "The time after which this container request will no longer be fulfilled. The string encodes a UTC time in ISO 8601 format.", + "description": "The time after which this container request will no longer be fulfilled. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "filters": { @@ -4438,7 +4438,7 @@ "type": "Hash" }, "cumulative_cost": { - "description": "A float with the estimated cost of all cloud instances used to run\ncontainer(s) to fulfill this container request. The value is `0` if cost\nestimation is not available on this cluster.", + "description": "A float with the estimated cost of all cloud instances used to run\ncontainer(s) to fulfill this container request and their subrequests.\nThe value is `0` if cost estimation is not available on this cluster.", "type": "float" }, "output_glob": { @@ -4501,7 +4501,7 @@ "type": "string" }, "created_at": { - "description": "The time this group was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this group was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_by_user_uuid": { @@ -4509,7 +4509,7 @@ "type": "string" }, "modified_at": { - "description": "The time this group was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this group was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "name": { @@ -4525,7 +4525,7 @@ "type": "string" }, "trash_at": { - "description": "The time this group will be trashed. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this group will be trashed. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "is_trashed": { @@ -4533,7 +4533,7 @@ "type": "boolean" }, "delete_at": { - "description": "The time this group will be permanently deleted. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this group will be permanently deleted. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "properties": { @@ -4604,7 +4604,7 @@ "type": "string" }, "modified_at": { - "description": "The time this Keep service was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this Keep service was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "service_host": { @@ -4624,7 +4624,7 @@ "type": "string" }, "created_at": { - "description": "The time this Keep service was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this Keep service was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "read_only": { @@ -4687,7 +4687,7 @@ "type": "string" }, "created_at": { - "description": "The time this link was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this link was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_by_user_uuid": { @@ -4695,7 +4695,7 @@ "type": "string" }, "modified_at": { - "description": "The time this link was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this link was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "tail_uuid": { @@ -4786,7 +4786,7 @@ "type": "string" }, "event_at": { - "description": " The string encodes a UTC time in ISO 8601 format.", + "description": " The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "event_type": { @@ -4802,11 +4802,11 @@ "type": "Hash" }, "created_at": { - "description": "The time this log was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this log was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_at": { - "description": "The time this log was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this log was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "object_owner_uuid": { @@ -4869,7 +4869,7 @@ "type": "string" }, "created_at": { - "description": "The time this user was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this user was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_by_user_uuid": { @@ -4877,7 +4877,7 @@ "type": "string" }, "modified_at": { - "description": "The time this user was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this user was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "email": { @@ -4964,7 +4964,7 @@ "type": "string" }, "created_at": { - "description": "The time this user agreement was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this user agreement was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_by_user_uuid": { @@ -4972,7 +4972,7 @@ "type": "string" }, "modified_at": { - "description": "The time this user agreement was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this user agreement was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "portable_data_hash": { @@ -4984,7 +4984,7 @@ "type": "integer" }, "replication_confirmed_at": { - "description": "The last time the cluster confirmed that it met `replication_confirmed`\nfor this user agreement. The string encodes a UTC time in ISO 8601 format.", + "description": "The last time the cluster confirmed that it met `replication_confirmed`\nfor this user agreement. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "replication_confirmed": { @@ -5012,11 +5012,11 @@ "type": "Hash" }, "delete_at": { - "description": "The time this user agreement will be permanently deleted. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this user agreement will be permanently deleted. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "trash_at": { - "description": "The time this user agreement will be trashed. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this user agreement will be trashed. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "is_trashed": { @@ -5032,7 +5032,7 @@ "type": "Array" }, "storage_classes_confirmed_at": { - "description": "The last time the cluster confirmed that data was stored on the storage\nclass(es) in `storage_classes_confirmed`. The string encodes a UTC time in ISO 8601 format.", + "description": "The last time the cluster confirmed that data was stored on the storage\nclass(es) in `storage_classes_confirmed`. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "current_version_uuid": { @@ -5115,7 +5115,7 @@ "type": "string" }, "modified_at": { - "description": "The time this virtual machine was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this virtual machine was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "hostname": { @@ -5123,7 +5123,7 @@ "type": "string" }, "created_at": { - "description": "The time this virtual machine was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this virtual machine was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" } } @@ -5182,11 +5182,11 @@ "type": "string" }, "created_at": { - "description": "The time this workflow was created. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this workflow was created. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_at": { - "description": "The time this workflow was last updated. The string encodes a UTC time in ISO 8601 format.", + "description": "The time this workflow was last updated. The string encodes a UTC date and time in ISO 8601 format.", "type": "datetime" }, "modified_by_user_uuid": { diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb index 132b188dc2..6316ffaf57 100644 --- a/services/api/app/controllers/arvados/v1/schema_controller.rb +++ b/services/api/app/controllers/arvados/v1/schema_controller.rb @@ -372,8 +372,8 @@ to dispatch a container to fulfill this container request.", "The UUID of the container that fulfills this container request, if any.", "ContainerRequest.cumulative_cost" => "A float with the estimated cost of all cloud instances used to run -container(s) to fulfill this container request. The value is `0` if cost -estimation is not available on this cluster.", +container(s) to fulfill this container request and their subrequests. +The value is `0` if cost estimation is not available on this cluster.", "ContainerRequest.expires_at" => "The time after which this %s will no longer be fulfilled.", "ContainerRequest.filters" => @@ -610,7 +610,7 @@ cluster, and automatically passes most permissions checks.", SchemaDescriptionMap[col.name] || "" if k.attribute_types[col.name].type == :datetime - desc_fmt += " The string encodes a UTC time in ISO 8601 format." + desc_fmt += " The string encodes a UTC date and time in ISO 8601 format." end object_properties[col.name] = { description: desc_fmt % human_name, -- 2.30.2