@webda/gcp 2.0.0-beta.3 → 2.0.0

package/lib/services/storage.spec.js

@@ -1,61 +1,30 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const storage_1 = require("@google-cloud/storage");
-const mocha_1 = require("@testdeck/mocha");
-const binary_spec_1 = require("@webda/core/lib/services/binary.spec");
-const assert = require("assert");
-const path = require("path");
-const sinon = require("sinon");
+import { Storage as GCS } from "@google-cloud/storage";
+import { suite, test } from "@testdeck/mocha";
+import { BinaryTest } from "@webda/core/lib/services/binary.spec.js";
+import * as assert from "assert";
+import * as path from "path";
+import * as sinon from "sinon";
+import { getCommonJS } from "@webda/core";
+const { __dirname } = getCommonJS(import.meta.url);
 class MockFile {
     constructor(path) { }
-    delete() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    getFiles() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    exists() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    save() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    setMetadata() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    createWriteStream() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    getSignedUrl() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    publicUrl() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    getMetadata() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    createReadStream() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    move() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
+    async delete() { }
+    async getFiles() { }
+    async exists() { }
+    async save() { }
+    async setMetadata() { }
+    async createWriteStream() { }
+    async getSignedUrl() { }
+    async publicUrl() { }
+    async getMetadata() { }
+    async createReadStream() { }
+    async move() { }
 }
 class MockBucket {
     file(path) {
@@ -63,151 +32,126 @@ class MockBucket {
     }
 }
 const BUCKET = "webda-dev";
-let StorageTest = class StorageTest extends binary_spec_1.BinaryTest {
-    before() {
-        const _super = Object.create(null, {
-            before: { get: () => super.before }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            this.buildWebda();
-            yield this.install();
-            yield _super.before.call(this);
-            this.prefix = this.getBinary().getWebda().getUuid();
-            this.getBinary().getParameters().prefix = this.prefix;
-            // Prepare for Mocked Version
-            if (!process.env.NO_MOCK && false) {
-                sinon.stub(this.getBinary(), "getStorageBucket").callsFake(() => {
-                    return new MockBucket();
-                });
-            }
-        });
-    }
-    after() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.cleanData();
-        });
-    }
-    install() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var storage = new storage_1.Storage();
-            try {
-                let [metadata] = yield storage.bucket(BUCKET).getMetadata();
-                if (!metadata) {
-                    yield storage.createBucket(BUCKET, { location: "US-WEST2", storageClass: "COLDLINE" });
-                    yield storage.bucket(BUCKET).getMetadata();
-                }
-                //this.webda.log("INFO", `Google cloud storage bucket '${BUCKET}' exists`);
-            }
-            catch (e) {
-                this.webda.log("ERROR", `Google cloud storage error (${e.message})`);
-            }
-        });
-    }
-    cleanData() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var storage = new storage_1.Storage();
-            const [files] = yield storage.bucket(BUCKET).getFiles({
-                prefix: this.prefix,
+let StorageTest = class StorageTest extends BinaryTest {
+    async before() {
+        this.buildWebda();
+        await this.install();
+        await super.before();
+        this.prefix = this.getBinary().getWebda().getUuid();
+        this.getBinary().getParameters().prefix = this.prefix;
+        // Prepare for Mocked Version
+        if (!process.env.NO_MOCK && false) {
+            sinon.stub(this.getBinary(), "getStorageBucket").callsFake(() => {
+                return new MockBucket();
             });
-            for (let file of files) {
-                yield file.delete();
+        }
+    }
+    async after() {
+        await this.cleanData();
+    }
+    async install() {
+        var storage = new GCS();
+        try {
+            let [metadata] = await storage.bucket(BUCKET).getMetadata();
+            if (!metadata) {
+                await storage.createBucket(BUCKET, { location: "US-WEST2", storageClass: "COLDLINE" });
+                await storage.bucket(BUCKET).getMetadata();
             }
+            //this.webda.log("INFO", `Google cloud storage bucket '${BUCKET}' exists`);
+        }
+        catch (e) {
+            this.webda.log("ERROR", `Google cloud storage error (${e.message})`);
+        }
+    }
+    async cleanData() {
+        var storage = new GCS();
+        const [files] = await storage.bucket(BUCKET).getFiles({
+            prefix: this.prefix,
         });
+        for (let file of files) {
+            await file.delete();
+        }
     }
     // Override getNotFound as exception is raised after
     // @test
     // async getNotFound() {}
-    putObject() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const body = `RAW Body: ${new Date()}`;
-            const name = `${this.prefix}/plop/test`;
-            yield this.getBinary().putObject(name, Buffer.from(body), { meta1: "meta1" }, BUCKET);
-            let getFile = this.getBinary().getStorageBucket().file(name);
-            assert.deepStrictEqual((yield getFile.getMetadata())[0].metadata, { meta1: "meta1" });
-        });
+    async putObject() {
+        const body = `RAW Body: ${new Date()}`;
+        const name = `${this.prefix}/plop/test`;
+        await this.getBinary().putObject(name, Buffer.from(body), { meta1: "meta1" }, BUCKET);
+        let getFile = this.getBinary().getStorageBucket().file(name);
+        assert.deepStrictEqual((await getFile.getMetadata())[0].metadata, { meta1: "meta1" });
     }
     // Override getNotFound as exception is raised after
-    getNotFound() {
-        return __awaiter(this, void 0, void 0, function* () { });
-    }
-    httpGetError() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // GET is not through classic binary
-            // Skip it
-        });
-    }
-    redirectUrl() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { user1, ctx } = yield this.setupDefault();
-            // Making sure we are redirected on GET
-            let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0`, {});
-            yield executor.execute(ctx);
-            assert.ok(ctx.getResponseHeaders().Location !== undefined);
-        });
-    }
-    redirectUrlInfo() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { user1, ctx } = yield this.setupDefault();
-            // Making sure we are redirected on GET
-            let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0/url`, {});
-            yield executor.execute(ctx);
-            assert.ok(ctx.getResponseHeaders().Location === undefined);
-            assert.notStrictEqual(JSON.parse(ctx.getResponseBody()).Location, undefined);
-        });
-    }
-    cascadeDelete() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let stubDelete = sinon.stub(this.getBinary(), "_cleanUsage").callsFake(() => {
-                throw new Error();
-            });
-            try {
-                // @ts-ignore
-                yield this.getBinary().cascadeDelete({ hash: "pp" }, "pp");
-            }
-            finally {
-                stubDelete.restore();
-            }
-        });
-    }
-    defaultGCS() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { user1, ctx } = yield this.setupDefault();
-            // COV for double
-            const binary = this.getBinary();
-            const from = `${this.prefix}/rawAccess`;
-            const to = `${this.prefix}/movedAccess`;
-            yield binary.putObject(from, path.join(__dirname, "..", "..", "test", "Dockerfile.txt"));
-            yield binary.moveObject({ key: from }, { key: to });
-            assert.deepStrictEqual(binary.getSignedUrlHeaders(), {});
-            const meta = yield binary.getMeta({ bucket: "webda-dev", key: to });
-            assert.deepStrictEqual(meta, { size: 311, contentType: "text/plain" });
-            assert.ok(/https:\/\/storage\.googleapis\.com\/webda-dev\/webda-dev/.exec(yield binary.getPublicUrl({ key: "webda-dev" })));
-            yield binary.deleteObject({ key: to });
+    async getNotFound() { }
+    async httpGetError() {
+        // GET is not through classic binary
+        // Skip it
+    }
+    async redirectUrl() {
+        let { user1, ctx } = await this.setupDefault();
+        // Making sure we are redirected on GET
+        let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0`, {});
+        await executor.execute(ctx);
+        assert.ok(ctx.getResponseHeaders().Location !== undefined);
+    }
+    async redirectUrlInfo() {
+        let { user1, ctx } = await this.setupDefault();
+        // Making sure we are redirected on GET
+        let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0/url`, {});
+        await executor.execute(ctx);
+        assert.ok(ctx.getResponseHeaders().Location === undefined);
+        assert.notStrictEqual(JSON.parse(ctx.getResponseBody()).Location, undefined);
+    }
+    async cascadeDelete() {
+        let stubDelete = sinon.stub(this.getBinary(), "_cleanUsage").callsFake(() => {
+            throw new Error();
         });
+        try {
+            // @ts-ignore
+            await this.getBinary().cascadeDelete({ hash: "pp" }, "pp");
+        }
+        finally {
+            stubDelete.restore();
+        }
+    }
+    async defaultGCS() {
+        let { user1, ctx } = await this.setupDefault();
+        // COV for double
+        const binary = this.getBinary();
+        const from = `${this.prefix}/rawAccess`;
+        const to = `${this.prefix}/movedAccess`;
+        await binary.putObject(from, path.join(__dirname, "..", "..", "test", "Dockerfile.txt"));
+        await binary.moveObject({ key: from }, { key: to });
+        assert.deepStrictEqual(binary.getSignedUrlHeaders(), {});
+        const meta = await binary.getMeta({ bucket: "webda-dev", key: to });
+        assert.deepStrictEqual(meta, { size: 311, contentType: "text/plain" });
+        assert.ok(/https:\/\/storage\.googleapis\.com\/webda-dev\/webda-dev/.exec(await binary.getPublicUrl({ key: "webda-dev" })));
+        await binary.deleteObject({ key: to });
     }
 };
 __decorate([
-    mocha_1.test
+    test
 ], StorageTest.prototype, "putObject", null);
 __decorate([
-    mocha_1.test
+    test
 ], StorageTest.prototype, "getNotFound", null);
 __decorate([
-    mocha_1.test
+    test
 ], StorageTest.prototype, "httpGetError", null);
 __decorate([
-    mocha_1.test
+    test
 ], StorageTest.prototype, "redirectUrl", null);
 __decorate([
-    mocha_1.test
+    test
 ], StorageTest.prototype, "redirectUrlInfo", null);
 __decorate([
-    mocha_1.test
+    test
 ], StorageTest.prototype, "cascadeDelete", null);
 __decorate([
-    mocha_1.test
+    test
 ], StorageTest.prototype, "defaultGCS", null);
 StorageTest = __decorate([
-    mocha_1.suite
+    suite
 ], StorageTest);
 //# sourceMappingURL=storage.spec.js.map

