14345: Use "." placeholder to persist empty directories.

[arvados.git] / lib / controller / federation.go

diff --git a/lib/controller/federation.go b/lib/controller/federation.go
index 18f3e4479ed1e6097bee8642bf633f52253ce4b7..e08a1c16742a6d5ea9b251d2906b24f6d5b00e61 100644 (file)
--- a/lib/controller/federation.go
+++ b/lib/controller/federation.go
@@ -52,7 +52,7 @@ func (h *Handler) remoteClusterRequest(remoteID string, req *http.Request) (*htt
        if remote.Insecure {
                client = h.insecureClient
        }
-       return h.proxy.ForwardRequest(saltedReq, urlOut, client)
+       return h.proxy.Do(saltedReq, urlOut, client)
 }
 
 // Buffer request body, parse form parameters in request, and then
@@ -185,9 +185,9 @@ func (h *Handler) createAPItoken(req *http.Request, userUUID string, scopes []st
 (uuid, api_token, expires_at, scopes,
 user_id,
 api_client_id, created_at, updated_at)
-VALUES ($1, $2, now() + INTERVAL '2 weeks', $3,
+VALUES ($1, $2, CURRENT_TIMESTAMP + INTERVAL '2 weeks', $3,
 (SELECT id FROM users WHERE users.uuid=$4 LIMIT 1),
-0, now(), now())`,
+0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)`,
                uuid, token, string(scopesjson), userUUID)
 
        if err != nil {