15397: Merge branch 'main'

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

diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index b9eb23d05e663d8d09fcf8d9f89475994e2717d3..39c7d871d8e4116694242698f63fcc7ee24e68a3 100644 (file)
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -86,6 +86,41 @@ func (rtr *router) addRoutes() {
                                return rtr.backend.Logout(ctx, *opts.(*arvados.LogoutOptions))
                        },
                },
+               {
+                       arvados.EndpointAuthorizedKeyCreate,
+                       func() interface{} { return &arvados.CreateOptions{} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.AuthorizedKeyCreate(ctx, *opts.(*arvados.CreateOptions))
+                       },
+               },
+               {
+                       arvados.EndpointAuthorizedKeyUpdate,
+                       func() interface{} { return &arvados.UpdateOptions{} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.AuthorizedKeyUpdate(ctx, *opts.(*arvados.UpdateOptions))
+                       },
+               },
+               {
+                       arvados.EndpointAuthorizedKeyGet,
+                       func() interface{} { return &arvados.GetOptions{} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.AuthorizedKeyGet(ctx, *opts.(*arvados.GetOptions))
+                       },
+               },
+               {
+                       arvados.EndpointAuthorizedKeyList,
+                       func() interface{} { return &arvados.ListOptions{Limit: -1} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.AuthorizedKeyList(ctx, *opts.(*arvados.ListOptions))
+                       },
+               },
+               {
+                       arvados.EndpointAuthorizedKeyDelete,
+                       func() interface{} { return &arvados.DeleteOptions{} },
+                       func(ctx context.Context, opts interface{}) (interface{}, error) {
+                               return rtr.backend.AuthorizedKeyDelete(ctx, *opts.(*arvados.DeleteOptions))
+                       },
+               },
                {
                        arvados.EndpointCollectionCreate,
                        func() interface{} { return &arvados.CreateOptions{} },
@@ -283,6 +318,13 @@ 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{} },
@@ -430,41 +472,6 @@ func (rtr *router) addRoutes() {
                                return rtr.backend.LogDelete(ctx, *opts.(*arvados.DeleteOptions))
                        },
                },
-               {
-                       arvados.EndpointSpecimenCreate,
-                       func() interface{} { return &arvados.CreateOptions{} },
-                       func(ctx context.Context, opts interface{}) (interface{}, error) {
-                               return rtr.backend.SpecimenCreate(ctx, *opts.(*arvados.CreateOptions))
-                       },
-               },
-               {
-                       arvados.EndpointSpecimenUpdate,
-                       func() interface{} { return &arvados.UpdateOptions{} },
-                       func(ctx context.Context, opts interface{}) (interface{}, error) {
-                               return rtr.backend.SpecimenUpdate(ctx, *opts.(*arvados.UpdateOptions))
-                       },
-               },
-               {
-                       arvados.EndpointSpecimenGet,
-                       func() interface{} { return &arvados.GetOptions{} },
-                       func(ctx context.Context, opts interface{}) (interface{}, error) {
-                               return rtr.backend.SpecimenGet(ctx, *opts.(*arvados.GetOptions))
-                       },
-               },
-               {
-                       arvados.EndpointSpecimenList,
-                       func() interface{} { return &arvados.ListOptions{Limit: -1} },
-                       func(ctx context.Context, opts interface{}) (interface{}, error) {
-                               return rtr.backend.SpecimenList(ctx, *opts.(*arvados.ListOptions))
-                       },
-               },
-               {
-                       arvados.EndpointSpecimenDelete,
-                       func() interface{} { return &arvados.DeleteOptions{} },
-                       func(ctx context.Context, opts interface{}) (interface{}, error) {
-                               return rtr.backend.SpecimenDelete(ctx, *opts.(*arvados.DeleteOptions))
-                       },
-               },
                {
                        arvados.EndpointAPIClientAuthorizationCreate,
                        func() interface{} { return &arvados.CreateOptions{} },