[ARVADOS] updated: 2.1.0-439-g55f151b4d
Git user
git at public.arvados.org
Tue Feb 23 14:18:24 UTC 2021
Summary of changes:
lib/controller/federation/conn.go | 2 +-
lib/controller/router/response.go | 5 ++---
lib/controller/rpc/conn.go | 4 ++--
sdk/go/arvados/api.go | 2 +-
sdk/go/arvados/group.go | 17 +++++------------
sdk/go/arvadostest/api.go | 4 ++--
6 files changed, 13 insertions(+), 21 deletions(-)
via 55f151b4d7272be5db570aa8880020daee588956 (commit)
via 0dc8eaf204c57a298baf24d91c46053d2a642483 (commit)
from 1b79e315b0adf2744e1df1781c198cf698b1c181 (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 55f151b4d7272be5db570aa8880020daee588956
Author: Ward Vandewege <ward at curii.com>
Date: Tue Feb 23 08:57:05 2021 -0500
17119: start of followup work
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 0dc8eaf204c57a298baf24d91c46053d2a642483
Author: Ward Vandewege <ward at curii.com>
Date: Mon Feb 22 15:32:28 2021 -0500
17119: merge SharedGroupList into GroupList, which now gets an
'Included' field (will be null unless used for shared groups).
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 63a05eb27..82b2feccb 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -422,7 +422,7 @@ 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.SharedGroupList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
return conn.chooseBackend(options.UUID).GroupShared(ctx, options)
}
diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index 2a7bd9e67..7783c1980 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -71,9 +71,7 @@ func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
}
respKind := kind(resp)
- if respKind == "arvados#sharedGroupList" {
- tmp["kind"] = "arvados#groupList"
- } else if respKind != "" {
+ if respKind != "" {
tmp["kind"] = respKind
}
defaultItemKind := ""
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index fc2ca3c5a..e44a8e2d3 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -451,9 +451,9 @@ func (conn *Conn) GroupContents(ctx context.Context, options arvados.ContentsOpt
return resp, err
}
-func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.SharedGroupList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
ep := arvados.EndpointGroupShared
- var resp arvados.SharedGroupList
+ var resp arvados.GroupList
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 9aaa3205b..107d2b392 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -240,7 +240,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) (SharedGroupList, 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)
SpecimenCreate(ctx context.Context, options CreateOptions) (Specimen, error)
diff --git a/sdk/go/arvados/group.go b/sdk/go/arvados/group.go
index b46b596f4..07632059e 100644
--- a/sdk/go/arvados/group.go
+++ b/sdk/go/arvados/group.go
@@ -31,18 +31,11 @@ type Group struct {
// GroupList is an arvados#groupList resource.
type GroupList struct {
- Items []Group `json:"items"`
- ItemsAvailable int `json:"items_available"`
- Offset int `json:"offset"`
- Limit int `json:"limit"`
-}
-
-// SharedGroupList is an arvados#groupList resource.
-type SharedGroupList struct {
- Included []interface{} `json:"included"`
- Items []Group `json:"items"`
- Offset int `json:"offset"`
- Limit int `json:"limit"`
+ Items []Group `json:"items"`
+ ItemsAvailable int `json:"items_available"`
+ Offset int `json:"offset"`
+ Limit int `json:"limit"`
+ Included []interface{} `json:"included"`
}
// ObjectList is an arvados#objectList resource.
diff --git a/sdk/go/arvadostest/api.go b/sdk/go/arvadostest/api.go
index 781ede1d5..c90933bc1 100644
--- a/sdk/go/arvadostest/api.go
+++ b/sdk/go/arvadostest/api.go
@@ -149,9 +149,9 @@ 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.SharedGroupList, error) {
+func (as *APIStub) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
as.appendCall(ctx, as.GroupShared, options)
- return arvados.SharedGroupList{}, as.Error
+ return arvados.GroupList{}, as.Error
}
func (as *APIStub) GroupDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Group, error) {
as.appendCall(ctx, as.GroupDelete, options)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list