From 2261d1fd9e1b69d0a60f1f7fe9029317aeb4cf52 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 6 Jul 2022 23:08:21 -0400 Subject: [PATCH] 19166: Return better error message to incompatible arvados-client. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/controller/router/router.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go index a87dbca926..80d5e92985 100644 --- a/lib/controller/router/router.go +++ b/lib/controller/router/router.go @@ -244,6 +244,17 @@ func (rtr *router) addRoutes() { return rtr.backend.ContainerSSH(ctx, *opts.(*arvados.ContainerSSHOptions)) }, }, + { + // arvados-client built before commit + // bdc29d3129f6d75aa9ce0a24ffb849a272b06f08 + // used GET with params in headers instead of + // POST form + arvados.APIEndpoint{"GET", "arvados/v1/connect/{uuid}/ssh", ""}, + func() interface{} { return &arvados.ContainerSSHOptions{} }, + func(ctx context.Context, opts interface{}) (interface{}, error) { + return nil, httpError(http.StatusGone, fmt.Errorf("API endpoint is obsolete -- please upgrade your arvados-client program")) + }, + }, { arvados.EndpointContainerGatewayTunnel, func() interface{} { return &arvados.ContainerGatewayTunnelOptions{} }, -- 2.30.2