Merge branch '16723-kill-vs-requeue'

[arvados.git] / sdk / go / arvados / blob_signature.go

diff --git a/sdk/go/arvados/blob_signature.go b/sdk/go/arvados/blob_signature.go
index 4a936026fac920d450baa7f83899d1281d09c095..2202016bcc6b8a607c7f7d8241c80166247b87b4 100644 (file)
--- a/sdk/go/arvados/blob_signature.go
+++ b/sdk/go/arvados/blob_signature.go
@@ -53,14 +53,12 @@ var (
 
 // SignManifest signs all locators in the given manifest, discarding
 // any existing signatures.
-func SignManifest(manifest string, apiToken string, ttl time.Duration, permissionSecret []byte) string {
-       expiry := time.Now().Add(ttl)
+func SignManifest(manifest string, apiToken string, expiry time.Time, ttl time.Duration, permissionSecret []byte) string {
        return regexp.MustCompile(`\S+`).ReplaceAllStringFunc(manifest, func(tok string) string {
                if mBlkRe.MatchString(tok) {
                        return SignLocator(mPermHintRe.ReplaceAllString(tok, ""), apiToken, expiry, ttl, permissionSecret)
-               } else {
-                       return tok
                }
+               return tok
        })
 }