fix(s3): disable S3Client logger (#664)

set environment variable `S3_DEBUG` to enable
kukhariev · Jun 10, 2023 · 833867f · 833867f
1 parent 681f30f
commit 833867f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/examples/.env.example b/examples/.env.example
@@ -10,6 +10,7 @@ GCS_KEYFILE=~/.gcs-credentials.json
 # See also https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/loading-node-credentials-environment.html
 S3_BUCKET=uploadx
 S3_ENDPOINT=https://s3.us-west-002.backblazeb2.com
+S3_DEBUG=false
 # Path to file with accessKeyId and secretAccessKey and region(optional)
 # S3_KEYFILE=.s3-config.example
 
diff --git a/packages/core/src/utils/primitives.ts b/packages/core/src/utils/primitives.ts
@@ -133,3 +133,7 @@ export const memoize = <T, K>(fn: (arg: T) => K): ((arg: T) => K) => {
 };
 
 export const hash = memoize(fnv64);
+
+export const toBoolean = (val?: unknown): boolean => {
+  return ['true', '1', 'y', 'yes'].includes(String(val).trim().toLowerCase());
+};
diff --git a/packages/s3/src/s3-storage.ts b/packages/s3/src/s3-storage.ts
@@ -32,6 +32,7 @@ import {
   mapValues,
   MetaStorage,
   partMatch,
+  toBoolean,
   toSeconds,
   updateSize
 } from '@uploadx/core';
@@ -120,7 +121,7 @@ export class S3Storage extends BaseStorage<S3File> {
   checksumTypes = ['md5'];
   private readonly _partSize = PART_SIZE;
 
-  constructor(public config: S3StorageOptions) {
+  constructor(public config: S3StorageOptions = {}) {
     super(config);
     this.bucket = config.bucket || process.env.S3_BUCKET || BUCKET_NAME;
     const keyFile = config.keyFile || process.env.S3_KEYFILE;
@@ -132,11 +133,13 @@ export class S3Storage extends BaseStorage<S3File> {
     if (this.config.clientDirectUpload) {
       this.onCreate = async file => ({ body: file }); // TODO: remove hook
     }
-    this.client = new S3Client(config);
+    const clientConfig = { ...config };
+    clientConfig.logger = toBoolean(process.env.S3_DEBUG) ? this.logger : undefined;
+    this.client = new S3Client(clientConfig);
     if (config.metaStorage) {
       this.meta = config.metaStorage;
     } else {
-      const metaConfig = { ...config, ...(config.metaStorageConfig || {}), logger: this.logger };
+      const metaConfig = { ...clientConfig, ...clientConfig.metaStorageConfig };
       this.meta =
         'directory' in metaConfig
           ? new LocalMetaStorage(metaConfig)