[ARVADOS] updated: 2.1.0-434-g656fa186d
Git user
git at public.arvados.org
Thu Feb 11 15:07:19 UTC 2021
Summary of changes:
lib/controller/router/request.go | 1 +
lib/controller/router/router.go | 7 +++++++
sdk/go/arvados/api.go | 1 +
services/api/app/models/group.rb | 2 +-
4 files changed, 10 insertions(+), 1 deletion(-)
discards 8694e03e91f3dbf610bc14bd07dadf1ffb518b1b (commit)
discards db8b675577084b69cba09c9919aa0ecc109f2ba5 (commit)
via 656fa186d6f471ceec2f1c996006c31a64a14dba (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (8694e03e91f3dbf610bc14bd07dadf1ffb518b1b)
\
N -- N -- N (656fa186d6f471ceec2f1c996006c31a64a14dba)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 656fa186d6f471ceec2f1c996006c31a64a14dba
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..31faa04b8 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -418,11 +418,11 @@ 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)
}
-func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.ObjectList, error) {
return conn.chooseBackend(options.UUID).GroupShared(ctx, options)
}
diff --git a/lib/controller/router/request.go b/lib/controller/router/request.go
index 977a15f3a..eae9e0a8c 100644
--- a/lib/controller/router/request.go
+++ b/lib/controller/router/request.go
@@ -170,6 +170,8 @@ var boolParams = map[string]bool{
"redirect_to_new_user": true,
"send_notification_email": true,
"bypass_federation": true,
+ "recursive": true,
+ "exclude_home_project": true,
}
func stringToBool(s string) bool {
diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index f5db9426b..3f4a7e30b 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,32 @@ 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.EndpointGroupContents2,
+ 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..36411adfa 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -444,16 +444,16 @@ 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
}
-func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.ObjectList, error) {
ep := arvados.EndpointGroupShared
- 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..7b404a599 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -55,8 +55,9 @@ 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", ""}
+ EndpointGroupContents2 = APIEndpoint{"GET", "arvados/v1/groups/{uuid}/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,8 +237,8 @@ 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)
- GroupShared(ctx context.Context, options SharedOptions) (GroupList, error)
+ GroupContents(ctx context.Context, options ContentsOptions) (ObjectList, error)
+ GroupShared(ctx context.Context, options SharedOptions) (ObjectList, error)
GroupDelete(ctx context.Context, options DeleteOptions) (Group, error)
GroupUntrash(ctx context.Context, options UntrashOptions) (Group, error)
SpecimenCreate(ctx context.Context, options CreateOptions) (Specimen, 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"
}
diff --git a/sdk/go/arvadostest/api.go b/sdk/go/arvadostest/api.go
index fe8c32466..f4e725f7e 100644
--- a/sdk/go/arvadostest/api.go
+++ b/sdk/go/arvadostest/api.go
@@ -145,18 +145,22 @@ func (as *APIStub) GroupList(ctx context.Context, options arvados.ListOptions) (
as.appendCall(ctx, as.GroupList, options)
return arvados.GroupList{}, as.Error
}
-func (as *APIStub) GroupContents(ctx context.Context, options arvados.GetOptions) (map[string]interface{}, error) {
+func (as *APIStub) GroupContents(ctx context.Context, options arvados.ContentsOptions) (arvados.ObjectList, error) {
as.appendCall(ctx, as.GroupContents, options)
- return nil, as.Error
+ return arvados.ObjectList{}, as.Error
}
-func (as *APIStub) GroupShared(ctx context.Context, options arvados.GetOptions) (map[string]interface{}, error) {
+func (as *APIStub) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.ObjectList, error) {
as.appendCall(ctx, as.GroupShared, options)
- return nil, as.Error
+ return arvados.ObjectList{}, as.Error
}
func (as *APIStub) GroupDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Group, error) {
as.appendCall(ctx, as.GroupDelete, options)
return arvados.Group{}, as.Error
}
+func (as *APIStub) GroupUntrash(ctx context.Context, options arvados.UntrashOptions) (arvados.Group, error) {
+ as.appendCall(ctx, as.GroupUntrash, options)
+ return arvados.Group{}, as.Error
+}
func (as *APIStub) SpecimenCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Specimen, error) {
as.appendCall(ctx, as.SpecimenCreate, options)
return arvados.Specimen{}, as.Error
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list