[ARVADOS] updated: 2.1.0-442-g9c54e08e2
Git user
git at public.arvados.org
Tue Feb 23 22:14:19 UTC 2021
Summary of changes:
lib/controller/federation/conn.go | 5 +++--
lib/controller/router/response.go | 14 ++++++++++++--
lib/controller/router/router.go | 10 +++++-----
lib/controller/rpc/conn.go | 2 +-
sdk/go/arvados/api.go | 6 +++---
sdk/go/arvados/container.go | 1 -
sdk/go/arvados/group.go | 1 -
sdk/go/arvados/job.go | 1 -
sdk/go/arvados/pipeline_instance.go | 1 -
sdk/go/arvados/pipeline_template.go | 1 -
sdk/go/arvados/trait.go | 1 -
sdk/go/arvados/user.go | 1 -
sdk/go/arvadostest/api.go | 2 +-
13 files changed, 25 insertions(+), 21 deletions(-)
discards 6519a2aebbfad9b9e760be5703099d6bc00fa400 (commit)
discards 2f48eeb89cbd46f5cebcae0e97df4238a2e21111 (commit)
discards 0dc8eaf204c57a298baf24d91c46053d2a642483 (commit)
via 9c54e08e292d86ed155a6ce8b873867511c5a529 (commit)
via 75429851ee80a7a0f836b16a58b3cacaba076a0b (commit)
via d5f878c37f321c71c785fc7d8b76c4a32f148faa (commit)
via 4ad0281b1ec62d5f25103c27c639b84d58378eac (commit)
via 6d7139a0e133bdbf780a358db198b14a2ded4b7c (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 (6519a2aebbfad9b9e760be5703099d6bc00fa400)
\
N -- N -- N (9c54e08e292d86ed155a6ce8b873867511c5a529)
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 9c54e08e292d86ed155a6ce8b873867511c5a529
Author: Ward Vandewege <ward at curii.com>
Date: Tue Feb 23 08:57:05 2021 -0500
17119: drop the 'Kind' fields from the structs, autogenerate them instead.
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 309ed48f6..6e31e7072 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -77,13 +77,20 @@ func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
if included, ok := tmp["included"]; ok && included == nil {
tmp["included"] = make([]interface{}, 0)
}
-
defaultItemKind := ""
if strings.HasSuffix(respKind, "List") {
defaultItemKind = strings.TrimSuffix(respKind, "List")
}
- if items, ok := tmp["items"].([]interface{}); ok {
+ var items, included []interface{}
+ var ok bool
+ items, _ = tmp["items"].([]interface{})
+ included, ok = tmp["included"].([]interface{})
+ if ok && len(included) > 0 {
+ items = append(items, included...)
+ }
+
+ if len(items) > 0 {
for i, item := range items {
// Fill in "kind" by inspecting UUID/PDH if
// possible; fall back on assuming each
diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index b8530db34..f54263470 100644
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -43,7 +43,6 @@ type ContainerRequest struct {
ModifiedByUserUUID string `json:"modified_by_user_uuid"`
ModifiedAt time.Time `json:"modified_at"`
Href string `json:"href"`
- Kind string `json:"kind"`
Etag string `json:"etag"`
Name string `json:"name"`
Description string `json:"description"`
diff --git a/sdk/go/arvados/group.go b/sdk/go/arvados/group.go
index 07632059e..d5243dc17 100644
--- a/sdk/go/arvados/group.go
+++ b/sdk/go/arvados/group.go
@@ -16,7 +16,6 @@ type Group struct {
GroupClass string `json:"group_class"`
Etag string `json:"etag"`
Href string `json:"href"`
- Kind string `json:"kind"`
TrashAt *time.Time `json:"trash_at"`
CreatedAt time.Time `json:"created_at"`
ModifiedAt time.Time `json:"modified_at"`
diff --git a/sdk/go/arvados/job.go b/sdk/go/arvados/job.go
index 7b287b599..18c84b108 100644
--- a/sdk/go/arvados/job.go
+++ b/sdk/go/arvados/job.go
@@ -38,7 +38,6 @@ type Job struct {
Description string `json:"description"`
State string `json:"state"`
ArvadosSDKVersion string `json:"arvados_sdk_version"`
- Kind string `json:"kind"`
Components string `json:"components"`
ScriptParametersDigest string `json:"script_parameters_digest"`
WritableBy []string `json:"writable_by,omitempty"`
diff --git a/sdk/go/arvados/pipeline_instance.go b/sdk/go/arvados/pipeline_instance.go
index f2c0c81a0..c3645fd70 100644
--- a/sdk/go/arvados/pipeline_instance.go
+++ b/sdk/go/arvados/pipeline_instance.go
@@ -25,7 +25,6 @@ type PipelineInstance struct {
StartedAt time.Time `json:"started_at"`
FinishedAt time.Time `json:"finished_at"`
Description string `json:"description"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
diff --git a/sdk/go/arvados/pipeline_template.go b/sdk/go/arvados/pipeline_template.go
index d4677164c..85fec1c12 100644
--- a/sdk/go/arvados/pipeline_template.go
+++ b/sdk/go/arvados/pipeline_template.go
@@ -19,7 +19,6 @@ type PipelineTemplate struct {
Components string `json:"components"`
UpdatedAt time.Time `json:"updated_at"`
Description string `json:"description"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
diff --git a/sdk/go/arvados/trait.go b/sdk/go/arvados/trait.go
index 3195958f5..9a2e3cf67 100644
--- a/sdk/go/arvados/trait.go
+++ b/sdk/go/arvados/trait.go
@@ -18,7 +18,6 @@ type Trait struct {
Name string `json:"name"`
Properties string `json:"properties"`
UpdatedAt time.Time `json:"updated_at"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
diff --git a/sdk/go/arvados/user.go b/sdk/go/arvados/user.go
index 7693c8442..68960144a 100644
--- a/sdk/go/arvados/user.go
+++ b/sdk/go/arvados/user.go
@@ -16,7 +16,6 @@ type User struct {
Email string `json:"email"`
FullName string `json:"full_name"`
FirstName string `json:"first_name"`
- Kind string `json:"kind"`
LastName string `json:"last_name"`
IdentityURL string `json:"identity_url"`
IsInvited bool `json:"is_invited"`
commit 75429851ee80a7a0f836b16a58b3cacaba076a0b
Author: Ward Vandewege <ward at curii.com>
Date: Tue Feb 23 11:05:53 2021 -0500
17119: rename alternate EndpointGroupContents, add comment.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index e7a3b27bf..d7096ab9f 100644
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -257,7 +257,7 @@ func (rtr *router) addRoutes() {
},
},
{
- arvados.EndpointGroupContents2,
+ arvados.EndpointGroupContentsUUIDInPath,
func() interface{} { return &arvados.GroupContentsOptions{Limit: -1} },
func(ctx context.Context, opts interface{}) (interface{}, error) {
return rtr.backend.GroupContents(ctx, *opts.(*arvados.GroupContentsOptions))
diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index 56c665c30..bcb51d6b2 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -56,7 +56,7 @@ var (
EndpointGroupGet = APIEndpoint{"GET", "arvados/v1/groups/{uuid}", ""}
EndpointGroupList = APIEndpoint{"GET", "arvados/v1/groups", ""}
EndpointGroupContents = APIEndpoint{"GET", "arvados/v1/groups/contents", ""}
- EndpointGroupContents2 = APIEndpoint{"GET", "arvados/v1/groups/{uuid}/contents", ""}
+ EndpointGroupContentsUUIDInPath = APIEndpoint{"GET", "arvados/v1/groups/{uuid}/contents", ""} // Alternative HTTP route; client-side code should always use EndpointGroupContents instead
EndpointGroupShared = APIEndpoint{"GET", "arvados/v1/groups/shared", ""}
EndpointGroupDelete = APIEndpoint{"DELETE", "arvados/v1/groups/{uuid}", ""}
EndpointGroupUntrash = APIEndpoint{"POST", "arvados/v1/groups/{uuid}/untrash", ""}
commit d5f878c37f321c71c785fc7d8b76c4a32f148faa
Author: Ward Vandewege <ward at curii.com>
Date: Tue Feb 23 11:03:03 2021 -0500
17119: rename ContentsOptions to GroupContentsOptions.
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 51cf7f55e..09540a5f4 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.ObjectList, error) {
+func (conn *Conn) GroupContents(ctx context.Context, options arvados.GroupContentsOptions) (arvados.ObjectList, error) {
return conn.chooseBackend(options.UUID).GroupContents(ctx, options)
}
diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index 79afa9dfa..e7a3b27bf 100644
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -251,16 +251,16 @@ func (rtr *router) addRoutes() {
},
{
arvados.EndpointGroupContents,
- func() interface{} { return &arvados.ContentsOptions{Limit: -1} },
+ func() interface{} { return &arvados.GroupContentsOptions{Limit: -1} },
func(ctx context.Context, opts interface{}) (interface{}, error) {
- return rtr.backend.GroupContents(ctx, *opts.(*arvados.ContentsOptions))
+ return rtr.backend.GroupContents(ctx, *opts.(*arvados.GroupContentsOptions))
},
},
{
arvados.EndpointGroupContents2,
- func() interface{} { return &arvados.ContentsOptions{Limit: -1} },
+ func() interface{} { return &arvados.GroupContentsOptions{Limit: -1} },
func(ctx context.Context, opts interface{}) (interface{}, error) {
- return rtr.backend.GroupContents(ctx, *opts.(*arvados.ContentsOptions))
+ return rtr.backend.GroupContents(ctx, *opts.(*arvados.GroupContentsOptions))
},
},
{
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 7d221cfe7..b3713d938 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -444,7 +444,7 @@ 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.ObjectList, error) {
+func (conn *Conn) GroupContents(ctx context.Context, options arvados.GroupContentsOptions) (arvados.ObjectList, error) {
ep := arvados.EndpointGroupContents
var resp arvados.ObjectList
err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index 13d09872b..56c665c30 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -134,7 +134,7 @@ type UpdateOptions struct {
BypassFederation bool `json:"bypass_federation"`
}
-type ContentsOptions struct {
+type GroupContentsOptions struct {
UUID string `json:"uuid,omitempty"`
Select []string `json:"select"`
Filters []Filter `json:"filters"`
@@ -229,7 +229,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) (ObjectList, error)
+ GroupContents(ctx context.Context, options GroupContentsOptions) (ObjectList, 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)
diff --git a/sdk/go/arvadostest/api.go b/sdk/go/arvadostest/api.go
index 9b418e674..d9708e3b1 100644
--- a/sdk/go/arvadostest/api.go
+++ b/sdk/go/arvadostest/api.go
@@ -145,7 +145,7 @@ 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.ContentsOptions) (arvados.ObjectList, error) {
+func (as *APIStub) GroupContents(ctx context.Context, options arvados.GroupContentsOptions) (arvados.ObjectList, error) {
as.appendCall(ctx, as.GroupContents, options)
return arvados.ObjectList{}, as.Error
}
commit 4ad0281b1ec62d5f25103c27c639b84d58378eac
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 88648fbb1..51cf7f55e 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.GroupList, error) {
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.ListOptions) (arvados.GroupList, error) {
// FIXME is this right?? We don't have options.UUID to cue the chooseBackend off
return conn.chooseBackend(conn.cluster.ClusterID).GroupShared(ctx, options)
}
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
}
commit 6d7139a0e133bdbf780a358db198b14a2ded4b7c
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..88648fbb1 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -422,8 +422,9 @@ 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) {
- return conn.chooseBackend(options.UUID).GroupShared(ctx, options)
+func (conn *Conn) GroupShared(ctx context.Context, options arvados.SharedOptions) (arvados.GroupList, error) {
+ // FIXME is this right?? We don't have options.UUID to cue the chooseBackend off
+ return conn.chooseBackend(conn.cluster.ClusterID).GroupShared(ctx, options)
}
func (conn *Conn) GroupDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Group, error) {
diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index 2a7bd9e67..309ed48f6 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -71,11 +71,13 @@ 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
}
+ if included, ok := tmp["included"]; ok && included == nil {
+ tmp["included"] = make([]interface{}, 0)
+ }
+
defaultItemKind := ""
if strings.HasSuffix(respKind, "List") {
defaultItemKind = strings.TrimSuffix(respKind, "List")
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