[ARVADOS] updated: 2.1.0-440-g6519a2aeb
Git user
git at public.arvados.org
Tue Feb 23 15:57:57 UTC 2021
Summary of changes:
lib/controller/federation/conn.go | 4 ++--
lib/controller/router/router.go | 4 ++--
lib/controller/rpc/conn.go | 2 +-
sdk/go/arvados/api.go | 14 ++------------
sdk/go/arvadostest/api.go | 2 +-
5 files changed, 8 insertions(+), 18 deletions(-)
discards 55f151b4d7272be5db570aa8880020daee588956 (commit)
via 6519a2aebbfad9b9e760be5703099d6bc00fa400 (commit)
via 2f48eeb89cbd46f5cebcae0e97df4238a2e21111 (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 (55f151b4d7272be5db570aa8880020daee588956)
\
N -- N -- N (6519a2aebbfad9b9e760be5703099d6bc00fa400)
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 6519a2aebbfad9b9e760be5703099d6bc00fa400
Author: Ward Vandewege <ward at curii.com>
Date: Tue Feb 23 08:57:05 2021 -0500
17119: start of followup work (just placeholder comment, fixme)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index 7783c1980..5e92903d8 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -79,6 +79,7 @@ func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
defaultItemKind = strings.TrimSuffix(respKind, "List")
}
+ // FIXME do this for the included list too, then drop the kind field from the structs
if items, ok := tmp["items"].([]interface{}); ok {
for i, item := range items {
// Fill in "kind" by inspecting UUID/PDH if
commit 2f48eeb89cbd46f5cebcae0e97df4238a2e21111
Author: Ward Vandewege <ward at curii.com>
Date: Tue Feb 23 10:55:15 2021 -0500
17119: merge SharedOptions into ListOptions, which now gets an extra
'Include' field (unused except optionally when requesting the
shared groups list).
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 82b2feccb..b125e8589 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -422,8 +422,8 @@ func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOpt
return conn.chooseBackend(options.UUID).GroupContents(ctx, options)
}
-func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
- return conn.chooseBackend(options.UUID).GroupShared(ctx, options)
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.ListOptions) (arvados.GroupList, error) {
+ return conn.generated_GroupList(ctx, options)
}
func (conn *Conn) GroupDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Group, error) {
diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index 3f4a7e30b..79afa9dfa 100644
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -265,9 +265,9 @@ func (rtr *router) addRoutes() {
},
{
arvados.EndpointGroupShared,
- func() interface{} { return &arvados.SharedOptions{Limit: -1} },
+ func() interface{} { return &arvados.ListOptions{Limit: -1} },
func(ctx context.Context, opts interface{}) (interface{}, error) {
- return rtr.backend.GroupShared(ctx, *opts.(*arvados.SharedOptions))
+ return rtr.backend.GroupShared(ctx, *opts.(*arvados.ListOptions))
},
},
{
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index e44a8e2d3..7d221cfe7 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -451,7 +451,7 @@ func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOpt
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.ListOptions) (arvados.GroupList, error) {
ep := arvados.EndpointGroupShared
var resp arvados.GroupList
err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index 107d2b392..13d09872b 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -118,6 +118,7 @@ type ListOptions struct {
IncludeOldVersions bool `json:"include_old_versions"`
BypassFederation bool `json:"bypass_federation"`
ForwardedFor string `json:"forwarded_for,omitempty"`
+ Include string `json:"include"`
}
type CreateOptions struct {
@@ -145,17 +146,6 @@ type ContentsOptions struct {
ExcludeHomeProject bool `json:"exclude_home_project"`
}
-type SharedOptions struct {
- UUID string `json:"uuid,omitempty"`
- Select []string `json:"select"`
- Filters []Filter `json:"filters"`
- Limit int64 `json:"limit"`
- Offset int64 `json:"offset"`
- Count string `json:"count"`
- Order []string `json:"order"`
- Include string `json:"include"`
-}
-
type UpdateUUIDOptions struct {
UUID string `json:"uuid"`
NewUUID string `json:"new_uuid"`
@@ -240,7 +230,7 @@ type API interface {
GroupGet(ctx context.Context, options GetOptions) (Group, error)
GroupList(ctx context.Context, options ListOptions) (GroupList, error)
GroupContents(ctx context.Context, options ContentsOptions) (ObjectList, error)
- GroupShared(ctx context.Context, options SharedOptions) (GroupList, error)
+ GroupShared(ctx context.Context, options ListOptions) (GroupList, 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/arvadostest/api.go b/sdk/go/arvadostest/api.go
index c90933bc1..9b418e674 100644
--- a/sdk/go/arvadostest/api.go
+++ b/sdk/go/arvadostest/api.go
@@ -149,7 +149,7 @@ func (as *APIStub) GroupContents(ctx context.Context, options arvados.ContentsOp
as.appendCall(ctx, as.GroupContents, options)
return arvados.ObjectList{}, as.Error
}
-func (as *APIStub) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
+func (as *APIStub) GroupShared(ctx context.Context, options arvados.ListOptions) (arvados.GroupList, error) {
as.appendCall(ctx, as.GroupShared, options)
return arvados.GroupList{}, as.Error
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list