Merge branch '17995-filter-by-comparing-attrs'

[arvados.git] / lib / controller / rpc / conn.go

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index 19e2d32d2cb01979317fff7dd74a16d3842bfe0e..640bbf1c23b837822485bc77b1326791f628c03d 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)
                }
@@ -542,12 +542,6 @@ func (conn *Conn) UserUpdate(ctx context.Context, options arvados.UpdateOptions)
        err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
        return resp, err
 }
-func (conn *Conn) UserUpdateUUID(ctx context.Context, options arvados.UpdateUUIDOptions) (arvados.User, error) {
-       ep := arvados.EndpointUserUpdateUUID
-       var resp arvados.User
-       err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
-       return resp, err
-}
 func (conn *Conn) UserMerge(ctx context.Context, options arvados.UserMergeOptions) (arvados.User, error) {
        ep := arvados.EndpointUserMerge
        var resp arvados.User