17119: tweaks for groups endpoints.

[arvados.git] / lib / controller / router / router.go

diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index f5db9426b82f0ca63b1e9b1dfd49e5dc49534e0c..3f4a7e30b1cb61337b90cd103adcdc3f368e055f 100644 (file)
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -242,13 +242,6 @@ func (rtr *router) addRoutes() {
                                return rtr.backend.GroupUpdate(ctx, *opts.(*arvados.UpdateOptions))
                        },
                },
-               {
-                       arvados.EndpointGroupGet,
-                       func() interface{} { return &arvados.GetOptions{} },
-                       func(ctx context.Context, opts interface{}) (interface{}, error) {
-                               return rtr.backend.GroupGet(ctx, *opts.(*arvados.GetOptions))
-                       },
-               },
                {
                        arvados.EndpointGroupList,
                        func() interface{} { return &arvados.ListOptions{Limit: -1} },
@@ -258,18 +251,32 @@ func (rtr *router) addRoutes() {
                },
                {
                        arvados.EndpointGroupContents,
-                       func() interface{} { return &arvados.ListOptions{Limit: -1} },
+                       func() interface{} { return &arvados.ContentsOptions{Limit: -1} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.GroupContents(ctx, *opts.(*arvados.ContentsOptions))
+                       },
+               },
+               {
+                       arvados.EndpointGroupContents2,
+                       func() interface{} { return &arvados.ContentsOptions{Limit: -1} },
                        func(ctx context.Context, opts interface{}) (interface{}, error) {
                                return rtr.backend.GroupContents(ctx, *opts.(*arvados.ContentsOptions))
                        },
                },
                {
                        arvados.EndpointGroupShared,
-                       func() interface{} { return &arvados.ListOptions{Limit: -1} },
+                       func() interface{} { return &arvados.SharedOptions{Limit: -1} },
                        func(ctx context.Context, opts interface{}) (interface{}, error) {
                                return rtr.backend.GroupShared(ctx, *opts.(*arvados.SharedOptions))
                        },
                },
+               {
+                       arvados.EndpointGroupGet,
+                       func() interface{} { return &arvados.GetOptions{} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.GroupGet(ctx, *opts.(*arvados.GetOptions))
+                       },
+               },
                {
                        arvados.EndpointGroupDelete,
                        func() interface{} { return &arvados.DeleteOptions{} },