Factors out resolveBlobPath, renames expires -> expiry

2015-01-08 17:45:21 -08:00
parent cc3c648f44
commit f22ad79d36
4 changed files with 51 additions and 62 deletions
--- a/storagedriver/s3/s3.go
+++ b/storagedriver/s3/s3.go
@@ -588,7 +588,7 @@ func (d *Driver) URLFor(path string, options map[string]interface{}) (string, er
 	}

 	expiresTime := time.Now().Add(20 * time.Minute)
-	expires, ok := options["expires"]
+	expires, ok := options["expiry"]
 	if ok {
 		et, ok := expires.(time.Time)
 		if ok {