[ARVADOS] updated: 2.1.0-434-g0a56c2ffa
Git user
git at public.arvados.org
Wed Feb 10 21:19:54 UTC 2021
Summary of changes:
lib/controller/federation/conn.go | 2 +-
lib/controller/router/request.go | 1 +
lib/controller/router/router.go | 18 +++++++++---------
lib/controller/rpc/conn.go | 4 ++--
sdk/go/arvados/api.go | 6 +++---
sdk/go/arvados/group.go | 8 ++++++++
6 files changed, 24 insertions(+), 15 deletions(-)
via 0a56c2ffa3244d462f5d03a8e8630e5e0ce4ee98 (commit)
from 9f81dc57445cd51b92e34a82742765788c35620c (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 0a56c2ffa3244d462f5d03a8e8630e5e0ce4ee98
Author: Ward Vandewege <ward at curii.com>
Date: Wed Feb 10 16:19:40 2021 -0500
17119: tweaks for groups endpoints.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index b43e79c3f..4f1efdb56 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -418,7 +418,7 @@ func (conn *Conn) GroupList(ctx context.Context, options arvados.ListOptions) (a
return conn.generated_GroupList(ctx, options)
}
-func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOptions) (arvados.GroupList, error) {
+func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOptions) (arvados.ObjectList, error) {
return conn.chooseBackend(options.UUID).GroupContents(ctx, options)
}
diff --git a/lib/controller/router/request.go b/lib/controller/router/request.go
index 977a15f3a..d0e6b229c 100644
--- a/lib/controller/router/request.go
+++ b/lib/controller/router/request.go
@@ -170,6 +170,7 @@ var boolParams = map[string]bool{
"redirect_to_new_user": true,
"send_notification_email": true,
"bypass_federation": true,
+ "recursive": true,
}
func stringToBool(s string) bool {
diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index f5db9426b..c7d882856 100644
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -242,13 +242,6 @@ func (rtr *router) addRoutes() {
return rtr.backend.GroupUpdate(ctx, *opts.(*arvados.UpdateOptions))
},
},
- {
- arvados.EndpointGroupGet,
- func() interface{} { return &arvados.GetOptions{} },
- func(ctx context.Context, opts interface{}) (interface{}, error) {
- return rtr.backend.GroupGet(ctx, *opts.(*arvados.GetOptions))
- },
- },
{
arvados.EndpointGroupList,
func() interface{} { return &arvados.ListOptions{Limit: -1} },
@@ -258,18 +251,25 @@ func (rtr *router) addRoutes() {
},
{
arvados.EndpointGroupContents,
- func() interface{} { return &arvados.ListOptions{Limit: -1} },
+ func() interface{} { return &arvados.ContentsOptions{Limit: -1} },
func(ctx context.Context, opts interface{}) (interface{}, error) {
return rtr.backend.GroupContents(ctx, *opts.(*arvados.ContentsOptions))
},
},
{
arvados.EndpointGroupShared,
- func() interface{} { return &arvados.ListOptions{Limit: -1} },
+ func() interface{} { return &arvados.SharedOptions{Limit: -1} },
func(ctx context.Context, opts interface{}) (interface{}, error) {
return rtr.backend.GroupShared(ctx, *opts.(*arvados.SharedOptions))
},
},
+ {
+ arvados.EndpointGroupGet,
+ func() interface{} { return &arvados.GetOptions{} },
+ func(ctx context.Context, opts interface{}) (interface{}, error) {
+ return rtr.backend.GroupGet(ctx, *opts.(*arvados.GetOptions))
+ },
+ },
{
arvados.EndpointGroupDelete,
func() interface{} { return &arvados.DeleteOptions{} },
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 69bb06c0f..e44a8e2d3 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -444,9 +444,9 @@ func (conn *Conn) GroupList(ctx context.Context, options arvados.ListOptions) (a
return resp, err
}
-func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOptions) (arvados.GroupList, error) {
+func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOptions) (arvados.ObjectList, error) {
ep := arvados.EndpointGroupContents
- var resp arvados.GroupList
+ var resp arvados.ObjectList
err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
return resp, err
}
diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index 3331be58d..500a80245 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -55,8 +55,8 @@ var (
EndpointGroupUpdate = APIEndpoint{"PATCH", "arvados/v1/groups/{uuid}", "group"}
EndpointGroupGet = APIEndpoint{"GET", "arvados/v1/groups/{uuid}", ""}
EndpointGroupList = APIEndpoint{"GET", "arvados/v1/groups", ""}
- EndpointGroupContents = APIEndpoint{"GET", "arvados/v1/groups/{uuid}/contents", ""}
- EndpointGroupShared = APIEndpoint{"GET", "arvados/v1/groups/{uuid}/shared", ""}
+ EndpointGroupContents = APIEndpoint{"GET", "arvados/v1/groups/contents", ""}
+ EndpointGroupShared = APIEndpoint{"GET", "arvados/v1/groups/shared", ""}
EndpointGroupDelete = APIEndpoint{"DELETE", "arvados/v1/groups/{uuid}", ""}
EndpointGroupUntrash = APIEndpoint{"POST", "arvados/v1/groups/{uuid}/untrash", ""}
EndpointUserActivate = APIEndpoint{"POST", "arvados/v1/users/{uuid}/activate", ""}
@@ -236,7 +236,7 @@ type API interface {
GroupUpdate(ctx context.Context, options UpdateOptions) (Group, error)
GroupGet(ctx context.Context, options GetOptions) (Group, error)
GroupList(ctx context.Context, options ListOptions) (GroupList, error)
- GroupContents(ctx context.Context, options ContentsOptions) (GroupList, error)
+ GroupContents(ctx context.Context, options ContentsOptions) (ObjectList, error)
GroupShared(ctx context.Context, options SharedOptions) (GroupList, error)
GroupDelete(ctx context.Context, options DeleteOptions) (Group, error)
GroupUntrash(ctx context.Context, options UntrashOptions) (Group, error)
diff --git a/sdk/go/arvados/group.go b/sdk/go/arvados/group.go
index 26bd6e187..538098815 100644
--- a/sdk/go/arvados/group.go
+++ b/sdk/go/arvados/group.go
@@ -36,6 +36,14 @@ type GroupList struct {
Limit int `json:"limit"`
}
+// ObjectList is an arvados#objectList resource.
+type ObjectList struct {
+ Items []interface{} `json:"items"`
+ ItemsAvailable int `json:"items_available"`
+ Offset int `json:"offset"`
+ Limit int `json:"limit"`
+}
+
func (g Group) resourceName() string {
return "group"
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list