From ba046ff0b9a40a271313993b36eed16c21a1de00 Mon Sep 17 00:00:00 2001
From: Masoud Ghorbani <contact@mgh.space>
Date: Fri, 9 Feb 2024 23:05:21 +0100
Subject: [PATCH] Add ACL to S3 bucket and object uploads (#5)

* Add ACL to S3 bucket and object uploads

* Update comments

* Update ACL value to undefined and add new function createValidInputFixtureWithACLBucketOwner

* Add extractAfterSubdirectory function and use it in getLocalFiles

* Remove commented out code for S3 credentials

* Add commands to SyncCloudStorage class

* Refactor tags method and handle error when getting existing tags

* test: added test case for getLocalFiles

* Improved multiple files test case

* Fix storage existence check and remove unnecessary code
---
 .eslintrc.json                                |  12 +-
 docs/global.html                              |   4 +-
 docs/index.html                               |   3 +-
 docs/index.js.html                            |  39 ++-
 ...ule-SyncCloudStorage-SyncCloudStorage.html |   2 +-
 docs/module-SyncCloudStorage.html             |   4 +-
 docs/providers_local_objects.js.html          |  10 +-
 docs/providers_s3_buckets.js.html             |  34 ++-
 docs/providers_s3_credentials.js.html         |   2 +-
 docs/providers_s3_objects.js.html             |   3 +-
 docs/utils_objects.js.html                    |  27 ++-
 docs/utils_tags.js.html                       |   2 +-
 package.json                                  |   6 +-
 src/index.ts                                  |  68 +++---
 src/providers/local/objects.ts                |  10 +-
 src/providers/s3/buckets.ts                   |  51 ++--
 src/providers/s3/objects.ts                   |  99 ++++----
 src/types.ts                                  |   2 +-
 src/utils/objects.ts                          |  27 +++
 test/assets/giraffe-multiple/README.md        |   3 +
 test/assets/giraffe-multiple/sub/README.md    |   3 +
 test/index.test.ts                            | 225 ++++++++++++++++--
 test/providers/local.test.ts                  |  30 +++
 test/schemas/input.fixture.ts                 |  26 +-
 24 files changed, 516 insertions(+), 176 deletions(-)
 create mode 100644 test/assets/giraffe-multiple/README.md
 create mode 100644 test/assets/giraffe-multiple/sub/README.md
 create mode 100644 test/providers/local.test.ts

diff --git a/.eslintrc.json b/.eslintrc.json
index 3e6fa50..0c978fb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -10,7 +10,8 @@
   "plugins": ["import"],
   "parserOptions": {
     "ecmaVersion": 2023,
-    "sourceType": "module"
+    "sourceType": "module",
+    "project": "./tsconfig.json"
   },
   "rules": {
     "semi": "off",
@@ -52,7 +53,8 @@
     ],
     "no-console": 2,
     "no-unused-vars": 2,
-    "@typescript-eslint/no-unused-vars": ["error"]
+    "@typescript-eslint/no-unused-vars": ["error"],
+    "import/named": "error"
   },
   "env": {
     "node": true
@@ -64,7 +66,11 @@
     "import/resolver": {
       "typescript": {
         "alwaysTryTypes": true,
-        "project": "./tsconfig.json"
+        "project": [
+          "./tsconfig.json",
+          "./src/tsconfig.json",
+          "./test/tsconfig.json"
+        ]
       }
     }
   }
diff --git a/docs/global.html b/docs/global.html
index 283394c..852c1e9 100644
--- a/docs/global.html
+++ b/docs/global.html
@@ -218,7 +218,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="utils_objects.js.html">utils/objects.js</a>, <a href="utils_objects.js.html#line23">line 23</a>
+        <a href="utils_objects.js.html">utils/objects.js</a>, <a href="utils_objects.js.html#line27">line 27</a>
     </li></ul></dd>
     
 
@@ -292,7 +292,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/index.html b/docs/index.html
index f0f86fa..f803f0d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -70,7 +70,6 @@ <h3>Serverless</h3>
       metadata:
         foo: bar
         bar: foo
-      acl: public-read
 </code></pre>
 <h2>Deployments</h2>
 <h3><a href="https://github.com/common-fate/granted">Granted</a> (assume)</h3>
@@ -93,7 +92,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/index.js.html b/docs/index.js.html
index 0faf9de..c7e0d68 100644
--- a/docs/index.js.html
+++ b/docs/index.js.html
@@ -34,7 +34,6 @@ <h1 class="page-title">Source: index.js</h1>
 const client_s3_1 = require("@aws-sdk/client-s3");
 const errors_1 = require("./errors");
 const buckets_1 = require("./providers/s3/buckets");
