[ARVADOS] created: 1.3.0-1153-g9ceb2df8f

[Git user]

        at  9ceb2df8ffaabceba72dbcc9be92cc4652565646 (commit)


commit 9ceb2df8ffaabceba72dbcc9be92cc4652565646
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Jun 25 13:20:24 2019 -0300

    14874: Adds Collections.ManagedProperties to Go SDK.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index aaf88a0d7..189e0d1fd 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -290,7 +290,8 @@ Clusters:
       #   foo_bar: {value: baz, protected: false}
       #
       # If protected is true, only an admin user can modify its value.
-      ManagedProperties: {}
+      ManagedProperties:
+        SAMPLE: {function: original_owner, protected: true}
 
     Login:
       # These settings are provided by your OAuth2 provider (e.g.,
diff --git a/lib/config/export.go b/lib/config/export.go
index 39344c0f0..2f79c2b29 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -75,6 +75,9 @@ var whitelist = map[string]bool{
 	"Collections.CollectionVersioning":           false,
 	"Collections.DefaultReplication":             true,
 	"Collections.DefaultTrashLifetime":           true,
+	"Collections.ManagedProperties":              true,
+	"Collections.ManagedProperties.*":            true,
+	"Collections.ManagedProperties.*.*":          true,
 	"Collections.PreserveVersionIfIdle":          true,
 	"Collections.TrashSweepInterval":             false,
 	"Containers":                                 true,
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 15004ca98..dc9009e96 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -296,7 +296,8 @@ Clusters:
       #   foo_bar: {value: baz, protected: false}
       #
       # If protected is true, only an admin user can modify its value.
-      ManagedProperties: {}
+      ManagedProperties:
+        SAMPLE: {function: original_owner, protected: true}
 
     Login:
       # These settings are provided by your OAuth2 provider (e.g.,
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index adee06723..d7e92e6ed 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -78,12 +78,13 @@ type Cluster struct {
 	Collections struct {
 		BlobSigning           bool
 		BlobSigningKey        string
-		DefaultReplication    int
 		BlobSigningTTL        Duration
-		DefaultTrashLifetime  Duration
-		TrashSweepInterval    Duration
 		CollectionVersioning  bool
+		DefaultTrashLifetime  Duration
+		DefaultReplication    int
+		ManagedProperties     map[string]interface{}
 		PreserveVersionIfIdle Duration
+		TrashSweepInterval    Duration
 	}
 	Git struct {
 		Repositories string

-----------------------------------------------------------------------


hooks/post-receive
--