Merge branch 'master' into 14874-protected-collection-properties

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 94cd8fcbf65d2181c918818f7ba4779408b281a0..3a9beee253527201300357785d95f7fb418732dc 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -274,6 +274,19 @@ Clusters:
       # > 0 = auto-create a new version when older than the specified number of seconds.
       PreserveVersionIfIdle: -1
 
+      # Default collection properties. At creation time, if the client didn't
+      # provide the listed keys, they will be automatically populated following
+      # one of the following behaviors:
+      #
+      # * UUID of the user who owns the containing project.
+      #   responsible_person_uuid: {function: original_owner, protected: true}
+      #
+      # * Default concrete value.
+      #   foo_bar: {value: baz, protected: false}
+      #
+      # If protected is true, only an admin user can modify its value.
+      DefaultProperties: {}
+
     Login:
       # These settings are provided by your OAuth2 provider (e.g.,
       # sso-provider).

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 3492615e9959f48f6e3134f733194e93af043e93..f4df11a6b279e797723c38d701f3c79836f40b65 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -280,6 +280,19 @@ Clusters:
       # > 0 = auto-create a new version when older than the specified number of seconds.
       PreserveVersionIfIdle: -1
 
+      # Default collection properties. At creation time, if the client didn't
+      # provide the listed keys, they will be automatically populated following
+      # one of the following behaviors:
+      #
+      # * UUID of the user who owns the containing project.
+      #   responsible_person_uuid: {function: original_owner, protected: true}
+      #
+      # * Default concrete value.
+      #   foo_bar: {value: baz, protected: false}
+      #
+      # If protected is true, only an admin user can modify its value.
+      DefaultProperties: {}
+
     Login:
       # These settings are provided by your OAuth2 provider (e.g.,
       # sso-provider).