From d5f878c37f321c71c785fc7d8b76c4a32f148faa Mon Sep 17 00:00:00 2001
From: Ward Vandewege <ward@curii.com>
Date: Tue, 23 Feb 2021 11:03:03 -0500
Subject: [PATCH] 17119: rename ContentsOptions to GroupContentsOptions.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---
 lib/controller/federation/conn.go | 2 +-
 lib/controller/router/router.go   | 8 ++++----
 lib/controller/rpc/conn.go        | 2 +-
 sdk/go/arvados/api.go             | 4 ++--
 sdk/go/arvadostest/api.go         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index 51cf7f55e8..09540a5f4b 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 79afa9dfac..e7a3b27bf4 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 7d221cfe77..b3713d938b 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 13d09872b2..56c665c304 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 9b418e674e..d9708e3b1a 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
 }
-- 
2.30.2