Fixed e2e test errors

Author: asarode06

packages/api-gateway/test/file_delete.e2e-spec.ts

@@ -1,3 +1,4 @@
+import { CreateBucketCommand, DeleteBucketCommand, S3Client } from '@aws-sdk/client-s3';
 import { Test, TestingModule } from '@nestjs/testing';
 import {
   ClassSerializerInterceptor,
@@ -18,6 +19,8 @@ import * as GRPC from '@grpc/grpc-js';
 import * as ProtoLoader from '@grpc/proto-loader';
 import { RpcExceptionFilter } from 'src/rpc_exception_filter';
 
+jest.setTimeout(15000);
+
 let app: INestApplication;
 const ADMIN_EMAIL = 'test-superadmin@test.com';
 const ADMIN_PASSWORD = 'test-password';
@@ -38,14 +41,17 @@ async function APIKeyForProjectName(projectName: string): Promise<string> {
   return key.body['apiKey'];
 }
 
-const bucketName = 'test-delete-gw-juno';
+const bucketName = 'test-delete-bog-juno';
 const configId = 0;
 const providerName = 'backblazeb2-delete-gw';
 
 const accessKeyId = process.env.accessKeyId;
 const secretAccessKey = process.env.secretAccessKey;
 const baseURL = process.env.baseURL;
 
+const s3BucketName = `${bucketName}-${configId}-prod`;
+let s3Client: S3Client;
+
 beforeAll(async () => {
   const proto = ProtoLoader.loadSync([ResetProtoFile]) as any;
   const protoGRPC = GRPC.loadPackageDefinition(proto) as any;
@@ -98,11 +104,32 @@ beforeAll(async () => {
       () => resolve(0),
     );
   });
+
+  s3Client = new S3Client({
+    endpoint: baseURL as string,
+    region: 'us-east-005',
+    credentials: {
+      accessKeyId: accessKeyId as string,
+      secretAccessKey: secretAccessKey as string,
+    },
+    forcePathStyle: true,
+  });
+  try {
+    await s3Client.send(new CreateBucketCommand({ Bucket: s3BucketName }));
+  } catch {
+    // Bucket may already exist from a previous run
+  }
 });
 
-afterAll((done) => {
-  app.close();
-  done();
+afterAll(async () => {
+  if (app) await app.close();
+  if (s3Client) {
+    try {
+      await s3Client.send(new DeleteBucketCommand({ Bucket: s3BucketName }));
+    } catch {
+      // Ignore cleanup errors
+    }
+  }
 });
 
 beforeEach(async () => {
@@ -198,14 +225,15 @@ describe('File Delete Routes', () => {
       );
     });
 
-    return request(app.getHttpServer())
+    const res = await request(app.getHttpServer())
       .delete('/file/delete')
       .set('Authorization', 'Bearer ' + apiKey)
       .send({
         bucketName,
         configId,
         fileNames: ['FileToDeleteGW'],
-      })
-      .expect(200);
+      });
+
+    expect(res.status).toBe(200);
   });
 });

packages/file-service/src/modules/file_transfer/azure_handler.ts

@@ -55,6 +55,8 @@ export class AzureFileHandler {
       const containerClient = blobServiceClient.getContainerClient(
         `${request.bucketName}-${request.configId}-${request.configEnv}`,
       );
+      const containerExists = await containerClient.exists();
+      if (!containerExists) return;
       await Promise.all(
         request.fileNames.map((name) =>
           containerClient.getBlobClient(name).deleteIfExists(),

packages/file-service/src/modules/file_transfer/s3_handler.ts

@@ -3,7 +3,6 @@ import {
   GetObjectCommand,
   PutObjectCommand,
   DeleteObjectsCommand,
-  ListObjectVersionsCommand,
 } from '@aws-sdk/client-s3';
 import { FileProto, FileProviderProto } from 'juno-proto';
 import { RpcException } from '@nestjs/microservices';
@@ -81,46 +80,17 @@ export class S3FileHandler {
   async deleteFiles(request: FileProto.DeleteFilesRequest): Promise<void> {
     try {
       const s3Client = await this.getS3Client('us-east-005');
-      const bucket = `${request.bucketName}-${request.configId}-${request.configEnv}`;
-
-      const objectsToDelete: { Key: string; VersionId?: string }[] = [];
-
-      for (const name of request.fileNames) {
-        const listCommand = new ListObjectVersionsCommand({
-          Bucket: bucket,
-          Prefix: name,
-        });
-        const versions = await s3Client.send(listCommand);
-
-        for (const version of versions.Versions ?? []) {
-          objectsToDelete.push({
-            Key: version.Key!,
-            VersionId: version.VersionId,
-          });
-        }
-        for (const marker of versions.DeleteMarkers ?? []) {
-          objectsToDelete.push({
-            Key: marker.Key!,
-            VersionId: marker.VersionId,
-          });
-        }
-      }
-
-      if (objectsToDelete.length > 0) {
-        const deleteCommand = new DeleteObjectsCommand({
-          Bucket: bucket,
-          Delete: { Objects: objectsToDelete },
-        });
-        const result = await s3Client.send(deleteCommand);
-        if (result.Errors && result.Errors.length > 0) {
-          const failedKeys = result.Errors.map((e) => e.Key).join(', ');
-          throw new RpcException({
-            code: status.FAILED_PRECONDITION,
-            message: `Failed to delete some objects from S3: ${failedKeys}`,
-          });
-        }
-      }
+      const deleteCommand = new DeleteObjectsCommand({
+        Bucket: `${request.bucketName}-${request.configId}-${request.configEnv}`,
+        Delete: {
+          Objects: request.fileNames.map((name) => ({ Key: name })),
+        },
+      });
+      await s3Client.send(deleteCommand);
     } catch (err) {
+      if ((err as any).name === 'NoSuchBucket') {
+        return;
+      }
       throw new RpcException({
         code: status.FAILED_PRECONDITION,
         message: `Failed to delete files from S3: ${err}`,