[ARVADOS] updated: 2.1.0-436-g67c78bdee

[Git user]

Summary of changes:
 lib/controller/federation/conn.go | 2 +-
 lib/controller/router/response.go | 4 +++-
 lib/controller/rpc/conn.go        | 4 ++--
 sdk/go/arvados/api.go             | 2 +-
 sdk/go/arvados/group.go           | 8 ++++++++
 sdk/go/arvadostest/api.go         | 4 ++--
 6 files changed, 17 insertions(+), 7 deletions(-)

  discards  52850b25333b56c1d6c8c670e45a23bcb4e1d79e (commit)
       via  67c78bdeecd58a5bf7dc78889dea3a65b1f14e1e (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 (52850b25333b56c1d6c8c670e45a23bcb4e1d79e)
            \
             N -- N -- N (67c78bdeecd58a5bf7dc78889dea3a65b1f14e1e)

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 67c78bdeecd58a5bf7dc78889dea3a65b1f14e1e
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Feb 11 11:34:35 2021 -0500

    17119: fix response type of the shared groups endpoint.
    
    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 31faa04b8..3e6f5dc17 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.ObjectList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.SharedGroupList, error) {
 	return conn.chooseBackend(options.UUID).GroupShared(ctx, options)
 }
 
diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index d554ab930..656e73170 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -71,7 +71,9 @@ func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
 	}
 
 	respKind := kind(resp)
-	if respKind != "" {
+	if respKind == "arvados#sharedGroupList" {
+		tmp["kind"] = "arvados#groupList"
+	} else if respKind != "" {
 		tmp["kind"] = respKind
 	}
 	defaultItemKind := ""
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 36411adfa..fc2ca3c5a 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.ObjectList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.SharedGroupList, error) {
 	ep := arvados.EndpointGroupShared
-	var resp arvados.ObjectList
+	var resp arvados.SharedGroupList
 	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 d17f8735b..c440f3645 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -239,7 +239,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) (ObjectList, error)
+	GroupShared(ctx context.Context, options SharedOptions) (SharedGroupList, 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 538098815..d63e7f527 100644
--- a/sdk/go/arvados/group.go
+++ b/sdk/go/arvados/group.go
@@ -36,6 +36,14 @@ type GroupList struct {
 	Limit          int     `json:"limit"`
 }
 
+// SharedGroupList is an arvados#groupList resource.
+type SharedGroupList struct {
+	Included []Group `json:"included"`
+	Items    []Group `json:"items"`
+	Offset   int     `json:"offset"`
+	Limit    int     `json:"limit"`
+}
+
 // ObjectList is an arvados#objectList resource.
 type ObjectList struct {
 	Items          []interface{} `json:"items"`
diff --git a/sdk/go/arvadostest/api.go b/sdk/go/arvadostest/api.go
index f4e725f7e..781ede1d5 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.ObjectList, error) {
+func (as *APIStub) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.SharedGroupList, error) {
 	as.appendCall(ctx, as.GroupShared, options)
-	return arvados.ObjectList{}, as.Error
+	return arvados.SharedGroupList{}, as.Error
 }
 func (as *APIStub) GroupDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Group, error) {
 	as.appendCall(ctx, as.GroupDelete, options)

-----------------------------------------------------------------------


hooks/post-receive
--