moved clearBucket call in deleteBucket to abstract adapter, reorganize tests

Author: abudaan

.github/workflows/ci.yaml

@@ -3,7 +3,7 @@ name: ci
 on:
   push:
     branches:
-      - master
+      - dev
   pull_request:
     branches:
       - "*"
@@ -30,4 +30,4 @@ jobs:
             node-modules-cache-${{matrix.node-version}}-${{runner.os}}-
       - run: npm ci
       - run: npm run test-local
-      # - run: npm run test-minio-2
+      - run: npm run test-minio

package.json

@@ -38,20 +38,11 @@
     "typescript": "^5.9.3"
   },
   "scripts": {
-    "test-all": "npm run test-jasmine local && npm run test-gcs && npm run test-s3 && npm run test-b2 && npm run test-azure && npm run test-minio && npm run test-minio-s3 && npm run test-cubbit && npm run test-cloudflare && npm run test-b2-s3",
+    "test-all": "npm run test-local && npm run test-jasmine gcs && npm run test-jasmine s3 && npm run test-jasmine b2 && npm run test-jasmine azure && npm run test-jasmine minio && npm run test-jasmine minio-s3 && npm run test-jasmine cubbit && npm run test-jasmine cloudflare && npm run test-jasmine b2-s3",
     "test-jasmine": "node ./node_modules/.bin/jasmine --random=false --fail-fast ./publish/dist/tests/test.jasmine.js",
-    "test-jasmine-1": "ts-node -O '{\"module\":\"commonjs\"}' ./node_modules/.bin/jasmine --random=false --fail-fast ./tests/test.jasmine.ts",
+    "test-jasmine-1": "ts-node ./node_modules/.bin/jasmine --random=false --fail-fast ./tests/test.jasmine.ts",
     "test-local": "LOCAL_DIRECTORY='tests/test_directory' npm run test-jasmine local",
-    "test-s3": "npm run test-jasmine s3",
-    "test-gcs": "npm run test-jasmine gcs",
-    "test-b2": "npm run test-jasmine b2",
-    "test-b2-s3": "npm run test-jasmine b2-s3",
-    "test-azure": "npm run test-jasmine azure",
-    "test-minio": "npm run test-jasmine minio",
-    "test-minio-s3": "npm run test-jasmine minio-s3",
-    "test-cubbit": "npm run test-jasmine cubbit",
-    "test-cloudflare": "npm run test-jasmine r2",
-    "test-minio-2": "MINIO_ENDPOINT='play.min.io' MINIO_USE_SSL='true' MINIO_PORT='9000' MINIO_REGION='us-east-1' MINIO_ACCESS_KEY='Q3AM3UQ867SPQQA43P2F' MINIO_SECRET_KEY='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG' npm run test-jasmine minio",
+    "test-minio": "MINIO_ENDPOINT='play.min.io' MINIO_USE_SSL='true' MINIO_PORT='9000' MINIO_REGION='us-east-1' MINIO_ACCESS_KEY='Q3AM3UQ867SPQQA43P2F' MINIO_SECRET_KEY='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG' npm run test-jasmine minio",
     "test": "ts-node ./tests/test_runs.ts",
     "test2": "ts-node ./tests/test2.ts",
     "toc": "ts-node ./toc/replace.ts && cd ./toc && ./create_toc.sh && cd ../",

src/AbstractAdapter.ts

@@ -298,10 +298,19 @@ export abstract class AbstractAdapter implements IAdapter {
       }
     }
     name = r.value as string;
