Merge pull request #596 from vania-pooh/master

Added $date placeholder support to S3 (fixes #595)

docs/s3.adoc

@@ -18,6 +18,7 @@ By default uploaded file name is preserved, i.e. S3 path is `/<session-id>.log`
 
 | $browserName | Replaced by Selenium browser name capability value
 | $browserVersion | Replaced by Selenium browser version capability value
+| $date | Replaced by current date, e.g. `2018-11-01`
 | $fileName | Replaced by source file name 
 | $fileExtension | Replaced by source file extension 
 | $fileType | Replaced by `log` for log files and `video` for video files

upload/s3.go

@@ -14,6 +14,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 )
 
 func init() {
@@ -104,6 +105,7 @@ func GetS3Key(keyPattern string, input *UploadRequest) string {
 	key = strings.Replace(key, "$quota", strings.ToLower(sess.Quota), -1)
 	key = strings.Replace(key, "$sessionId", strings.ToLower(input.SessionId), -1)
 	key = strings.Replace(key, "$fileType", strings.ToLower(input.Type), -1)
+	key = strings.Replace(key, "$date", time.Now().Format("2006-01-02"), -1)
 	key = strings.Replace(key, " ", "-", -1)
 	return key
 }