[ARVADOS] updated: 1.3.0-1969-g66487d4a2
Git user
git at public.arvados.org
Mon Dec 9 21:08:13 UTC 2019
Summary of changes:
lib/controller/router/response.go | 8 +++++---
sdk/go/arvados/collection.go | 1 +
sdk/go/arvados/user.go | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
via 66487d4a2aa7b5af3227266081e016421a7ce9f2 (commit)
from 2750881871a4f14295d704ec8d1af04fa325e638 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 66487d4a2aa7b5af3227266081e016421a7ce9f2
Author: Tom Clegg <tom at tomclegg.ca>
Date: Mon Dec 9 16:07:37 2019 -0500
15922: Preserve writable_by in user and collection responses.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index e3ec37a6e..7e1b70249 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -45,9 +45,11 @@ func applySelectParam(selectParam []string, orig map[string]interface{}) map[str
selected[attr] = v
}
}
- // Preserve "kind" even if not requested
- if v, ok := orig["kind"]; ok {
- selected["kind"] = v
+ // Some keys are always preserved, even if not requested
+ for _, k := range []string{"kind", "writable_by"} {
+ if v, ok := orig[k]; ok {
+ selected[k] = v
+ }
}
return selected
}
diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index e8b0f9cc9..6abe03a79 100644
--- a/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@ -36,6 +36,7 @@ type Collection struct {
DeleteAt *time.Time `json:"delete_at"`
IsTrashed bool `json:"is_trashed"`
Properties map[string]interface{} `json:"properties"`
+ WritableBy []string `json:"writable_by"`
}
func (c Collection) resourceName() string {
diff --git a/sdk/go/arvados/user.go b/sdk/go/arvados/user.go
index 30bc094d0..2dc43f59c 100644
--- a/sdk/go/arvados/user.go
+++ b/sdk/go/arvados/user.go
@@ -24,6 +24,7 @@ type User struct {
ModifiedByUserUUID string `json:"modified_by_user_uuid"`
ModifiedByClientUUID string `json:"modified_by_client_uuid"`
Prefs map[string]interface{} `json:"prefs"`
+ WritableBy []string `json:"writable_by"`
}
// UserList is an arvados#userList resource.
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list