From 557824c572b92a5c595f601c29263429be7db06f Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Wed, 21 Feb 2024 10:46:03 -0600
Subject: [PATCH] CE-781 Fix s3 delete to handle slashes it doesn't want

---
 .../s3/actions/AbstractS3Action.java          |  7 +++--
 .../filesystem/s3/S3BackendModuleTest.java    | 29 +++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java
index d059d671..3a859734 100644
--- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java
+++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java
@@ -220,10 +220,11 @@ public class AbstractS3Action extends AbstractBaseFilesystemAction<S3ObjectSumma
    @Override
    public void deleteFile(QInstance instance, QTableMetaData table, String fileReference) throws FilesystemException
    {
-      QBackendMetaData backend    = instance.getBackend(table.getBackendName());
-      String           bucketName = ((S3BackendMetaData) backend).getBucketName();
+      QBackendMetaData backend     = instance.getBackend(table.getBackendName());
+      String           bucketName  = ((S3BackendMetaData) backend).getBucketName();
+      String           cleanedPath = stripLeadingSlash(stripDuplicatedSlashes(fileReference));
 
-      getS3Utils().deleteObject(bucketName, fileReference);
+      getS3Utils().deleteObject(bucketName, cleanedPath);
    }
 
 
diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java
index 644c4575..73a8f6ae 100644
--- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java
+++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleTest.java
@@ -154,6 +154,35 @@ public class S3BackendModuleTest extends BaseS3Test
 
 
 
+   /*******************************************************************************
+    ** Regression check on the s3 delete method - if the file name has duplicated
+    ** slashes and/or leading slash(es), those need stripped.  So, create that
+    ** situation and assert delete works.
+    *******************************************************************************/
+   @Test
+   public void testDeleteFileExtraSlashes() throws Exception
+   {
+      QInstance      qInstance = TestUtils.defineInstance();
+      QTableMetaData table     = qInstance.getTable(TestUtils.TABLE_NAME_PERSON_S3);
+
+      /////////////////////////////////////////////////////////////////////////////////////////////
+      // first list the files - then delete one, then re-list, and assert that we have one fewer //
+      /////////////////////////////////////////////////////////////////////////////////////////////
+      List<S3ObjectSummary> s3ObjectSummariesBeforeDelete = getS3Utils().listObjectsInBucketMatchingGlob(BUCKET_NAME, TEST_FOLDER, "");
+
+      S3BackendModule  s3BackendModule = new S3BackendModule();
+      AbstractS3Action actionBase      = (AbstractS3Action) s3BackendModule.getActionBase();
+      actionBase.setS3Utils(getS3Utils());
+      String path = "//" + s3ObjectSummariesBeforeDelete.get(0).getKey().replaceAll("/", "//");
+      actionBase.deleteFile(qInstance, table, "//" + path);
+
+      List<S3ObjectSummary> s3ObjectSummariesAfterDelete = getS3Utils().listObjectsInBucketMatchingGlob(BUCKET_NAME, TEST_FOLDER, "");
+      Assertions.assertEquals(s3ObjectSummariesBeforeDelete.size() - 1, s3ObjectSummariesAfterDelete.size(),
+         "Should be one fewer file listed after deleting one.");
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/