17170: Fixup error display.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 5fecf662f4bef7b1a685987834bea31d98b71e61..26f41e128605934ca7363813539f6192db7bbbf1 100644 (file)
--- 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" ||