17284: Fix missing "/" in error message.

Was showing "//railsapi.internalarvados/..." instead of
"//railsapi.internal/arvados/...".

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 19e2d32d2cb01979317fff7dd74a16d3842bfe0e..940f2184b240fb1827be6080a50700196d5ff3e2 100644 (file)
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -152,7 +152,7 @@ func (conn *Conn) requestAndDecode(ctx context.Context, dst interface{}, ep arva
        }
        err = aClient.RequestAndDecodeContext(ctx, dst, ep.Method, path, body, params)
        if err != nil && conn.RedactHostInErrors {
-               redacted := strings.Replace(err.Error(), conn.baseURL.String(), "//railsapi.internal", -1)
+               redacted := strings.Replace(err.Error(), strings.TrimSuffix(conn.baseURL.String(), "/"), "//railsapi.internal", -1)
                if strings.HasPrefix(redacted, "request failed: ") {
                        redacted = strings.Replace(redacted, "request failed: ", "", -1)
                }