[ARVADOS] created: 2.1.0-748-g73c880171

[Git user]

        at  73c880171652a0fd41e38b47de02fc79e4ae05d2 (commit)


commit 73c880171652a0fd41e38b47de02fc79e4ae05d2
Author: Tom Clegg <tom at curii.com>
Date:   Tue May 4 01:15:20 2021 -0400

    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 at curii.com>

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 19e2d32d2..940f2184b 100644
--- 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)
 		}

-----------------------------------------------------------------------


hooks/post-receive
--