17004: Move output_properties to progress_attrs

Mention default properties "type" and "container_request" in docs

Fix typos on CWL arv:OutputCollectionProperties page.

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

diff --git a/doc/api/methods/container_requests.html.textile.liquid b/doc/api/methods/container_requests.html.textile.liquid
index cc5c19d7929e660fb0105ee9e11c27f464438328..15fa207b1c16498a90940dea80c8c9ac99c57446 100644 (file)
--- a/doc/api/methods/container_requests.html.textile.liquid
+++ b/doc/api/methods/container_requests.html.textile.liquid
@@ -61,7 +61,7 @@ table(table table-bordered table-condensed).
 |runtime_user_uuid|string|The user permission that will be granted to this container.||
 |runtime_auth_scopes|array of string|The scopes associated with the auth token used to run this container.||
 |output_storage_classes|array of strings|The storage classes that will be used for the log and output collections of this container request|default is ["default"]|
-|output_properties|hash|User metadata properties to set on the output collection.|
+|output_properties|hash|User metadata properties to set on the output collection.  The output collection will also have default properties "type" ("intermediate" or "output") and "container_request" (the uuid of container request that produced the collection).|
 
 h2(#priority). Priority
 

diff --git a/doc/user/cwl/cwl-extensions.html.textile.liquid b/doc/user/cwl/cwl-extensions.html.textile.liquid
index 431027ba5d490683258741d75c58c9047cece41e..197816f4a401fd417a6fa208a5954f9fbe78c1f9 100644 (file)
--- a/doc/user/cwl/cwl-extensions.html.textile.liquid
+++ b/doc/user/cwl/cwl-extensions.html.textile.liquid
@@ -159,15 +159,15 @@ Specify extra "properties":{{site.baseurl}}/api/methods.html#subpropertyfilters
 
 table(table table-bordered table-condensed).
 |_. Field |_. Type |_. Description |
-|processProperties|key-value map, or list of objects with the fields {propertyName, propertyValue}|The properties that will be set on the container request.  May include expressions that reference `$(inputs)` of the current workflow or tool.|
+|processProperties|key-value map, or list of objects with the fields {propertyName, propertyValue}|The properties that will be set on the container request.  May include expressions that reference @$(inputs)@ of the current workflow or tool.|
 
-h2(#ProcessProperties). arv:OutputCollectionProperties
+h2(#OutputCollectionProperties). arv:OutputCollectionProperties
 
 Specify custom "properties":{{site.baseurl}}/api/methods.html#subpropertyfilters that will be set on the output collection of the workflow step.
 
 table(table table-bordered table-condensed).
 |_. Field |_. Type |_. Description |
-|outputProperties|key-value map, or list of objects with the fields {propertyName, propertyValue}|The properties that will be set on the output collection.  May include expressions that reference `$(inputs)` of the current workflow or tool.|
+|outputProperties|key-value map, or list of objects with the fields {propertyName, propertyValue}|The properties that will be set on the output collection.  May include expressions that reference @$(inputs)@ of the current workflow or tool.|
 
 h2(#CUDARequirement). cwltool:CUDARequirement
 

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index eedf7169145c17ab433237be6e8c88a4a07442e7..3a04c56046416771a903714e99543e40c7d66f4e 100644 (file)
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -478,7 +478,7 @@ class Container < ArvadosModel
 
   def validate_change
     permitted = [:state]
-    progress_attrs = [:progress, :runtime_status, :log, :output]
+    progress_attrs = [:progress, :runtime_status, :log, :output, :output_properties]
     final_attrs = [:exit_code, :finished_at]
 
     if self.new_record?
@@ -487,7 +487,7 @@ class Container < ArvadosModel
                      :runtime_constraints, :scheduling_parameters,
                      :secret_mounts, :runtime_token,
                      :runtime_user_uuid, :runtime_auth_scopes,
-                     :output_storage_classes, :output_properties)
+                     :output_storage_classes)
     end
 
     case self.state