@webda/aws 2.0.0-beta.3 → 2.1.0

package/lib/services/sqsqueue.spec.js

@@ -1,138 +1,90 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 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 __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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 client_sqs_1 = require("@aws-sdk/client-sqs");
-const mocha_1 = require("@testdeck/mocha");
-const queue_spec_1 = require("@webda/core/lib/queues/queue.spec");
-const assert = __importStar(require("assert"));
-const aws_sdk_client_mock_1 = require("aws-sdk-client-mock");
-const path = __importStar(require("path"));
-const index_spec_1 = require("../index.spec");
-const sqsqueue_1 = require("./sqsqueue");
-let SQSQueueTest = class SQSQueueTest extends queue_spec_1.QueueTest {
-    before() {
-        const _super = Object.create(null, {
-            before: { get: () => super.before }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            process.env.AWS_ACCESS_KEY_ID = "plop";
-            process.env.AWS_SECRET_ACCESS_KEY = "plop";
-            process.env.AWS_DEFAULT_REGION = "us-east-1";
-            yield (0, index_spec_1.checkLocalStack)();
-            yield _super.before.call(this);
-            yield this.install();
-        });
+import { PurgeQueueCommand, SQS } from "@aws-sdk/client-sqs";
+import { suite, test, timeout } from "@testdeck/mocha";
+import { getCommonJS } from "@webda/core";
+import { QueueTest } from "@webda/core/lib/queues/queue.spec.js";
+import * as assert from "assert";
+import { mockClient } from "aws-sdk-client-mock";
+import * as path from "path";
+import { checkLocalStack, defaultCreds } from "../index.spec.js";
+import { SQSQueue } from "./sqsqueue.js";
+const { __dirname } = getCommonJS(import.meta.url);
+let SQSQueueTest = class SQSQueueTest extends QueueTest {
+    async before() {
+        process.env.AWS_ACCESS_KEY_ID = "plop";
+        process.env.AWS_SECRET_ACCESS_KEY = "plop";
+        process.env.AWS_DEFAULT_REGION = "us-east-1";
+        await checkLocalStack();
+        await super.before();
+        await this.install();
     }
-    tweakApp(app) {
-        const _super = Object.create(null, {
-            tweakApp: { get: () => super.tweakApp }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            _super.tweakApp.call(this, app);
-            app.addService("test/awsevents", (yield Promise.resolve().then(() => __importStar(require(path.join(__dirname, ..."../../test/moddas/awsevents.js".split("/")))))).default);
-        });
+    async tweakApp(app) {
+        super.tweakApp(app);
+        app.addService("test/awsevents", (await import(path.join(__dirname, ..."../../test/moddas/awsevents.js".split("/")))).default);
     }
-    install() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var sqs = new client_sqs_1.SQS({
-                endpoint: "http://localhost:4566",
-                credentials: index_spec_1.defaultCreds,
-                region: "us-east-1"
+    async install() {
+        var sqs = new SQS({
+            endpoint: "http://localhost:4566",
+            credentials: defaultCreds,
+            region: "us-east-1"
+        });
+        try {
+            this.info = await sqs.getQueueUrl({
+                QueueName: "webda-test",
+                QueueOwnerAWSAccountId: "000000000000"
             });
-            try {
-                this.info = yield sqs.getQueueUrl({
+        }
+        catch (err) {
+            if (err.name === "AWS.SimpleQueueService.NonExistentQueue") {
+                await sqs.createQueue({
+                    QueueName: "webda-test"
+                });
+                this.info = await sqs.getQueueUrl({
                     QueueName: "webda-test",
                     QueueOwnerAWSAccountId: "000000000000"
                 });
             }
-            catch (err) {
-                if (err.name === "AWS.SimpleQueueService.NonExistentQueue") {
-                    yield sqs.createQueue({
-                        QueueName: "webda-test"
-                    });
-                    this.info = yield sqs.getQueueUrl({
-                        QueueName: "webda-test",
-                        QueueOwnerAWSAccountId: "000000000000"
-                    });
-                }
-            }
-            try {
-                this.info = yield sqs.getQueueUrl({
+        }
+        try {
+            this.info = await sqs.getQueueUrl({
+                QueueName: "webda-test2.fifo",
+                QueueOwnerAWSAccountId: "000000000000"
+            });
+        }
+        catch (err) {
+            if (err.name === "AWS.SimpleQueueService.NonExistentQueue") {
+                await sqs.createQueue({
+                    QueueName: "webda-test2.fifo",
+                    Attributes: {
+                        FifoQueue: "true"
+                    }
+                });
+                this.info = await sqs.getQueueUrl({
                     QueueName: "webda-test2.fifo",
                     QueueOwnerAWSAccountId: "000000000000"
                 });
             }
-            catch (err) {
-                if (err.name === "AWS.SimpleQueueService.NonExistentQueue") {
-                    yield sqs.createQueue({
-                        QueueName: "webda-test2.fifo",
-                        Attributes: {
-                            FifoQueue: "true"
-                        }
-                    });
-                    this.info = yield sqs.getQueueUrl({
-                        QueueName: "webda-test2.fifo",
-                        QueueOwnerAWSAccountId: "000000000000"
-                    });
-                }
-            }
-        });
+        }
     }
-    basic() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let queue = this.webda.getService("sqsqueue");
-            queue.getParameters().queue = "http://localhost:4566/000000000000/webda-test";
-            yield queue.__clean();
-            // Update timeout to 80000ms as Purge can only be sent once every 60s
-            yield this.simple(queue, true);
-            queue.getParameters().CloudFormationSkip = true;
-            assert.deepStrictEqual(queue.getCloudFormation(null), {});
-        });
+    async basic() {
+        let queue = this.webda.getService("sqsqueue");
+        queue.getParameters().queue = "http://localhost:4566/000000000000/webda-test";
+        await queue.__clean();
+        // Update timeout to 80000ms as Purge can only be sent once every 60s
+        await this.simple(queue, true);
+        queue.getParameters().CloudFormationSkip = true;
+        assert.deepStrictEqual(queue.getCloudFormation(null), {});
     }
-    fifo() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let queue = this.webda.getService("sqsqueue");
-            queue.getParameters().queue = "http://localhost:4566/000000000000/webda-test2.fifo";
-            queue.getParameters().MessageGroupId = "myGroup";
-            yield queue.sendMessage({});
-        });
+    async fifo() {
+        let queue = this.webda.getService("sqsqueue");
+        queue.getParameters().queue = "http://localhost:4566/000000000000/webda-test2.fifo";
+        queue.getParameters().MessageGroupId = "myGroup";
+        await queue.sendMessage({});
     }
     ARN() {
         let queue = this.webda.getService("sqsqueue");
@@ -152,55 +104,53 @@ let SQSQueueTest = class SQSQueueTest extends queue_spec_1.QueueTest {
         }
         assert.strictEqual(error, true);
     }
-    purgeQueueError() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let queue = this.webda.getService("sqsqueue");
-            let mock = (0, aws_sdk_client_mock_1.mockClient)(client_sqs_1.SQS)
-                .on(client_sqs_1.PurgeQueueCommand)
-                .callsFake(() => __awaiter(this, void 0, void 0, function* () {
-                let error = new Error("AWS.SimpleQueueService.PurgeQueueInProgress");
-                error.name = "AWS.SimpleQueueService.PurgeQueueInProgress";
-                error.retryDelay = 1;
-                throw error;
-            }));
-            yield assert.rejects(() => queue.__clean(), /AWS.SimpleQueueService.PurgeQueueInProgress/);
-            mock.restore();
-            mock = (0, aws_sdk_client_mock_1.mockClient)(client_sqs_1.SQS)
-                .on(client_sqs_1.PurgeQueueCommand)
-                .callsFake(() => __awaiter(this, void 0, void 0, function* () {
-                throw new Error("Other");
-            }));
-            yield assert.rejects(() => queue.__clean(), /Other/);
-            mock.restore();
+    async purgeQueueError() {
+        let queue = this.webda.getService("sqsqueue");
+        let mock = mockClient(SQS)
+            .on(PurgeQueueCommand)
+            .callsFake(async () => {
+            let error = new Error("AWS.SimpleQueueService.PurgeQueueInProgress");
+            error.name = "AWS.SimpleQueueService.PurgeQueueInProgress";
+            error.retryDelay = 1;
+            throw error;
+        });
+        await assert.rejects(() => queue.__clean(), /AWS.SimpleQueueService.PurgeQueueInProgress/);
+        mock.restore();
+        mock = mockClient(SQS)
+            .on(PurgeQueueCommand)
+            .callsFake(async () => {
+            throw new Error("Other");
         });
+        await assert.rejects(() => queue.__clean(), /Other/);
+        mock.restore();
     }
     getMaxConsumers() {
-        let queue = new sqsqueue_1.SQSQueue(this.webda, "plop", { maxConsumers: 30 });
+        let queue = new SQSQueue(this.webda, "plop", { maxConsumers: 30 });
         assert.strictEqual(queue.getMaxConsumers(), 3);
         queue.getParameters().maxConsumers = 3;
         assert.strictEqual(queue.getMaxConsumers(), 1);
     }
 };
 __decorate([
-    mocha_1.test,
-    (0, mocha_1.timeout)(80000)
+    test,
+    timeout(80000)
 ], SQSQueueTest.prototype, "basic", null);
 __decorate([
-    mocha_1.test
+    test
 ], SQSQueueTest.prototype, "fifo", null);
 __decorate([
-    mocha_1.test
+    test
 ], SQSQueueTest.prototype, "ARN", null);
 __decorate([
-    mocha_1.test
+    test
 ], SQSQueueTest.prototype, "getQueueInfos", null);
 __decorate([
-    mocha_1.test
+    test
 ], SQSQueueTest.prototype, "purgeQueueError", null);
 __decorate([
-    mocha_1.test
+    test
 ], SQSQueueTest.prototype, "getMaxConsumers", null);
 SQSQueueTest = __decorate([
-    mocha_1.suite
+    suite
 ], SQSQueueTest);
 //# sourceMappingURL=sqsqueue.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"sqsqueue.spec.js","sourceRoot":"","sources":["../../src/services/sqsqueue.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sqsqueue.spec.js","sourceRoot":"","sources":["../../src/services/sqsqueue.spec.ts"],"names":[],"mappings":"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"}

package/lib/shell.js

@@ -1,41 +1,23 @@
-"use strict";
-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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.yargs = exports.ShellCommand = exports.AWSShell = void 0;
-const cloudformation_1 = __importDefault(require("./deployers/cloudformation"));
-const dynamodb_1 = require("./services/dynamodb");
-const route53_1 = require("./services/route53");
-class AWSShell {
-    static shellCommand(Console, args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let command = args._.shift();
-            switch (command) {
-                case "init":
-                    return cloudformation_1.default.init(Console);
-                case "route53":
-                    return route53_1.Route53Service.shell(Console, args);
-                case "copyTable":
-                    dynamodb_1.DynamoStore.copyTable(Console.app.getWorkerOutput(), args.sourceTable, args.targetTable);
-                    return 0;
-                default:
-                    Console.logger.log("ERROR", `Unknown command ${command}`);
-                    return 1;
-            }
-        });
+import CloudFormationDeployer from "./deployers/cloudformation.js";
+import { DynamoStore } from "./services/dynamodb.js";
+import { Route53Service } from "./services/route53.js";
+export class AWSShell {
+    static async shellCommand(Console, args) {
+        let command = args._.shift();
+        switch (command) {
+            case "init":
+                return CloudFormationDeployer.init(Console);
+            case "route53":
+                return Route53Service.shell(Console, args);
+            case "copyTable":
+                DynamoStore.copyTable(Console.app.getWorkerOutput(), args.sourceTable, args.targetTable);
+                return 0;
+            default:
+                Console.logger.log("ERROR", `Unknown command ${command}`);
+                return 1;
+        }
     }
 }
-exports.AWSShell = AWSShell;
 /**
  * Create the command line parser
  *
@@ -52,7 +34,6 @@ function yargs(y) {
     })
         .command("copyTable <sourceTable> <targetTable>", "Import or export DNS");
 }
-exports.yargs = yargs;
 const ShellCommand = AWSShell.shellCommand;
-exports.ShellCommand = ShellCommand;
+export { ShellCommand, yargs };
 //# sourceMappingURL=shell.js.map

package/lib/shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell.js","sourceRoot":"","sources":["../src/shell.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gFAAgE;AAChE,kDAAkD;AAClD,gDAAoD;AAEpD,MAAa,QAAQ;IACnB,MAAM,CAAO,YAAY,CAAC,OAAO,EAAE,IAAI;;YACrC,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YAC7B,QAAQ,OAAO,EAAE;gBACf,KAAK,MAAM;oBACT,OAAO,wBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC9C,KAAK,SAAS;oBACZ,OAAO,wBAAc,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC7C,KAAK,WAAW;oBACd,sBAAW,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;oBACzF,OAAO,CAAC,CAAC;gBACX;oBACE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,OAAO,EAAE,CAAC,CAAC;oBAC1D,OAAO,CAAC,CAAC;aACZ;QACH,CAAC;KAAA;CACF;AAhBD,4BAgBC;AAED;;;;;GAKG;AACH,SAAS,KAAK,CAAC,CAAC;IACd,OAAO,CAAC;SACL,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC;SACpC,OAAO,CAAC,sBAAsB,EAAE,sBAAsB,EAAE,EAAE,CAAC,EAAE;QAC5D,OAAO,EAAE;aACN,OAAO,CAAC,wBAAwB,EAAE,wCAAwC,CAAC;aAC3E,OAAO,CAAC,eAAe,EAAE,6CAA6C,CAAC,CAAC;IAC7E,CAAC,CAAC;SACD,OAAO,CAAC,uCAAuC,EAAE,sBAAsB,CAAC,CAAC;AAC9E,CAAC;AAIsB,sBAAK;AAF5B,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;AAElC,oCAAY"}
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["../src/shell.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,OAAO,QAAQ;IACnB,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI;QACrC,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC7B,QAAQ,OAAO,EAAE;YACf,KAAK,MAAM;gBACT,OAAO,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC9C,KAAK,SAAS;gBACZ,OAAO,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC7C,KAAK,WAAW;gBACd,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;gBACzF,OAAO,CAAC,CAAC;YACX;gBACE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,OAAO,EAAE,CAAC,CAAC;gBAC1D,OAAO,CAAC,CAAC;SACZ;IACH,CAAC;CACF;AAED;;;;;GAKG;AACH,SAAS,KAAK,CAAC,CAAC;IACd,OAAO,CAAC;SACL,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC;SACpC,OAAO,CAAC,sBAAsB,EAAE,sBAAsB,EAAE,EAAE,CAAC,EAAE;QAC5D,OAAO,EAAE;aACN,OAAO,CAAC,wBAAwB,EAAE,wCAAwC,CAAC;aAC3E,OAAO,CAAC,eAAe,EAAE,6CAA6C,CAAC,CAAC;IAC7E,CAAC,CAAC;SACD,OAAO,CAAC,uCAAuC,EAAE,sBAAsB,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/aws",
-  "version": "2.0.0-beta.3",
+  "version": "2.1.0",
   "description": "Webda AWS Services implementation",
   "main": "lib/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "pretest": "webda 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",
@@ -45,15 +45,14 @@
     "@aws-sdk/client-sts": "^3.58.0",
     "@aws-sdk/lib-dynamodb": "^3.58.0",
     "@aws-sdk/s3-request-presigner": "^3.58.0",
-    "@webda/core": "^2.0.0-beta.3",
+    "@webda/core": "^2.1.0",
     "bluebird": "^3.7.2",
     "glob": "^8.0.1",
     "iam-policy-optimizer": "^1.1.2",
     "uuid": "^8.3.2",
     "yaml": "^2.0.0"
   },
-  "nyc": {
-    "extends": "@istanbuljs/nyc-config-typescript",
+  "c8": {
     "report-dir": "./reports",
     "reporter": [
       "html",
@@ -72,11 +71,15 @@
   "devDependencies": {
     "@testdeck/mocha": "^0.2.0",
     "@types/aws-lambda": "^8.10.97",
-    "@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.1.0",
+    "@webda/shell": "^2.1.0",
     "aws-sdk-client-mock": "^0.6.2",
     "sinon": "^14.0.0"
   },
-  "gitHead": "f95827566d42d22c32aed524b74d0446fff66ed4"
+  "type": "module",
+  "engines": {
+    "node": ">=14.6.0"
+  },
+  "gitHead": "d9e2440a4001c1405132260d221c7ad74fe06bc9"
 }

package/webda.module.json

@@ -10,11 +10,11 @@
   "beans": {},
   "models": {},
   "deployers": {
-    "webda/cloudformationdeployer": "lib/deployers/cloudformation:default",
-    "webda/lambdapackager": "lib/deployers/lambdapackager:default"
+    "webdaawsdeployer/cloudformation": "lib/deployers/cloudformation:default",
+    "webdaawsdeployer/lambdapackager": "lib/deployers/lambdapackager:default"
   },
   "schemas": {
-    "webda/lambdapackager": {
+    "webdaawsdeployer/lambdapackager": {
       "type": "object",
       "properties": {
         "name": {
@@ -25,9 +25,9 @@
         }
       },
       "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "CloudFormationDeployer"
+      "title": "CloudFormation"
     },
-    "webda/cloudformationdeployer": {
+    "webdaawsdeployer/cloudformation": {
       "type": "object",
       "properties": {
         "name": {
@@ -38,7 +38,7 @@
         }
       },
       "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "CloudFormationDeployer"
+      "title": "CloudFormation"
     },
     "webda/cloudwatchlogger": {
       "type": "object",
@@ -46,6 +46,14 @@
         "type": {
           "type": "string",
           "description": "Type of the service"
+        },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [
@@ -62,6 +70,10 @@
           "type": "string",
           "description": "Type of the service"
         },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
         "model": {
           "type": "string",
           "description": "Webda model to use within the Store",
@@ -84,6 +96,10 @@
           "type": "number",
           "description": "Slow query threshold",
           "default": 30000
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [
@@ -150,6 +166,10 @@
           "type": "string",
           "description": "Type of the service"
         },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
         "actions": {
           "type": "array",
           "items": {
@@ -157,6 +177,10 @@
           },
           "description": "Actions managed by the runner",
           "default": []
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [
@@ -172,6 +196,10 @@
           "type": "string",
           "description": "Type of the service"
         },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
         "map": {
           "type": "object",
           "additionalProperties": {
@@ -219,6 +247,10 @@
         },
         "prefix": {
           "type": "string"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [
@@ -235,6 +267,14 @@
         "type": {
           "type": "string",
           "description": "Type of the service"
+        },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [
@@ -251,6 +291,10 @@
           "type": "string",
           "description": "Type of the service"
         },
+        "url": {
+          "type": "string",
+          "description": "URL on which to serve the content"
+        },
         "workerDelayer": {
           "type": "object",
           "properties": {
@@ -278,6 +322,10 @@
           "type": "number",
           "description": "Max number of queue consumers Queue will auto increase to this max number if queue is loaded and it will decrease to just one consumer if no messages are available",
           "default": 10
+        },
+        "openapi": {
+          "type": "object",
+          "additionalProperties": true
         }
       },
       "required": [