From 1940f14b79715ad77396c154f691fbaff2f0e216 Mon Sep 17 00:00:00 2001
From: jano3 <jano@bob.co.za>
Date: Wed, 12 Jun 2024 07:51:47 +0200
Subject: [PATCH] Update GetS3FileKey to remove leading slash since this is now
added automatically by the new SDK version
---
s3/s3.go | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/s3/s3.go b/s3/s3.go
index 509549a..dcf773d 100644
--- a/s3/s3.go
+++ b/s3/s3.go
@@ -498,18 +498,15 @@ func (s ClientWithHelpers) DeleteObjectFromBucket(bucket string, fileName string
func GetS3FileKey(fileName string, folder string) string {
var fileKey string
- // Trim leading and trailing slashes
- fileName = strings.TrimLeft(fileName, "/")
- fileName = strings.TrimRight(fileName, "/")
+ fileName = strings.Trim(fileName, "/")
+ folder = strings.Trim(folder, "/")
if folder != "" {
- folder = strings.TrimLeft(folder, "/")
- folder = strings.TrimRight(folder, "/")
- fileKey += "/" + folder
+ fileKey = fileName + "/" + folder
+ } else {
+ fileKey = fileName
}
- fileKey += "/" + fileName
-
return fileKey
}
--
GitLab