21578: Merge branch 'main' into 21578-mount-debug
[arvados.git] / lib / controller / router / router.go
index 9a91c69a6b8ab96e82ea01259d49997bf51eecf7..054bcffaf7ecf33b12965bb8e0d0be2d9590e1e0 100644 (file)
@@ -244,13 +244,6 @@ func (rtr *router) addRoutes() {
                                return rtr.backend.ContainerUnlock(ctx, *opts.(*arvados.GetOptions))
                        },
                },
-               {
-                       arvados.EndpointContainerLog,
-                       func() interface{} { return &arvados.ContainerLogOptions{} },
-                       func(ctx context.Context, opts interface{}) (interface{}, error) {
-                               return rtr.backend.ContainerLog(ctx, *opts.(*arvados.ContainerLogOptions))
-                       },
-               },
                {
                        arvados.EndpointContainerSSH,
                        func() interface{} { return &arvados.ContainerSSHOptions{} },
@@ -325,6 +318,20 @@ func (rtr *router) addRoutes() {
                                return rtr.backend.ContainerRequestDelete(ctx, *opts.(*arvados.DeleteOptions))
                        },
                },
+               {
+                       arvados.EndpointContainerRequestContainerStatus,
+                       func() interface{} { return &arvados.GetOptions{} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.ContainerRequestContainerStatus(ctx, *opts.(*arvados.GetOptions))
+                       },
+               },
+               {
+                       arvados.EndpointContainerRequestLog,
+                       func() interface{} { return &arvados.ContainerLogOptions{} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.ContainerRequestLog(ctx, *opts.(*arvados.ContainerLogOptions))
+                       },
+               },
                {
                        arvados.EndpointGroupCreate,
                        func() interface{} { return &arvados.CreateOptions{} },