From 6e47eeea1c29c0dfb86e82fe0ba2422329176bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?France=CC=81=20Wilke?= <francewilke@gmail.com>
Date: Mon, 31 Jan 2022 18:38:36 +0200
Subject: [PATCH] In GetS3FileKey, check if "folder" string exist before
appending "/"
---
s3/s3.go | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/s3/s3.go b/s3/s3.go
index 9784db8..f614117 100644
--- a/s3/s3.go
+++ b/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
}
--
GitLab