refactor(s3): change bucket equal check

Author: marvin-kolja

packages/providers/s3/src/provider.ts

@@ -126,12 +126,7 @@ export class S3Provider<ID> extends StorageServiceProvider<ID> {
             // If the resource bucket is different from the upload bucket
             // we need to check if the file exists in the upload bucket too.
             // This is because the file might not have been processed yet.
-            if (
-                S3ProviderConfigurationParser.isResourceBucketDifferent(
-                    this.configuration,
-                    this.configuration.resourceBucket
-                )
-            ) {
+            if (!this.buckets.upload.equals(this.buckets.resource)) {
                 const exists = await this.buckets.upload.keyExists(
                     this.buckets.upload.keyResolver.resolve(fileId),
                     {}

packages/providers/s3/src/utils/s3-bucket.ts

@@ -18,7 +18,7 @@ import {
 import { ExpiresIn } from 'shared-types'
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 
-class S3Bucket<
+abstract class S3Bucket<
     Config extends
         | Required<S3DefaultBucketConfiguration>
         | Required<S3ResourceBucketConfiguration>,
@@ -42,6 +42,12 @@ class S3Bucket<
         this.path = s3Config.bucketPath
     }
 
+    abstract equals(
+        bucket: this extends S3UploadBucket<ID>
+            ? S3ResourceBucket<ID>
+            : S3UploadBucket<ID>
+    ): boolean
+
     async keyExists(
         key: string,
         commandInput?: Omit<HeadObjectCommandInput, 'Bucket' | 'Key'>
@@ -72,6 +78,14 @@ export class S3UploadBucket<ID> extends S3Bucket<
     Required<S3DefaultBucketConfiguration>,
     ID
 > {
+    equals(bucket: S3ResourceBucket<ID>): boolean {
+        return (
+            this.name === bucket.name &&
+            this.region === bucket.region &&
+            this.path === bucket.path[0]
+        )
+    }
+
     async getSignedUploadUrl(
         fileId: ID,
         expiresIn: ExpiresIn,
@@ -93,6 +107,14 @@ export class S3ResourceBucket<ID> extends S3Bucket<
     Required<S3ResourceBucketConfiguration>,
     ID
 > {
+    equals(bucket: S3UploadBucket<ID>): boolean {
+        return (
+            this.name === bucket.name &&
+            this.region === bucket.region &&
+            this.path[0] === bucket.path
+        )
+    }
+
     async getSignedDownloadUrl(
         key: string,
         commandInput?: Omit<GetObjectCommandInput, 'Bucket' | 'Key'>

packages/providers/s3/src/utils/s3-provider-configuration-parser.ts

@@ -87,15 +87,4 @@ export class S3ProviderConfigurationParser {
             acl: configuration.acl ?? ObjectCannedACL.bucket_owner_full_control,
         }
     }
-
-    static isResourceBucketDifferent(
-        a: S3DefaultBucketConfiguration,
-        b: S3ResourceBucketConfiguration
-    ) {
-        return !(
-            a.bucketName === b.bucketName &&
-            a.bucketRegion === b.bucketRegion &&
-            a.bucketPath === b.bucketPath?.[0]
-        )
-    }
 }