added fileName

pagopa · Jun 5, 2024 · 858f140 · 858f140
1 parent 64ecc19
commit 858f140
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/file-manager/src/main/scala/it/pagopa/interop/commons/files/service/FileManager.scala b/file-manager/src/main/scala/it/pagopa/interop/commons/files/service/FileManager.scala
@@ -42,9 +42,9 @@ trait FileManager {
 
   def close(): Unit
 
-  def generateGetPresignedUrl(containerPath: String, path: String): Try[String]
+  def generateGetPresignedUrl(bucketName: String, path: String, fileName: String): Try[String]
 
-  def generatePutPresignedUrl(containerPath: String, path: String): Try[String]
+  def generatePutPresignedUrl(bucketName: String, path: String, fileName: String): Try[String]
 }
 
 object FileManager {

diff --git a/...manager/src/main/scala/it/pagopa/interop/commons/files/service/impl/FileManagerImpl.scala b/...manager/src/main/scala/it/pagopa/interop/commons/files/service/impl/FileManagerImpl.scala
@@ -86,7 +86,13 @@ final class FileManagerImpl(blockingExecutionContext: ExecutionContextExecutor)
     pathCreated.resolve(fileName.stripMargin('/'))
   }
 
-  override def generateGetPresignedUrl(containerPath: String, path: String): Try[String] = Try(path)
+  override def generateGetPresignedUrl(bucketName: String, path: String, fileName: String): Try[String] = {
+    val path: String = createPath(path, "", fileName).toAbsolutePath.toString
+    Try(path)
+  }
 
-  override def generatePutPresignedUrl(containerPath: String, path: String): Try[String] = Try(path)
+  override def generatePutPresignedUrl(bucketName: String, path: String, fileName: String): Try[String] = {
+    val path: String = createPath(path, "", fileName).toAbsolutePath.toString
+    Try(path)
+  }
 }
diff --git a/file-manager/src/main/scala/it/pagopa/interop/commons/files/service/impl/S3ManagerImpl.scala b/file-manager/src/main/scala/it/pagopa/interop/commons/files/service/impl/S3ManagerImpl.scala
@@ -167,12 +167,14 @@ final class S3ManagerImpl(blockingExecutionContext: ExecutionContextExecutor)(
 
   def calcContentMd5(byteArray: Array[Byte]): String = new String(Base64.encodeBase64(DigestUtils.md5(byteArray)))
 
-  override def generateGetPresignedUrl(bucketName: String, keyName: String): Try[String] = {
+  override def generateGetPresignedUrl(bucketName: String, path: String, fileName: String): Try[String] = {
+    val key: String                        = s3Key(path, "", fileName)
+
     Using(S3Presigner.create()) { s3Presigner =>
       val objectRequest: GetObjectRequest = GetObjectRequest
         .builder()
         .bucket(bucketName)
-        .key(keyName)
+        .key(key)
         .build()
 
       val presignRequest: GetObjectPresignRequest = GetObjectPresignRequest
@@ -186,12 +188,14 @@ final class S3ManagerImpl(blockingExecutionContext: ExecutionContextExecutor)(
     }
   }
 
-  override def generatePutPresignedUrl(bucketName: String, keyName: String): Try[String] = {
+  override def generatePutPresignedUrl(bucketName: String, path: String, fileName: String): Try[String] = {
+    val key: String                        = s3Key(path, "", fileName)
+
     Using(S3Presigner.create()) { s3Presigner =>
       val objectRequest: PutObjectRequest = PutObjectRequest
         .builder()
         .bucket(bucketName)
-        .key(keyName)
+        .key(key)
         .build()
 
       val presignRequest: PutObjectPresignRequest = PutObjectPresignRequest