From 79d79880d01c93725630bce8cda446563df78baa Mon Sep 17 00:00:00 2001 From: James Page <james@uafrica.com> Date: Mon, 17 Oct 2022 15:04:24 +0200 Subject: [PATCH] #29 Explicitly set trailing slash for FilePath in UploadWithSettingsRevised so that folder path string constants don't need to change. --- s3/s3.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/s3/s3.go b/s3/s3.go index 109ef48..dee365b 100644 --- a/s3/s3.go +++ b/s3/s3.go @@ -167,6 +167,12 @@ func (s SessionWithHelpers) UploadWithSettingsRevised(data []byte, bucket string } } + if len(settings.FilePath) > 0 { + if settings.FilePath[len(settings.FilePath)-1] != '/' { + settings.FilePath = fmt.Sprintf("%s/", settings.FilePath) + } + } + fullFileName = fmt.Sprintf("%s%s%s%s", settings.FilePath, settings.FileName, uuidString, settings.FileExt) // Uploaded objects require a key -- GitLab