-    if (this.selectedBucket === name) {
-      this.selectedBucket = null;
+
+    const data = await this._clearBucket(name);
+    if (data.error !== null) {
+      return { value: null, error: data.error };
+    }
+
+    const r2 = await this._deleteBucket(name);
+    if (r2.error === null) {
+      if (this.selectedBucket === name) {
+        this.selectedBucket = null;
+      }
     }
-    return this._deleteBucket(name);
+    return r2;
   }
 
   public async bucketExists(name?: string): Promise<ResultObjectBoolean> {
@@ -371,8 +380,7 @@ export abstract class AbstractAdapter implements IAdapter {
       return { value: null, error: error as string };
     }
 
-    console.log(bucketName, _fn, options, error);
-
+    // console.log(bucketName, _fn, options, error);
 
     const r = await this.checkBucket(bucketName);
     if (r.error !== null) {

src/AdapterAmazonS3.ts

@@ -369,10 +369,6 @@ export class AdapterAmazonS3 extends AbstractAdapter {
 
   protected async _deleteBucket(bucketName: string): Promise<ResultObject> {
     try {
-      const r = await this._clearBucket(bucketName);
-      if (r.error !== null) {
-        return { value: null, error: r.error };
-      }
       const input = {
         Bucket: bucketName,
       };

src/AdapterAzureBlob.ts

@@ -280,7 +280,6 @@ export class AdapterAzureBlob extends AbstractAdapter {
 
   protected async _deleteBucket(name: string): Promise<ResultObject> {
     try {
-      await this.clearBucket(name);
       const del = await this._client.deleteContainer(name);
       //console.log('deleting container: ', del);
       return { value: "ok", error: null };

src/AdapterBackblazeB2.ts

@@ -473,11 +473,6 @@ export class AdapterBackblazeB2 extends AbstractAdapter {
   }
 
   protected async _deleteBucket(name: string): Promise<ResultObject> {
-    const data = await this.clearBucket(name);
-    if (data.error !== null) {
-      return { value: null, error: data.error };
-    }
-
     const { error, value: bucket } = await this.getBucket(name);
     if (bucket === null) {
       return { value: null, error: error };

src/AdapterGoogleCloud.ts

@@ -275,11 +275,6 @@ export class AdapterGoogleCloud extends AbstractAdapter {
   }
 
   protected async _deleteBucket(name: string): Promise<ResultObject> {
-    try {
-      await this.clearBucket(name);
-    } catch (e) {
-      return { value: null, error: getErrorMessage(e) };
-    }
     try {
       await this._client.bucket(name).delete();
       return { value: "ok", error: null };

src/AdapterMinio.ts

@@ -203,7 +203,6 @@ export class AdapterMinio extends AbstractAdapter {
 
   protected async _deleteBucket(name: string): Promise<ResultObject> {
     try {
-      await this.clearBucket(name);
       await this._client.removeBucket(name);
       return { value: "ok", error: null };
     } catch (e) {

tests/api_calls.ts

@@ -6,7 +6,7 @@ import { fileTypeFromBuffer } from 'file-type';
 import { Storage } from "../src/Storage";
 import { IAdapter, Options, Provider } from "../src/types/general";
 import { getConfig } from "./config";
-import { Color, colorLog, logResult, saveFile, getSha1ForFile, getPrivateBucketName } from "./util";
+import { Color, colorLog, logResult, saveFile, getSha1ForFile, getPrivateBucketName, timeout } from "./util";
 import { ResultObject } from "../src/types/result";
 import dotenv from "dotenv";
 
@@ -97,7 +97,7 @@ export async function init(_provider: Provider, bucketName?: string): Promise<st
 export async function deleteAllBuckets(
   list: Array<string>,
   storage: IAdapter,
-  delay: number = 500
+  delay?: number
 ): Promise<ResultObject> {
   colorLog("init::deleteAllBuckets", Color.MESSAGE, list);
   for (let i = 0; i < list.length; i++) {
@@ -126,6 +126,9 @@ export async function deleteAllBuckets(
         return { value: null, error: r.error };
       }
     }
+    if (typeof delay === "number") {
+      await timeout(delay);
+    }
   }
   return { value: "ok", error: null };
 }

tests/test.jasmine.ts

@@ -20,7 +20,7 @@ let provider = Provider.LOCAL;
 if (process.argv[5]) {
   provider = process.argv[5] as Provider;
 }
-console.log(provider);
+// console.log(provider);
 const config: StorageAdapterConfig | string = getConfig(provider);
 
 const newBucketName1 = "bucket-test-sab-1";