From 82bef303fffa2b38bcd8f6abcd9ba75b00c8d06b Mon Sep 17 00:00:00 2001
From: vahid <azizalizad@gmail.com>
Date: Tue, 22 Oct 2024 19:15:05 +0330
Subject: [PATCH] fix merge conflicts of prettier and file names

---
 .prettierrc                                  |  7 ---
 lib/optionsFromArguments.js                  | 14 +----
 spec/mocks/s3adapter-v2.js                   | 56 --------------------
 spec/mocks/{s3adapter-v3.js => s3adapter.js} |  0
 spec/support/server.js                       |  2 +-
 spec/test.spec.js                            |  2 +-
 6 files changed, 4 insertions(+), 77 deletions(-)
 delete mode 100644 .prettierrc
 delete mode 100644 spec/mocks/s3adapter-v2.js
 rename spec/mocks/{s3adapter-v3.js => s3adapter.js} (100%)

diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index a6347cf..0000000
--- a/.prettierrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "semi": true,
-  "trailingComma": "es5",
-  "singleQuote": true,
-  "arrowParens": "avoid",
-  "printWidth": 100
-}
diff --git a/lib/optionsFromArguments.js b/lib/optionsFromArguments.js
index 2c43108..f56c9bc 100644
--- a/lib/optionsFromArguments.js
+++ b/lib/optionsFromArguments.js
@@ -95,19 +95,9 @@ const optionsFromArguments = function optionsFromArguments(args) {
   options = fromEnvironmentOrDefault(options, 'baseUrl', 'S3_BASE_URL', null);
   options = fromEnvironmentOrDefault(options, 'baseUrlDirect', 'S3_BASE_URL_DIRECT', false);
   options = fromEnvironmentOrDefault(options, 'signatureVersion', 'S3_SIGNATURE_VERSION', 'v4');
-  options = fromEnvironmentOrDefault(
-    options,
-    'globalCacheControl',
-    'S3_GLOBAL_CACHE_CONTROL',
-    null
-  );
+  options = fromEnvironmentOrDefault(options, 'globalCacheControl', 'S3_GLOBAL_CACHE_CONTROL', null);
   options = fromEnvironmentOrDefault(options, 'presignedUrl', 'S3_PRESIGNED_URL', false);
-  options = fromEnvironmentOrDefault(
-    options,
-    'presignedUrlExpires',
-    'S3_PRESIGNED_URL_EXPIRES',
-    null
-  );
+  options = fromEnvironmentOrDefault(options, 'presignedUrlExpires', 'S3_PRESIGNED_URL_EXPIRES', null);
   options = fromOptionsDictionaryOrDefault(options, 'generateKey', null);
   options = fromOptionsDictionaryOrDefault(options, 'validateFilename', null);
 
diff --git a/spec/mocks/s3adapter-v2.js b/spec/mocks/s3adapter-v2.js
deleted file mode 100644
index 2fd4ede..0000000
--- a/spec/mocks/s3adapter-v2.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const S3Adapter = require('../../index.js');
-
-function getMockS3Adapter(options) {
-  const accessKey = process.env.TEST_S3_ACCESS_KEY || 'ACCESS_KEY';
-  const secretKey = process.env.TEST_S3_SECRET_KEY || 'SECRET_KEY';
-  const bucket = process.env.TEST_S3_BUCKET || 'BUCKET';
-
-  const s3 = new S3Adapter(Object.assign({
-    accessKey,
-    secretKey,
-    bucket,
-  }, options));
-
-  const objects = {};
-
-  s3._s3Client = {
-    createBucket: callback =>
-      // @ts-ignore
-      setTimeout(callback, 100),
-
-    upload: (params, callback) =>
-      // @ts-ignore
-      setTimeout(() => {
-        const { Key, Body } = params;
-        objects[Key] = Body;
-        callback(null, { Location: `https://${bucket}.s3.amazonaws.com/${Key}` });
-      }, 100),
-
-    deleteObject: (params, callback) =>
-      // @ts-ignore
-      setTimeout(() => {
-        const { Key } = params;
-        delete objects[Key];
-        // @ts-ignore
-        callback(null, {});
-      }, 100),
-
-    getObject: (params, callback) =>
-      // @ts-ignore
-      setTimeout(() => {
-        const { Key } = params;
-
-        if (objects[Key]) {
-          // @ts-ignore
-          callback(null, { Body: Buffer.from(objects[Key], 'utf8') });
-        } else {
-          // @ts-ignore
-          callback(new Error('Not found'));
-        }
-      }, 100),
-  };
-
-  return s3;
-}
-
-module.exports = { getMockS3Adapter };
diff --git a/spec/mocks/s3adapter-v3.js b/spec/mocks/s3adapter.js
similarity index 100%
rename from spec/mocks/s3adapter-v3.js
rename to spec/mocks/s3adapter.js
diff --git a/spec/support/server.js b/spec/support/server.js
index 397b3ca..19755cb 100644
--- a/spec/support/server.js
+++ b/spec/support/server.js
@@ -1,7 +1,7 @@
 const { ParseServer } = require('parse-server');
 const express = require('express');
 const http = require('http');
-const { getMockS3Adapter } = require('../mocks/s3adapter-v3');
+const { getMockS3Adapter } = require('../mocks/s3adapter.js');
 const Config = require('../../node_modules/parse-server/lib/Config.js');
 
 const expressApp = express();
diff --git a/spec/test.spec.js b/spec/test.spec.js
index d21c215..ad38084 100644
--- a/spec/test.spec.js
+++ b/spec/test.spec.js
@@ -4,7 +4,7 @@ const config = require('config');
 const S3Adapter = require('../index');
 const optionsFromArguments = require('../lib/optionsFromArguments');
 const { GetObjectCommand, PutObjectCommand, CreateBucketCommand } = require('@aws-sdk/client-s3');
-const { getMockS3Adapter } = require('./mocks/s3adapter-v3');
+const { getMockS3Adapter } = require('./mocks/s3adapter');
 
 
 describe('S3Adapter tests', () => {