-// import { getCredentials } from './providers/s3/credentials'
 const input_1 = require("./schemas/input");
 const logger_1 = __importDefault(require("./utils/logger"));
 /**
@@ -45,6 +44,7 @@ <h1 class="page-title">Source: index.js</h1>
     serverless;
     options;
     hooks;
+    commands;
     servicePath;
     config;
     logging;
@@ -83,6 +83,7 @@ <h1 class="page-title">Source: index.js</h1>
         this.config = validConfig;
         this.client = this.getS3Client();
         this._storages = this.config.syncCloudStorage.storages.filter((bucket) => bucket.enabled);
+        this.commands = this.setCommands();
         this.hooks = this.setHooks();
     }
     /**
@@ -103,6 +104,22 @@ <h1 class="page-title">Source: index.js</h1>
             endpoint,
         });
     }
+    /**
+     * Set commands.
+     * @returns {ServerlessPlugin.Commands} Commands
+     * @memberof SyncCloudStorage
+     *
+     * @example
+     * const commands = this.setCommands()
+     */
+    setCommands() {
+        return {
+            scs: {
+                usage: 'Sync Cloud Storage',
+                lifecycleEvents: ['storages', 'tags'],
+            },
+        };
+    }
     /**
      * Set hooks.
      * @returns {ServerlessPlugin.Hooks} Hooks
@@ -115,10 +132,10 @@ <h1 class="page-title">Source: index.js</h1>
         const syncStoragesHook = () => this.storages();
         const syncTagsHook = () => this.tags();
         return {
-            'before:offline:start:init': syncStoragesHook,
-            'scs:buckets': syncStoragesHook,
+            'scs:storages': syncStoragesHook,
             'scs:tags': syncTagsHook,
-            'before:deploy:deploy': () => syncStoragesHook(),
+            'before:offline:start:init': syncStoragesHook,
+            'before:deploy:deploy': syncStoragesHook,
         };
     }
     /**
@@ -153,20 +170,18 @@ <h1 class="page-title">Source: index.js</h1>
     /**
      * Sync tags.
      * @private
-     * @returns {TagsMethodPromiseResult}
      * @memberof SyncCloudStorage
      * @see https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3
-     *
+     * @returns {Promise&lt;TagsSyncResults>}
      * @example
      * const result = await this.tags()
      */
     async tags() {
-        const isPluginEnable = this.disableCheck().result;
-        if (!isPluginEnable) {
-            return [];
+        const isPluginDisable = this.disableCheck().result;
+        if (isPluginDisable) {
+            return [{ error: 'Plugin is disabled' }];
         }
-        const syncedStorages = (await Promise.allSettled(this._storages.map((bucket) => (0, buckets_1.syncTags)(this.client, bucket))));
-        return syncedStorages;
+        return (await Promise.allSettled(this._storages.map((bucket) => (0, buckets_1.syncTags)(this.client, bucket))));
     }
     /**
      * On exit.
@@ -211,7 +226,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/module-SyncCloudStorage-SyncCloudStorage.html b/docs/module-SyncCloudStorage-SyncCloudStorage.html
index 9b06668..1ca47eb 100644
--- a/docs/module-SyncCloudStorage-SyncCloudStorage.html
+++ b/docs/module-SyncCloudStorage-SyncCloudStorage.html
@@ -253,7 +253,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/module-SyncCloudStorage.html b/docs/module-SyncCloudStorage.html
index 97776aa..61ab4f3 100644
--- a/docs/module-SyncCloudStorage.html
+++ b/docs/module-SyncCloudStorage.html
@@ -69,7 +69,7 @@ <h1 class="page-title">Module: SyncCloudStorage</h1>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="index.js.html">index.js</a>, <a href="index.js.html#line12">line 12</a>
+        <a href="index.js.html">index.js</a>, <a href="index.js.html#line11">line 11</a>
     </li></ul></dd>
     
 
@@ -127,7 +127,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/providers_local_objects.js.html b/docs/providers_local_objects.js.html
index b59241a..3bcef12 100644
--- a/docs/providers_local_objects.js.html
+++ b/docs/providers_local_objects.js.html
@@ -58,6 +58,7 @@ <h1 class="page-title">Source: providers/local/objects.js</h1>
 const crypto_1 = require("crypto");
 const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
+const objects_1 = require("../../utils/objects");
 /**
  * Returns a list of local files recursively.
  * @memberof Local
@@ -76,9 +77,14 @@ <h1 class="page-title">Source: providers/local/objects.js</h1>
             recursiveFiles.push(...innerFiles);
         }
         else {
+            const internalPath = (0, objects_1.extractAfterSubdirectory)(fullPath, storage.localPath);
+            let key = internalPath;
+            if (storage.prefix) {
+                key = path_1.default.join(storage.prefix, internalPath);
+            }
             const file = {
                 LocalPath: fullPath,
-                Key: storage.prefix ? path_1.default.join(`${storage.prefix}/${item}`) : item,
+                Key: key,
                 LastModified: new Date(stat.mtime),
                 Size: stat.size,
                 ETag: await getFileETag(fs.createReadStream(fullPath)),
@@ -112,7 +118,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/providers_s3_buckets.js.html b/docs/providers_s3_buckets.js.html
index eb163d7..bbc768c 100644
--- a/docs/providers_s3_buckets.js.html
+++ b/docs/providers_s3_buckets.js.html
@@ -50,7 +50,7 @@ <h1 class="page-title">Source: providers/s3/buckets.js</h1>
 };
 exports.storageExists = storageExists;
 /**
- * Syncs storage with upload and delete actions by comparing local file and storage's object checksums.
+ * Syncs storage with upload and delete actions by comparing local file and storage's object `${Key}-${ETag}`.
  * @memberof S3
  * @param {S3Client} client
  * @param {Storage} storage
@@ -101,7 +101,6 @@ <h1 class="page-title">Source: providers/s3/buckets.js</h1>
  * @returns {Promise&lt;SyncMetadataReturn>}
  */
 const syncMetadata = async (client, storage) => {
-    // Get list of existing objects
     const existingObjects = await (0, objects_1.listObjects)(client, storage);
     const syncedMetadata = [];
     for (const file of existingObjects) {
@@ -116,6 +115,7 @@ <h1 class="page-title">Source: providers/s3/buckets.js</h1>
             ContentType: (0, objects_2.getContentType)(file.Key),
             MetadataDirective: client_s3_1.MetadataDirective.REPLACE,
             Metadata: storage.metadata,
+            ACL: storage.acl,
         });
         const result = await client.send(copyCommand);
         logger_1.default.info('Metadata synced', {
@@ -123,7 +123,6 @@ <h1 class="page-title">Source: providers/s3/buckets.js</h1>
             Key: file.Key,
             result,
         });
-        // Get Object metadata
         const headCommand = await client.send(new client_s3_1.HeadObjectCommand({
             Bucket: storage.name,
             Key: storage.prefix
@@ -148,19 +147,32 @@ <h1 class="page-title">Source: providers/s3/buckets.js</h1>
  */
 const syncTags = async (client, storage) => {
     logger_1.default.info("Syncing storage's tags", { storage: storage.name });
+    let existingTagSet = { TagSet: [] };
     try {
-        const existingTagSetCommand = new client_s3_1.GetBucketTaggingCommand({
-            Bucket: storage.name,
-        });
-        const existingTagSet = await client.send(existingTagSetCommand);
+        try {
+            const existingTagSetCommand = new client_s3_1.GetBucketTaggingCommand({
+                Bucket: storage.name,
+            });
+            existingTagSet = await client.send(existingTagSetCommand);
+        }
+        catch (error) {
+            if (error.name === 'NoSuchTagSet') {
+                existingTagSet = { TagSet: [] };
+            }
+            else {
+                logger_1.default.error('Failed to get existing tags', {
+                    storage: storage.name,
+                    error: JSON.stringify(error),
+                });
+            }
+        }
         const mergedTagSet = (0, tags_1.mergeTags)(existingTagSet.TagSet, storage.tags ?? {});
-        const command = new client_s3_1.PutBucketTaggingCommand({
+        await client.send(new client_s3_1.PutBucketTaggingCommand({
             Bucket: storage.name,
             Tagging: {
                 TagSet: mergedTagSet,
             },
-        });
-        await client.send(command);
+        }));
         logger_1.default.info("Synced storage's tags", {
             storage: storage.name,
             existingTagSet: existingTagSet.TagSet,
@@ -219,7 +231,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/providers_s3_credentials.js.html b/docs/providers_s3_credentials.js.html
index c12f458..e9174cc 100644
--- a/docs/providers_s3_credentials.js.html
+++ b/docs/providers_s3_credentials.js.html
@@ -79,7 +79,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/providers_s3_objects.js.html b/docs/providers_s3_objects.js.html
index 1ee1a06..80a8ba5 100644
--- a/docs/providers_s3_objects.js.html
+++ b/docs/providers_s3_objects.js.html
@@ -86,6 +86,7 @@ <h1 class="page-title">Source: providers/s3/objects.js</h1>
                 Key: fileToUpload.Key,
                 Body: fs_1.default.createReadStream(fileToUpload.LocalPath),
                 ContentType: (0, objects_1.getContentType)(fileToUpload.Key),
+                ACL: storage.acl,
             },
         });
         logger_1.default.info('Uploaded file to bucket', {
@@ -182,7 +183,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/utils_objects.js.html b/docs/utils_objects.js.html
index fbd5050..8c59ec5 100644
--- a/docs/utils_objects.js.html
+++ b/docs/utils_objects.js.html
@@ -27,8 +27,12 @@ <h1 class="page-title">Source: utils/objects.js</h1>
     <section>
         <article>
             <pre class="prettyprint source linenums"><code>"use strict";
+var __importDefault = (this &amp;&amp; this.__importDefault) || function (mod) {
+    return (mod &amp;&amp; mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContentType = exports.getChecksum = void 0;
+exports.extractAfterSubdirectory = exports.getContentType = exports.getChecksum = void 0;
+const path_1 = __importDefault(require("path"));
 const mrmime_1 = require("mrmime");
 /**
  * Get a checksum for an object
@@ -53,6 +57,25 @@ <h1 class="page-title">Source: utils/objects.js</h1>
     return key ? (0, mrmime_1.lookup)(key) ?? defaultMimeType : defaultMimeType;
 };
 exports.getContentType = getContentType;
+const extractAfterSubdirectory = (fullPath, subdirectory) => {
+    // Normalize both paths to ensure consistent separators
+    const normalizedFullPath = path_1.default.normalize(fullPath);
+    const normalizedSubdirectory = path_1.default.normalize(subdirectory);
+    // Find the start index of the subdirectory in the full path
+    const startIndex = normalizedFullPath.indexOf(normalizedSubdirectory);
+    if (startIndex !== -1) {
+        // Calculate the end index of the subdirectory within the full path
+        const endIndex = startIndex + normalizedSubdirectory.length + 1;
+        // Extract the part of the full path after the subdirectory
+        const afterSubdirectory = normalizedFullPath.substring(endIndex);
+        // Normalize the extracted path to clean up any leading separators
+        return path_1.default.normalize(afterSubdirectory);
+    }
+    else {
+        return ''; // Subdirectory not found in the full path
+    }
+};
+exports.extractAfterSubdirectory = extractAfterSubdirectory;
 </code></pre>
         </article>
     </section>
@@ -69,7 +92,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/utils_tags.js.html b/docs/utils_tags.js.html
index f7ca41e..4a6fe08 100644
--- a/docs/utils_tags.js.html
+++ b/docs/utils_tags.js.html
@@ -70,7 +70,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-Sy
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Sun Feb 04 2024 22:41:43 GMT+0100 (Central European Standard Time)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.2</a> on Fri Feb 09 2024 00:49:08 GMT+0100 (Central European Standard Time)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/package.json b/package.json
index c574ab5..e38ad09 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,8 @@
     "test:watch": "jest --watch",
     "test:coverage": "jest --no-cache --coverage",
     "format": "prettier --write \"**/*.{ts,js,md,json,yaml,yml}\"",
-    "lint": "eslint . --ext .ts --ext .js",
-    "lint:fix": "eslint . --fix --ext .ts --ext .js",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "docs:build": "pnpm run build && rm -rf ./docs && ./node_modules/.bin/jsdoc -c jsdoc.json",
     "docs:start": "pnpm run docs:build && ./node_modules/.bin/http-server -c-1 -o docs"
   },
@@ -67,7 +67,7 @@
   },
   "lint-staged": {
     "*.{ts,js}": [
-      "pnpm run lint:fix",
+      "pnpm run lint",
       "pnpm run format"
     ],
     "*.{json,md,yaml}": [
diff --git a/src/index.ts b/src/index.ts
index 4536824..bf59793 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -6,14 +6,8 @@ import ServerlessPlugin from 'serverless/classes/Plugin'
 
 import { InvalidConfigError } from './errors'
 import { sync, syncMetadata, syncTags } from './providers/s3/buckets'
-// import { getCredentials } from './providers/s3/credentials'
 import { Custom, Storage, custom } from './schemas/input'
-import {
-  IServerless,
-  MethodReturn,
-  TagsMethodPromiseResult,
-  TagsSyncResults,
-} from './types'
+import { IServerless, MethodReturn, TagsSyncResults } from './types'
 import logger from './utils/logger'
 
 /**
@@ -24,6 +18,7 @@ class SyncCloudStorage implements ServerlessPlugin {
   serverless!: Serverless
   options!: Serverless.Options
   hooks: ServerlessPlugin.Hooks
+  commands: ServerlessPlugin.Commands
   servicePath: string
   config: Custom
   logging: ServerlessPlugin.Logging
@@ -42,25 +37,11 @@ class SyncCloudStorage implements ServerlessPlugin {
     options: Serverless.Options,
     logging: ServerlessPlugin.Logging
   ) {
-    if (!serverless) {
-      throw new Error('Serverless instance is required')
-    }
-
     // Typing with *as* makes testing enable to use a DI version of instance
     this.serverless = serverless as unknown as Serverless
-    this.servicePath = this.serverless.service.serverless.config.servicePath
-
-    if (!options) {
-      throw new Error("Options can't be undefined")
-    }
-
     this.options = options
-
-    if (!logging) {
-      throw new Error("Logging can't be undefined")
-    }
-
     this.logging = logging
+    this.servicePath = this.serverless.service.serverless.config.servicePath
 
     const config = this.serverless.service.custom
     const validatedConfig = custom.safeParse(config)
@@ -78,6 +59,7 @@ class SyncCloudStorage implements ServerlessPlugin {
     this._storages = this.config.syncCloudStorage.storages.filter(
       (bucket) => bucket.enabled
     )
+    this.commands = this.setCommands()
     this.hooks = this.setHooks()
   }
 
@@ -101,6 +83,23 @@ class SyncCloudStorage implements ServerlessPlugin {
     })
   }
 
+  /**
+   * Set commands.
+   * @returns {ServerlessPlugin.Commands} Commands
+   * @memberof SyncCloudStorage
+   *
+   * @example
+   * const commands = this.setCommands()
+   */
+  setCommands(): ServerlessPlugin.Commands {
+    return {
+      scs: {
+        usage: 'Sync Cloud Storage',
+        lifecycleEvents: ['storages', 'tags'],
+      },
+    }
+  }
+
   /**
    * Set hooks.
    * @returns {ServerlessPlugin.Hooks} Hooks
@@ -114,10 +113,10 @@ class SyncCloudStorage implements ServerlessPlugin {
     const syncTagsHook = () => this.tags()
 
     return {
-      'before:offline:start:init': syncStoragesHook,
-      'scs:buckets': syncStoragesHook,
+      'scs:storages': syncStoragesHook,
       'scs:tags': syncTagsHook,
-      'before:deploy:deploy': () => syncStoragesHook(),
+      'before:offline:start:init': syncStoragesHook,
+      'before:deploy:deploy': syncStoragesHook,
     }
   }
 
@@ -166,25 +165,22 @@ class SyncCloudStorage implements ServerlessPlugin {
   /**
    * Sync tags.
    * @private
-   * @returns {TagsMethodPromiseResult}
    * @memberof SyncCloudStorage
    * @see https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3
-   *
+   * @returns {Promise<TagsSyncResults>}
    * @example
    * const result = await this.tags()
    */
-  async tags(): TagsMethodPromiseResult {
-    const isPluginEnable = this.disableCheck().result
+  async tags(): Promise<TagsSyncResults> {
+    const isPluginDisable = this.disableCheck().result
 
-    if (!isPluginEnable) {
-      return []
+    if (isPluginDisable) {
+      return [{ error: 'Plugin is disabled' }]
     }
 
-    const syncedStorages = (await Promise.allSettled(
+    return (await Promise.allSettled(
       this._storages.map((bucket) => syncTags(this.client, bucket))
     )) as TagsSyncResults
-
-    return syncedStorages
   }
 
   /**
@@ -197,10 +193,6 @@ class SyncCloudStorage implements ServerlessPlugin {
    * await this.onExit()
    */
   async onExit(): Promise<void> {
-    if (this.taskProcess) {
-      this.taskProcess.remove()
-    }
-
     if (this.client) {
       this.client.destroy()
     }
diff --git a/src/providers/local/objects.ts b/src/providers/local/objects.ts
index 9ae9956..29f461e 100644
--- a/src/providers/local/objects.ts
+++ b/src/providers/local/objects.ts
@@ -4,6 +4,7 @@ import path from 'path'
 
 import { Storage } from '../../schemas/input'
 import { LocalFile } from '../../types'
+import { extractAfterSubdirectory } from '../../utils/objects'
 
 /**
  * Returns a list of local files recursively.
@@ -27,9 +28,16 @@ export const getLocalFiles = async (
       const innerFiles = await getLocalFiles(fullPath, storage)
       recursiveFiles.push(...innerFiles)
     } else {
+      const internalPath = extractAfterSubdirectory(fullPath, storage.localPath)
+      let key = internalPath
+
+      if (storage.prefix) {
+        key = path.join(storage.prefix, internalPath)
+      }
+
       const file: LocalFile = {
         LocalPath: fullPath,
-        Key: storage.prefix ? path.join(`${storage.prefix}/${item}`) : item,
+        Key: key,
         LastModified: new Date(stat.mtime),
         Size: stat.size,
         ETag: await getFileETag(fs.createReadStream(fullPath)),
diff --git a/src/providers/s3/buckets.ts b/src/providers/s3/buckets.ts
index 2663872..9d90bbd 100644
--- a/src/providers/s3/buckets.ts
+++ b/src/providers/s3/buckets.ts
@@ -6,6 +6,7 @@ import {
   DeleteBucketCommand,
   DeletedObject,
   GetBucketTaggingCommand,
+  GetBucketTaggingOutput,
   HeadObjectCommand,
   ListBucketsCommand,
   MetadataDirective,
@@ -41,7 +42,7 @@ export const storageExists = async (
 }
 
 /**
- * Syncs storage with upload and delete actions by comparing local file and storage's object checksums.
+ * Syncs storage with upload and delete actions by comparing local file and storage's object `${Key}-${ETag}`.
  * @memberof S3
  * @param {S3Client} client
  * @param {Storage} storage
@@ -125,7 +126,6 @@ export const syncMetadata = async (
   client: S3Client,
   storage: Storage
 ): Promise<SyncMetadataReturn> => {
-  // Get list of existing objects
   const existingObjects = await listObjects(client, storage)
   const syncedMetadata = []
 
@@ -142,6 +142,7 @@ export const syncMetadata = async (
       ContentType: getContentType(file.Key),
       MetadataDirective: MetadataDirective.REPLACE,
       Metadata: storage.metadata,
+      ACL: storage.acl,
     })
 
     const result = await client.send(copyCommand)
@@ -152,7 +153,6 @@ export const syncMetadata = async (
       result,
     })
 
-    // Get Object metadata
     const headCommand = await client.send(
       new HeadObjectCommand({
         Bucket: storage.name,
@@ -185,21 +185,42 @@ export const syncTags = async (
 ): Promise<TagsSyncResult> => {
   logger.info("Syncing storage's tags", { storage: storage.name })
 
+  const { name } = storage
+  const storageExist = await storageExists(client, name)
+
+  if (!storageExist) {
+    return { error: new Error('StorageNotFound') }
+  }
+
+  let existingTagSet: GetBucketTaggingOutput = { TagSet: [] }
+
   try {
-    const existingTagSetCommand = new GetBucketTaggingCommand({
-      Bucket: storage.name,
-    })
-    const existingTagSet = await client.send(existingTagSetCommand)
-    const mergedTagSet = mergeTags(existingTagSet.TagSet, storage.tags ?? {})
+    try {
+      const existingTagSetCommand = new GetBucketTaggingCommand({
+        Bucket: storage.name,
+      })
+      existingTagSet = await client.send(existingTagSetCommand)
+    } catch (error) {
+      if ((error as Error).name === 'NoSuchTagSet') {
+        existingTagSet = { TagSet: [] }
+      } else {
+        logger.error('Failed to get existing tags', {
+          storage: storage.name,
+          error: JSON.stringify(error),
+        })
+      }
+    }
 
-    const command = new PutBucketTaggingCommand({
-      Bucket: storage.name,
-      Tagging: {
-        TagSet: mergedTagSet,
-      },
-    })
+    const mergedTagSet = mergeTags(existingTagSet.TagSet, storage.tags ?? {})
 
-    await client.send(command)
+    await client.send(
+      new PutBucketTaggingCommand({
+        Bucket: storage.name,
+        Tagging: {
+          TagSet: mergedTagSet,
+        },
+      })
+    )
 
     logger.info("Synced storage's tags", {
       storage: storage.name,
diff --git a/src/providers/s3/objects.ts b/src/providers/s3/objects.ts
index 49d8347..83cb556 100644
--- a/src/providers/s3/objects.ts
+++ b/src/providers/s3/objects.ts
@@ -63,11 +63,7 @@ export const uploadObjects = async (
   for (const checksum of filesToUpload) {
     const fileToUpload = localFiles.find(
       (file) => getChecksum(file.Key, file.ETag) === checksum
-    )
-
-    if (!fileToUpload) {
-      continue
-    }
+    ) as LocalFile
 
     logger.info('Upload file to bucket', {
       storage: storage.name,
@@ -82,6 +78,7 @@ export const uploadObjects = async (
         Key: fileToUpload.Key,
         Body: fs.createReadStream(fileToUpload.LocalPath),
         ContentType: getContentType(fileToUpload.Key),
+        ACL: storage.acl,
       },
     })
 
@@ -115,8 +112,7 @@ export const uploadObjects = async (
 export const deleteObjects = async (
   client: S3Client,
   storage: Storage,
-  objects: _Object[],
-  retry = 0
+  objects: _Object[]
 ): Promise<DeletedObject[]> => {
   const keys = [...objects].map((object) => object.Key as string)
 
@@ -125,60 +121,51 @@ export const deleteObjects = async (
     keys,
   })
 
-  try {
-    const versions = await client.send(
-      new ListObjectVersionsCommand({
+  const versions = await client.send(
+    new ListObjectVersionsCommand({
+      Bucket: storage.name,
+      Prefix: storage.prefix ? storage.prefix : undefined,
+    })
+  )
+
+  const deleteMarkers = (versions.DeleteMarkers ?? []).map((marker) => ({
+    Key: marker.Key,
+    VersionId: marker.VersionId,
+  }))
+
+  const versionsToDelete = (versions.Versions ?? []).map((version) => ({
+    Key: version.Key,
+    VersionId: version.VersionId,
+  }))
+
+  const objectsToDelete = [
+    ...objects.map((object) => ({
+      Key: object.Key,
+      VersionId: object.ETag,
+    })),
+    ...deleteMarkers,
+    ...versionsToDelete,
+  ]
+
+  if (objectsToDelete.length > 0) {
+    const { Deleted: deleted = [] } = await client.send(
+      new DeleteObjectsCommand({
         Bucket: storage.name,
-        Prefix: storage.prefix ? storage.prefix : undefined,
-        MaxKeys: 1000000000,
+        Delete: {
+          Objects: objectsToDelete,
+          Quiet: false,
+        },
       })
     )
 
-    const deleteMarkers = (versions.DeleteMarkers ?? []).map((marker) => ({
-      Key: marker.Key,
-      VersionId: marker.VersionId,
-    }))
-
-    const versionsToDelete = (versions.Versions ?? []).map((version) => ({
-      Key: version.Key,
-      VersionId: version.VersionId,
-    }))
-
-    const objectsToDelete = [
-      ...objects.map((object) => ({
-        Key: object.Key,
-        VersionId: object.ETag,
-      })),
-      ...deleteMarkers,
-      ...versionsToDelete,
-    ]
-
-    if (objectsToDelete.length > 0) {
-      const { Deleted: deleted = [] } = await client.send(
-        new DeleteObjectsCommand({
-          Bucket: storage.name,
-          Delete: {
-            Objects: objectsToDelete,
-            Quiet: false,
-          },
-        })
-      )
-
-      logger.info(`Permanently deleted all versions of object.`, {
-        storage: storage.name,
-      })
-
-      return deleted
-    } else {
-      logger.info(`No objects to delete.`, { storage: storage.name })
+    logger.info(`Permanently deleted all versions of object.`, {
+      storage: storage.name,
+    })
 
-      return []
-    }
-  } catch (error) {
-    if (retry >= 3) {
-      throw error
-    }
+    return deleted
+  } else {
+    logger.info(`No objects to delete.`, { storage: storage.name })
 
-    return deleteObjects(client, storage, objects, retry + 1)
+    return []
   }
 }
diff --git a/src/types.ts b/src/types.ts
index 44914bf..4c4b38b 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -77,7 +77,7 @@ export interface MethodReturn<T = undefined> {
 export type MetadataSyncResult = Array<boolean>
 export type TagsSyncResult = MethodReturn<Tag[]>
 export type TagsSyncResults = Array<MethodReturn<Tag[]>>
-export type TagsMethodPromiseResult = Promise<TagsSyncResults>
+export type TagsMethodPromiseResult = PromiseFulfilledResult<TagsSyncResult>
 
 export type SyncMetadataReturn = Array<
   Pick<_Object, 'Key'> & {
diff --git a/src/utils/objects.ts b/src/utils/objects.ts
index 6f680f6..35521d8 100644
--- a/src/utils/objects.ts
+++ b/src/utils/objects.ts
@@ -1,3 +1,5 @@
+import path from 'path'
+
 import { lookup } from 'mrmime'
 
 /**
@@ -22,3 +24,28 @@ export const getContentType = (key?: string): string => {
   const defaultMimeType = 'application/octet-stream'
   return key ? lookup(key) ?? defaultMimeType : defaultMimeType
 }
+
+export const extractAfterSubdirectory = (
+  fullPath: string,
+  subdirectory: string
+) => {
+  // Normalize both paths to ensure consistent separators
+  const normalizedFullPath = path.normalize(fullPath)
+  const normalizedLocalPath = path.normalize(subdirectory)
+
+  // Find the start index of the subdirectory in the full path
+  const startIndex = normalizedFullPath.indexOf(normalizedLocalPath)
+
+  // Assuming subdirectory is always part of fullPath, calculate the end index
+  const endIndex = startIndex + normalizedLocalPath.length
+
+  // Extract the part of the full path after the subdirectory
+  // Check if endIndex is at the path's end or adjust for separator
+  const afterSubdirectory =
+    endIndex >= normalizedFullPath.length
+      ? ''
+      : normalizedFullPath.substring(endIndex + 1)
+
+  // Return the extracted path part, ensuring no leading separators
+  return afterSubdirectory ? path.normalize(afterSubdirectory) : ''
+}
diff --git a/test/assets/giraffe-multiple/README.md b/test/assets/giraffe-multiple/README.md
new file mode 100644
index 0000000..517570b
--- /dev/null
+++ b/test/assets/giraffe-multiple/README.md
@@ -0,0 +1,3 @@
+# Giraffe README
+
+This is a giraffe.
diff --git a/test/assets/giraffe-multiple/sub/README.md b/test/assets/giraffe-multiple/sub/README.md
new file mode 100644
index 0000000..517570b
--- /dev/null
+++ b/test/assets/giraffe-multiple/sub/README.md
@@ -0,0 +1,3 @@
+# Giraffe README
+
+This is a giraffe.
diff --git a/test/index.test.ts b/test/index.test.ts
index c242642..1f94128 100644
--- a/test/index.test.ts
+++ b/test/index.test.ts
@@ -7,6 +7,7 @@ import { getServerlessMock } from './mocks/serverless'
 import {
   createValidDisabledInputFixture,
   createValidInputFixture,
+  createValidInputFixtureWithACLBucketOwner,
   createValidInputFixtureWithMetadata,
   createValidInputFixtureWithTags,
   sampleStorage,
@@ -17,7 +18,7 @@ import { InvalidConfigError } from '../src/errors'
 import { createStorage, deleteStorage } from '../src/providers/s3/buckets'
 import * as objects from '../src/providers/s3/objects'
 import { Storage } from '../src/schemas/input'
-import { LocalFile } from '../src/types'
+import { LocalFile, TagsMethodPromiseResult } from '../src/types'
 import logger from '../src/utils/logger'
 import { mergeTags } from '../src/utils/tags'
 
@@ -86,10 +87,10 @@ describe('SyncCloudStorage', () => {
         optionsMock,
         loggingMock
       )
-      const bucketsSpy = jest.spyOn(syncCloudStorage, 'storages')
+      const syncStoragesSpy = jest.spyOn(syncCloudStorage, 'storages')
       const response = await syncCloudStorage.storages()
 
-      expect(bucketsSpy).toHaveBeenCalledTimes(1)
+      expect(syncStoragesSpy).toHaveBeenCalledTimes(1)
       expect(response).toEqual({ result: [] })
     })
 
@@ -104,7 +105,9 @@ describe('SyncCloudStorage', () => {
       try {
         new SyncCloudStorage(mockServerless, optionsMock, loggingMock)
       } catch (error) {
-        expect(error).toBeInstanceOf(InvalidConfigError)
+        const typedError = error as InvalidConfigError
+        expect(typedError).toBeInstanceOf(InvalidConfigError)
+        expect(typedError.name).toEqual('InvalidConfigError')
       }
     })
   })
@@ -122,7 +125,7 @@ describe('SyncCloudStorage', () => {
         loggingMock
       )
 
-      const bucketsSpy = jest.spyOn(syncCloudStorage, 'storages')
+      const syncStoragesSpy = jest.spyOn(syncCloudStorage, 'storages')
       const response = await syncCloudStorage.storages()
 
       const expectedResponse = {
@@ -134,12 +137,12 @@ describe('SyncCloudStorage', () => {
         ],
       }
 
-      expect(bucketsSpy).toHaveBeenCalledTimes(1)
+      expect(syncStoragesSpy).toHaveBeenCalledTimes(1)
       expect(response).toEqual(expectedResponse)
     })
 
-    it('should sync when there is a fresh bucket', async () => {
-      const inputCustom = createValidInputFixture(
+    it('should sync when there is a new bucket and acl set to bucket owner', async () => {
+      const inputCustom = createValidInputFixtureWithACLBucketOwner(
         './assets/giraffe',
         sampleStorage.name
       )
@@ -155,10 +158,10 @@ describe('SyncCloudStorage', () => {
         inputCustom.syncCloudStorage.storages[0]
       )
 
-      const bucketsSpy = jest.spyOn(syncCloudStorage, 'storages')
+      const syncStoragesSpy = jest.spyOn(syncCloudStorage, 'storages')
       const response = await syncCloudStorage.storages()
 
-      expect(bucketsSpy).toHaveBeenCalledTimes(1)
+      expect(syncStoragesSpy).toHaveBeenCalledTimes(1)
 
       const giraffeREADME = 'README.md'
 
@@ -223,10 +226,10 @@ describe('SyncCloudStorage', () => {
         inputCustom.syncCloudStorage.storages[0]
       )
 
-      const bucketsSpy = jest.spyOn(syncCloudStorage, 'storages')
+      const syncStoragesSpy = jest.spyOn(syncCloudStorage, 'storages')
       const response = await syncCloudStorage.storages()
 
-      expect(bucketsSpy).toHaveBeenCalledTimes(1)
+      expect(syncStoragesSpy).toHaveBeenCalledTimes(1)
 
       const giraffeREADME = 'README.md'
       const expectedResponse = {
@@ -307,9 +310,15 @@ describe('SyncCloudStorage', () => {
 
       expect(tagsSpy).toHaveBeenCalledTimes(1)
 
-      for (const { result } of newTags) {
-        expect(result).toBe(expectedTags)
-        expect(result).toBeGreaterThanOrEqual(1)
+      for (const newTag of newTags) {
+        const { status, value } = newTag as TagsMethodPromiseResult
+        const { result, error, storage } = value
+
+        expect(status).toBe('fulfilled')
+        expect(error).toBe(undefined)
+        expect(storage).toEqual(inputCustom.syncCloudStorage.storages[0])
+        expect(result).toEqual(expectedTags)
+        expect(result?.length).toBeGreaterThanOrEqual(1)
 
         expect(
           await deleteStorage(
@@ -320,6 +329,50 @@ describe('SyncCloudStorage', () => {
       }
     })
 
+    it('should not sync tags when plugin is disabled', async () => {
+      const inputCustom = createValidDisabledInputFixture()
+      const mockServerless = getServerlessMock(inputCustom, __dirname)
+      const syncCloudStorage = new SyncCloudStorage(
+        mockServerless,
+        optionsMock,
+        loggingMock
+      )
+
+      const tagsSpy = jest.spyOn(syncCloudStorage, 'tags')
+      const newTags = await syncCloudStorage.tags()
+
+      expect(tagsSpy).toHaveBeenCalledTimes(1)
+      expect(newTags).toEqual([{ error: 'Plugin is disabled' }])
+    })
+
+    it("should not sync tags when storage doesn't exist", async () => {
+      const inputCustom = createValidInputFixture(
+        './assets/giraffe',
+        'non-existent-bucket'
+      )
+      const mockServerless = getServerlessMock(inputCustom, __dirname)
+      const syncCloudStorage = new SyncCloudStorage(
+        mockServerless,
+        optionsMock,
+        loggingMock
+      )
+
+      const tagsSpy = jest.spyOn(syncCloudStorage, 'tags')
+      const response = await syncCloudStorage.tags()
+
+      const expectedResponse = [
+        {
+          status: 'fulfilled',
+          value: {
+            error: Error('StorageNotFound'),
+          },
+        },
+      ]
+
+      expect(tagsSpy).toHaveBeenCalledTimes(1)
+      expect(response).toEqual(expectedResponse)
+    })
+
     it('should sync metadata', async () => {
       const inputCustom = createValidInputFixtureWithMetadata(
         './assets/giraffe',
@@ -384,11 +437,11 @@ describe('SyncCloudStorage', () => {
         inputCustom.syncCloudStorage.storages[0]
       )
 
-      const bucketsSpy = jest.spyOn(syncCloudStorage, 'storages')
+      const syncStoragesSpy = jest.spyOn(syncCloudStorage, 'storages')
       const response = await syncCloudStorage.storages()
       const giraffeREADME = 'README.md'
 
-      expect(bucketsSpy).toHaveBeenCalledTimes(1)
+      expect(syncStoragesSpy).toHaveBeenCalledTimes(1)
 
       const expectedFile = expect.objectContaining<LocalFile>({
         ETag: expect.any(String),
@@ -465,7 +518,7 @@ describe('SyncCloudStorage', () => {
         })
       )
 
-      const bucketsSpy = jest.spyOn(syncCloudStorage, 'storages')
+      const syncStoragesSpy = jest.spyOn(syncCloudStorage, 'storages')
       const response = await syncCloudStorage.storages()
 
       const expectedResponse = expect.objectContaining({
@@ -494,7 +547,7 @@ describe('SyncCloudStorage', () => {
         ]),
       })
 
-      expect(bucketsSpy).toHaveBeenCalledTimes(1)
+      expect(syncStoragesSpy).toHaveBeenCalledTimes(1)
       expect(response).toEqual(expectedResponse)
 
       await deleteStorage(
@@ -531,10 +584,10 @@ describe('SyncCloudStorage', () => {
         })
       )
 
-      const bucketsSpy = jest.spyOn(syncCloudStorage, 'storages')
+      const syncStoragesSpy = jest.spyOn(syncCloudStorage, 'storages')
       const response = await syncCloudStorage.storages()
 
-      expect(bucketsSpy).toHaveBeenCalledTimes(1)
+      expect(syncStoragesSpy).toHaveBeenCalledTimes(1)
 
       const giraffeREADME = 'README.md'
 
@@ -597,5 +650,135 @@ describe('SyncCloudStorage', () => {
         inputCustom.syncCloudStorage.storages[0]
       )
     })
+
+    it('should sync multiple storages with with all actions', async () => {
+      const inputCustom = createValidInputFixture(
+        './assets/giraffe',
+        sampleStorage.name
+      )
+      const inputCustom2 = createValidInputFixture(
+        './assets/giraffe-multiple',
+        'giraffe-bucket-2'
+      )
+      const {
+        syncCloudStorage: {
+          storages: [storage1],
+        },
+      } = inputCustom
+      const {
+        syncCloudStorage: {
+          storages: [storage2],
+        },
+      } = inputCustom2
+      const storages = [storage1, storage2]
+      const mockServerless = getServerlessMock(
+        {
+          ...inputCustom,
+          syncCloudStorage: { ...inputCustom.syncCloudStorage, storages },
+        },
+        __dirname
+      )
+      const syncCloudStorage = new SyncCloudStorage(
+        mockServerless,
+        optionsMock,
+        loggingMock
+      )
+
+      await setupStorage(syncCloudStorage.getS3Client(), storages[0])
+      await setupStorage(syncCloudStorage.getS3Client(), storages[1])
+
+      const syncStoragesSpy = jest.spyOn(syncCloudStorage, 'storages')
+      const response = await syncCloudStorage.storages()
+
+      expect(syncStoragesSpy).toHaveBeenCalledTimes(1)
+
+      const giraffeReadme = 'README.md'
+      const giraffeSubReadme = 'sub/README.md'
+      const expectedReadmeLocalFile = expect.objectContaining<LocalFile>({
+        ETag: expect.any(String),
+        Key: giraffeReadme,
+        LastModified: expect.any(Date),
+        LocalPath: expect.stringMatching(giraffeReadme),
+        Size: expect.any(Number),
+      })
+      const expectedSubReadmeLocalFile = expect.objectContaining<LocalFile>({
+        ETag: expect.any(String),
+        Key: giraffeSubReadme,
+        LastModified: expect.any(Date),
+        LocalPath: expect.stringMatching(giraffeReadme),
+        Size: expect.any(Number),
+      })
+      const expectedUploadedReadmeFile1 = expect.objectContaining({
+        storage: storage1.name,
+        etag: expect.any(String),
+        key: giraffeReadme,
+        location: expect.any(String),
+        versionId: expect.any(String),
+      })
+      const expectedUploadedReadmeFile2 = expect.objectContaining({
+        storage: storage2.name,
+        etag: expect.any(String),
+        key: giraffeReadme,
+        location: expect.any(String),
+        versionId: expect.any(String),
+      })
+      const expectedUploadedSubReadmeFile2 = expect.objectContaining({
+        storage: storage2.name,
+        etag: expect.any(String),
+        key: giraffeSubReadme,
+        location: expect.any(String),
+        versionId: expect.any(String),
+      })
+
+      const expectedResponse = {
+        result: [
+          {
+            status: 'fulfilled',
+            value: {
+              deleted: expect.arrayContaining([]),
+              files: [expectedReadmeLocalFile],
+              filesToDelete: expect.arrayContaining([]),
+              filesToUpload: expect.arrayContaining([
+                expect.stringContaining(giraffeReadme),
+              ]),
+              localFilesChecksum: expect.arrayContaining([
+                expect.stringContaining(giraffeReadme),
+              ]),
+              objects: expect.arrayContaining([]),
+              storage: storages[0],
+              storageObjectsChecksum: expect.arrayContaining([]),
+              uploaded: [expectedUploadedReadmeFile1],
+            },
+          },
+          {
+            status: 'fulfilled',
+            value: {
+              deleted: expect.arrayContaining([]),
+              files: [expectedReadmeLocalFile, expectedSubReadmeLocalFile],
+              filesToDelete: expect.arrayContaining([]),
+              filesToUpload: expect.arrayContaining([
+                expect.stringContaining(giraffeReadme),
+              ]),
+              localFilesChecksum: expect.arrayContaining([
+                expect.stringContaining(giraffeReadme),
+              ]),
+              objects: expect.arrayContaining([]),
+              storage: storages[1],
+              storageObjectsChecksum: expect.arrayContaining([]),
+              uploaded: [
+                expectedUploadedReadmeFile2,
+                expectedUploadedSubReadmeFile2,
+              ],
+            },
+          },
+        ],
+      }
+
+      expect(response).toEqual(expectedResponse)
+
+      for (const storage of storages) {
+        await deleteStorage(syncCloudStorage.getS3Client(), storage)
+      }
+    })
   })
 })
diff --git a/test/providers/local.test.ts b/test/providers/local.test.ts
new file mode 100644
index 0000000..c26d931
--- /dev/null
+++ b/test/providers/local.test.ts
@@ -0,0 +1,30 @@
+import path from 'path'
+
+import { getLocalFiles } from '../../src/providers/local/objects'
+import { createValidInputFixture } from '../schemas/input.fixture'
+
+describe('Local File Provider', () => {
+  it('should return files and directories', async () => {
+    const localPath = path.resolve(
+      __dirname,
+      '..',
+      'assets',
+      'giraffe-multiple'
+    )
+    const {
+      syncCloudStorage: {
+        storages: [storage],
+      },
+    } = createValidInputFixture(localPath)
+    const expectedFiles = ['sub/README.md', 'README.md']
+    const numberOfFiles = expectedFiles.length
+    const filesToUpload = await getLocalFiles(localPath, storage)
+    const filesToUploadKeys = filesToUpload.map((file) => file.Key)
+
+    for (const file of expectedFiles) {
+      expect(filesToUploadKeys.includes(file)).toEqual(true)
+    }
+
+    expect(filesToUploadKeys).toHaveLength(numberOfFiles)
+  })
+})
diff --git a/test/schemas/input.fixture.ts b/test/schemas/input.fixture.ts
index 4d58ed1..6c49ec2 100644
--- a/test/schemas/input.fixture.ts
+++ b/test/schemas/input.fixture.ts
@@ -8,7 +8,7 @@ export const sampleStorage: Storage = {
   prefix: 'animals',
   localPath: './assets/giraffe',
   actions: ['upload', 'delete'],
-  acl: 'public-read',
+  acl: undefined,
   enabled: true,
   tags: {},
 }
@@ -60,6 +60,30 @@ export const createValidInputFixture = (
   }
 }
 
+export const createValidInputFixtureWithACLBucketOwner = (
+  localPath: string,
+  name = '',
+  prefix = '',
+  endpoint = process.env.AWS_ENDPOINT_URL
+): Required<Custom> => {
+  return {
+    syncCloudStorage: {
+      disabled: false,
+      endpoint: endpoint,
+      offline: true,
+      storages: [
+        {
+          ...sampleStorage,
+          name,
+          localPath,
+          prefix: prefix,
+          acl: 'bucket-owner-full-control',
+        },
+      ],
+    },
+  }
+}
+
 export const createValidInputFixtureWithTags = (
   localPath: string,
   name = '',