From 8439ad9df4a6d9b28bbed985bf87599f2d1b3820 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 13 Jan 2021 23:22:40 -0500 Subject: [PATCH] 17170: Fixup error display. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/controller/rpc/conn.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go index 5fecf662f4..26f41e1286 100644 --- a/lib/controller/rpc/conn.go +++ b/lib/controller/rpc/conn.go @@ -343,12 +343,12 @@ func (conn *Conn) ContainerSSH(ctx context.Context, options arvados.ContainerSSH body, _ := ioutil.ReadAll(resp.Body) var message string var errDoc httpserver.ErrorResponse - if err := json.Unmarshal(body, &errDoc); err != nil { + if err := json.Unmarshal(body, &errDoc); err == nil { message = strings.Join(errDoc.Errors, "; ") } else { message = fmt.Sprintf("%q", body) } - err = fmt.Errorf("server did not provide a tunnel: %q (HTTP %d)", message, resp.StatusCode) + err = fmt.Errorf("server did not provide a tunnel: %s (HTTP %d)", message, resp.StatusCode) return } if strings.ToLower(resp.Header.Get("Upgrade")) != "ssh" || -- 2.39.5