package/lib/services/storage.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.spec.js","sourceRoot":"","sources":["../../src/services/storage.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mDAAuD;AACvD,2CAA8C;AAC9C,sEAAkE;AAClE,iCAAiC;AACjC,6BAA6B;AAC7B,+BAA+B;AAG/B,MAAM,QAAQ;IACZ,YAAY,IAAI,IAAG,CAAC;IACd,MAAM;8DAAI,CAAC;KAAA;IACX,QAAQ;8DAAI,CAAC;KAAA;IACb,MAAM;8DAAI,CAAC;KAAA;IACX,IAAI;8DAAI,CAAC;KAAA;IACT,WAAW;8DAAI,CAAC;KAAA;IAChB,iBAAiB;8DAAI,CAAC;KAAA;IACtB,YAAY;8DAAI,CAAC;KAAA;IACjB,SAAS;8DAAI,CAAC;KAAA;IACd,WAAW;8DAAI,CAAC;KAAA;IAChB,gBAAgB;8DAAI,CAAC;KAAA;IACrB,IAAI;8DAAI,CAAC;KAAA;CAChB;AAED,MAAM,UAAU;IACd,IAAI,CAAC,IAAY;QACf,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF;AACD,MAAM,MAAM,GAAG,WAAW,CAAC;AAE3B,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,wBAAmB;IAErC,MAAM;;;;;YACV,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,OAAM,MAAM,WAAE,CAAC;YACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YACtD,6BAA6B;YAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,KAAK,EAAE;gBACjC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,kBAAkB,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;oBAC9D,OAAY,IAAI,UAAU,EAAE,CAAC;gBAC/B,CAAC,CAAC,CAAC;aACJ;QACH,CAAC;KAAA;IAEK,KAAK;;YACT,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACzB,CAAC;KAAA;IAEK,OAAO;;YACX,IAAI,OAAO,GAAG,IAAI,iBAAG,EAAE,CAAC;YACxB,IAAI;gBACF,IAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC5D,IAAI,CAAC,QAAQ,EAAE;oBACb,MAAM,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;oBACvF,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC5C;gBACD,2EAA2E;aAC5E;YAAC,OAAO,CAAM,EAAE;gBACf,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;aACtE;QACH,CAAC;KAAA;IAEK,SAAS;;YACb,IAAI,OAAO,GAAG,IAAI,iBAAG,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBACpD,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC,CAAC;YACH,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;gBACtB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;aACrB;QACH,CAAC;KAAA;IAED,oDAAoD;IACpD,QAAQ;IACR,yBAAyB;IAGnB,SAAS;;YACb,MAAM,IAAI,GAAG,aAAa,IAAI,IAAI,EAAE,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,YAAY,CAAC;YACxC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;YACtF,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE7D,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QACxF,CAAC;KAAA;IAED,oDAAoD;IAE9C,WAAW;8DAAI,CAAC;KAAA;IAGhB,YAAY;;YAChB,oCAAoC;YACpC,UAAU;QACZ,CAAC;KAAA;IAGK,WAAW;;YACf,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC/C,uCAAuC;YACvC,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,iBAAiB,KAAK,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;YAC9G,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;QAC7D,CAAC;KAAA;IAGK,eAAe;;YACnB,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC/C,uCAAuC;YACvC,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,iBAAiB,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;YAClH,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC5B,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC;YAC3D,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC/E,CAAC;KAAA;IAGK,aAAa;;YACjB,IAAI,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,aAAa,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;gBAC1E,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,CAAC,CAAC,CAAC;YACH,IAAI;gBACF,aAAa;gBACb,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;aAC5D;oBAAS;gBACR,UAAU,CAAC,OAAO,EAAE,CAAC;aACtB;QACH,CAAC;KAAA;IAGK,UAAU;;YACd,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YAC/C,iBAAiB;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,YAAY,CAAC;YACxC,MAAM,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,cAAc,CAAC;YACxC,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;YACzF,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,EAAE,CAAC,CAAC;YACzD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YACvE,MAAM,CAAC,EAAE,CACP,0DAA0D,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC,CACjH,CAAC;YACF,MAAM,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;KAAA;CACF,CAAA;AApEC;IADC,YAAI;4CAQJ;AAID;IADC,YAAI;8CACiB;AAGtB;IADC,YAAI;+CAIJ;AAGD;IADC,YAAI;8CAOJ;AAGD;IADC,YAAI;kDAQJ;AAGD;IADC,YAAI;gDAWJ;AAGD;IADC,YAAI;6CAgBJ;AApHG,WAAW;IADhB,aAAK;GACA,WAAW,CAqHhB"}
+{"version":3,"file":"storage.spec.js","sourceRoot":"","sources":["../../src/services/storage.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/gcp",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0",
   "description": "Webda GCP Services implementation",
   "main": "lib/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "pretest": "npm run build",
     "lint": "prettier --check src/**/*",
     "lint:fix": "prettier --write src/**/*",
-    "test": "nyc mocha --recursive --exit --timeout=100000 -r ../../node_modules/ts-node/register src/**/*.spec.ts"
+    "test": "c8 mocha --recursive --exit --timeout=100000 src/**/*.spec.ts"
   },
   "repository": {
     "type": "git",
@@ -32,11 +32,10 @@
   "dependencies": {
     "@google-cloud/firestore": "^5.0.2",
     "@google-cloud/pubsub": "^3.0.0",
-    "@google-cloud/storage": "~6.0.1",
-    "@webda/core": "^2.0.0-beta.3"
+    "@google-cloud/storage": "~6.1.0",
+    "@webda/core": "^2.0.0"
   },
-  "nyc": {
-    "extends": "@istanbuljs/nyc-config-typescript",
+  "c8": {
     "report-dir": "./reports",
     "reporter": [
       "html",
@@ -54,10 +53,14 @@
   },
   "devDependencies": {
     "@testdeck/mocha": "^0.2.0",
-    "@types/node": "14.0.0",
-    "@webda/async": "^2.0.0-beta.3",
-    "@webda/shell": "^2.0.0-beta.3",
+    "@types/node": "14.6.0",
+    "@webda/async": "^2.0.0",
+    "@webda/shell": "^2.0.0",
     "sinon": "^14.0.0"
   },
-  "gitHead": "f95827566d42d22c32aed524b74d0446fff66ed4"
+  "type": "module",
+  "engines": {
+    "node": ">=14.6.0"
+  },
+  "gitHead": "5764db57432f146c84b2e8f52cf49fb5ded3af29"
 }

package/webda.module.json

@@ -9,79 +9,16 @@
   "models": {},
   "deployers": {},
   "schemas": {
-    "webda/googlecloudstorage": {
+    "webda/googlecloudfirestore": {
       "type": "object",
       "properties": {
         "type": {
           "type": "string",
           "description": "Type of the service"
         },
-        "map": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "description": "Define the map to Object collection\n\nkey is a Store name the string[] represent all valids attributes to store files in"
-        },
-        "expose": {
-          "type": "object",
-          "properties": {
-            "url": {
-              "type": "string",
-              "description": "URL to expose the service to"
-            },
-            "restrict": {
-              "type": "object",
-              "properties": {
-                "get": {
-                  "type": "boolean",
-                  "description": "Restrict GET"
-                },
-                "create": {
-                  "type": "boolean",
-                  "description": "Restrict POST"
-                },
-                "delete": {
-                  "type": "boolean",
-                  "description": "Restrict DELETE"
-                },
-                "metadata": {
-                  "type": "boolean",
-                  "description": "Restrict update of metadata"
-                }
-              },
-              "description": "Restrict some APIs"
-            }
-          },
-          "required": [
-            "url"
-          ],
-          "description": "Expose the service to http"
-        },
-        "prefix": {
-          "type": "string"
-        },
-        "bucket": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "bucket",
-        "map",
-        "type"
-      ],
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "GoogleCloudStorage"
-    },
-    "webda/googlecloudfirestore": {
-      "type": "object",
-      "properties": {
-        "type": {
+        "url": {
           "type": "string",
-          "description": "Type of the service"
+          "description": "URL on which to serve the content"
         },
         "model": {
           "type": "string",
@@ -116,6 +53,10 @@
             "$ref": "#/definitions/FireStoreIndex"
           },
           "description": "To allow efficient query on several fields"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [
@@ -195,6 +136,10 @@
           "type": "string",
           "description": "Type of the service"
         },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
         "topic": {
           "type": "string",
           "description": "Topic to use on GCP"
@@ -202,6 +147,10 @@
         "subscriptionOptions": {
           "$ref": "#/definitions/CreateSubscriptionOptions",
           "description": "Subscription options to pass to GCP"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [
@@ -973,6 +922,10 @@
           "type": "string",
           "description": "Type of the service"
         },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
         "workerDelayer": {
           "type": "object",
           "properties": {
@@ -1012,6 +965,10 @@
         "timeout": {
           "type": "number",
           "description": "Timeout when receiveMessage is used before returning empty result (in ms)\n\nIf not define then no timeout is applied and receiveMessage can hang forever"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [
@@ -1023,6 +980,81 @@
       "description": "GCPQueue Parameters",
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "GoogleCloudQueue"
+    },
+    "webda/googlecloudstorage": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Type of the service"
+        },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
+        "map": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "description": "Define the map to Object collection\n\nkey is a Store name the string[] represent all valids attributes to store files in"
+        },
+        "expose": {
+          "type": "object",
+          "properties": {
+            "url": {
+              "type": "string",
+              "description": "URL to expose the service to"
+            },
+            "restrict": {
+              "type": "object",
+              "properties": {
+                "get": {
+                  "type": "boolean",
+                  "description": "Restrict GET"
+                },
+                "create": {
+                  "type": "boolean",
+                  "description": "Restrict POST"
+                },
+                "delete": {
+                  "type": "boolean",
+                  "description": "Restrict DELETE"
+                },
+                "metadata": {
+                  "type": "boolean",
+                  "description": "Restrict update of metadata"
+                }
+              },
+              "description": "Restrict some APIs"
+            }
+          },
+          "required": [
+            "url"
+          ],
+          "description": "Expose the service to http"
+        },
+        "prefix": {
+          "type": "string"
+        },
+        "bucket": {
+          "type": "string"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
+        }
+      },
+      "required": [
+        "bucket",
+        "map",
+        "type"
+      ],
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "GoogleCloudStorage"
     }
   }
 }