In GetS3FileKey, check if "folder" string exist before appending "/"

s3/s3.go

@@ -312,12 +312,19 @@ func (s SessionWithHelpers) DeleteObjectFromBucket(bucket string, fileName strin
 }
 
 func GetS3FileKey(fileName string, folder string) string {
+	var fileKey string
+
 	// Trim leading and trailing slashes
 	fileName = strings.TrimLeft(fileName, "/")
 	fileName = strings.TrimRight(fileName, "/")
 
-	folder = strings.TrimLeft(folder, "/")
-	folder = strings.TrimRight(folder, "/")
+	if folder != "" {
+		folder = strings.TrimLeft(folder, "/")
+		folder = strings.TrimRight(folder, "/")
+		fileKey += "/" + folder
+	}
+
+	fileKey += "/" + fileName
 
-	return "/" + folder + "/" + fileName
+	return fileKey
 }