@webda/aws 1.6.0-beta.3 → 2.0.0-beta.2

package/lib/services/lambdaserver.spec.js

@@ -0,0 +1,449 @@
+"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 mocha_1 = require("@testdeck/mocha");
+const core_1 = require("@webda/core");
+const test_1 = require("@webda/core/lib/test");
+const assert = __importStar(require("assert"));
+const fs = __importStar(require("fs"));
+const index_spec_1 = require("../index.spec");
+const lambdaserver_1 = require("./lambdaserver");
+let ExceptionExecutor = class ExceptionExecutor extends core_1.Service {
+    initRoutes() {
+        this.addRoute("/broken/{type}", ["GET"], this._brokenRoute);
+        this.addRoute("/route/string", ["GET"], this.onString);
+    }
+    _brokenRoute(ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (ctx.parameters.type === "401") {
+                throw 401;
+            }
+            else if (ctx.parameters.type === "Error") {
+                throw new Error();
+            }
+        });
+    }
+    onString(ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            ctx.write(`CodeCoverage${ctx.getParameters().test || ""}`);
+        });
+    }
+    onParamString(ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            ctx.write(`CodeCoverage${ctx.getParameters().uuid}${ctx.getParameters().test || ""}`);
+        });
+    }
+};
+__decorate([
+    (0, core_1.Route)("/route/broken/{type}")
+], ExceptionExecutor.prototype, "_brokenRoute", null);
+__decorate([
+    (0, core_1.Route)("/route/string{?test}")
+], ExceptionExecutor.prototype, "onString", null);
+__decorate([
+    (0, core_1.Route)("/route/param/{uuid}{?test}")
+], ExceptionExecutor.prototype, "onParamString", null);
+ExceptionExecutor = __decorate([
+    core_1.Bean
+], ExceptionExecutor);
+let LambdaHandlerTest = class LambdaHandlerTest extends index_spec_1.WebdaAwsTest {
+    constructor() {
+        super(...arguments);
+        this.context = {};
+        this.badCheck = false;
+    }
+    before() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield (0, index_spec_1.checkLocalStack)();
+            let app = new test_1.TestApplication(this.getTestConfiguration());
+            app.addService("test/awsevents", (yield Promise.resolve().then(() => __importStar(require("../../test/moddas/awsevents.js")))).default);
+            yield app.load();
+            this.webda = this.handler = new lambdaserver_1.LambdaServer(app);
+            this.webda.initStatics();
+            this.webda.registerRequestFilter({
+                checkRequest: () => __awaiter(this, void 0, void 0, function* () { return true; })
+            });
+            this.evt = {
+                httpMethod: "GET",
+                headers: {
+                    Cookie: "webda=plop;",
+                    "X-Forwarded-Port": "443",
+                    "X-Forwarded-Proto": "https"
+                },
+                requestContext: {
+                    identity: {}
+                },
+                path: "/prefix/route/string",
+                resource: "/route/string",
+                body: JSON.stringify({})
+            };
+            this.debugMailer = this.handler.getService("DebugMailer");
+        });
+    }
+    checkRequestFalse() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.handler.init();
+            // @ts-ignore
+            this.handler._requestFilters = [];
+            this.ensureGoodCSRF();
+            this.evt.queryStringParameters = { test: "Plop" };
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 403);
+        });
+    }
+    handleRequestCustomLaunch() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.handler.handleRequest({
+                command: "launch",
+                service: "DebugMailer",
+                method: "send",
+                args: ["test"]
+            }, undefined);
+            assert.strictEqual(this.debugMailer.sent[0], "test");
+        });
+    }
+    handleRequestCustomLaunchBadService() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.handler.handleRequest({
+                command: "launch",
+                service: "DebugMailers",
+                method: "send",
+                args: ["test"]
+            }, undefined);
+            assert.strictEqual(this.debugMailer.sent.length, 0);
+        });
+    }
+    handleRequestCustomLaunchBadMethod() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.handler.handleRequest({
+                command: "launch",
+                service: "DebugMailer",
+                method: "sends"
+            }, undefined);
+            assert.strictEqual(this.debugMailer.sent.length, 0);
+        });
+    }
+    handleRequestKnownRoute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.body, "CodeCoverage");
+        });
+    }
+    handleRequestIdHeader() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.handler.getConfiguration().parameters.lambdaRequestHeader = "x-webda-request-id";
+            let res = yield this.handler.handleRequest(this.evt, Object.assign(Object.assign({}, this.context), { awsRequestId: "toto" }));
+            assert.strictEqual(res.body, "CodeCoverage");
+            assert.strictEqual(res.headers["x-webda-request-id"], "toto");
+        });
+    }
+    handleRequestKnownRouteWithParamAndQuery() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.queryStringParameters = { test: "Plop" };
+            this.evt.path = "/prefix/route/param/myid";
+            this.evt.resource = "/route/param/{uuid}";
+            this.evt.pathParameters = { uuid: "myid" };
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.body, "CodeCoveragemyidPlop");
+        });
+    }
+    handleRequestKnownRouteWithParam() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.path = "/prefix/route/param/myid";
+            this.evt.resource = "/route/param/{uuid}";
+            this.evt.pathParameters = { uuid: "myid" };
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.body, "CodeCoveragemyid");
+        });
+    }
+    handleRequestKnownRouteWithQuery() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.queryStringParameters = { test: "Plop" };
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.body, "CodeCoveragePlop");
+        });
+    }
+    handleRequestUnknownRoute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.path = "/route/unknown";
+            this.evt.resource = "/route/unknown";
+            delete this.evt.headers.Cookie;
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 404);
+        });
+    }
+    handleRequestThrow401() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.path = "/route/broken/401";
+            this.evt.resource = "/route/broken/401";
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 401);
+        });
+    }
+    handleRequestThrowError() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.path = "/route/broken/Error";
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 500);
+        });
+    }
+    handleRequestOPTIONS() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.httpMethod = "OPTIONS";
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 204);
+            assert.strictEqual(res.headers["Access-Control-Allow-Methods"], "GET,OPTIONS");
+        });
+    }
+    handleRequestOPTIONSWith404() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.path = "/route/unknown";
+            this.evt.httpMethod = "OPTIONS";
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 404);
+        });
+    }
+    cov() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.ensureGoodCSRF();
+            this.evt.headers["X-Forwarded-Port"] = "wew";
+            this.evt.headers["Content-Type"] = "text/plain";
+            this.evt.body = "{wew''";
+            // Should fallback on port 443
+            yield this.handler.handleRequest(this.evt, this.context);
+        });
+    }
+    handleRequestQueryParams() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // TODO Check parameter retrieval
+            this.evt.queryStringParameters = {
+                test: "plop"
+            };
+            this.evt.headers.Origin = "https://test.webda.io";
+            this.evt.headers.Host = "test.webda.io";
+            yield this.handler.handleRequest(this.evt, this.context);
+        });
+    }
+    handleRequestOrigin() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.evt.headers.Origin = "https://test.webda.io";
+            this.evt.headers.Host = "test.webda.io";
+            let wait = false;
+            this.handler.on("Webda.Result", () => {
+                return new Promise((resolve, reject) => {
+                    // Delay 100ms to ensure it waited
+                    setTimeout(() => {
+                        wait = true;
+                        resolve();
+                    }, 100);
+                });
+            });
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.headers["Access-Control-Allow-Origin"], this.evt.headers.Origin);
+            assert.strictEqual(wait, true);
+        });
+    }
+    handleRequestOriginCSRF() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.evt.headers.Origin = "https://test3.webda.io";
+            this.evt.headers.Host = "test3.webda.io";
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 401);
+        });
+    }
+    handleRequestRefererCSRF() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.evt.headers.Referer = "https://test3.webda.io";
+            this.evt.headers.Host = "test3.webda.io";
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 401);
+        });
+    }
+    handleRequestRefererGoodCORS() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.evt.headers.Referer = "https://test.webda.io";
+            this.evt.headers.Host = "test.webda.io";
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.headers["Access-Control-Allow-Origin"], this.evt.headers.Referer);
+        });
+    }
+    handleRequestHardStopCheckRequest() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.evt.headers.Referer = "https://test.webda.io";
+            this.evt.headers.Host = "test.webda.io";
+            this.handler.registerRequestFilter(this);
+            let res = yield this.handler.handleRequest(this.evt, this.context);
+            assert.strictEqual(res.statusCode, 410);
+            this.badCheck = true;
+            yield assert.rejects(() => this.handler.handleRequest(this.evt, this.context), /Unknown/);
+        });
+    }
+    checkRequest() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.badCheck) {
+                throw new Error("Unknown");
+            }
+            throw 410;
+        });
+    }
+    ensureGoodCSRF() {
+        this.evt.headers.Referer = "https://test.webda.io";
+        this.evt.headers.Host = "test.webda.io";
+    }
+    awsEvents() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let service = this.handler.getService("awsEvents");
+            let files = fs.readdirSync(__dirname + "/../../test/aws-events");
+            for (let f in files) {
+                let file = files[f];
+                let event = JSON.parse(fs.readFileSync(__dirname + "/../../test/aws-events/" + file).toString());
+                yield this.handler.handleRequest(event, this.context);
+                if (file === "api-gateway-aws-proxy.json") {
+                    assert.strictEqual(service.getEvents().length, 0, "API Gateway should go throught the normal request handling");
+                }
+                else {
+                    assert.notStrictEqual(service.getEvents().length, 0, "Should have get some events:" + JSON.stringify(event));
+                }
+            }
+        });
+    }
+    /**
+     * Wildcard path from API Gateway were missing the prefix
+     *
+     * @see https://github.com/loopingz/webda.io/issues/193
+     */
+    computePrefix() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let httpContext = new core_1.HttpContext("test.webda.io", "GET", "/prefix/static1234/test/subfolder/index.html");
+            this.handler.computePrefix({
+                path: "/prefix/static1234/test/subfolder/index.html",
+                resource: "/static1234/{path+}",
+                pathParameters: {
+                    path: "test/subfolder/index.html"
+                }
+            }, httpContext);
+            assert.strictEqual(httpContext.getRelativeUri(), "/static1234/test/subfolder/index.html");
+            assert.strictEqual(httpContext.prefix, "/prefix");
+        });
+    }
+};
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "checkRequestFalse", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestCustomLaunch", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestCustomLaunchBadService", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestCustomLaunchBadMethod", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestKnownRoute", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestIdHeader", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestKnownRouteWithParamAndQuery", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestKnownRouteWithParam", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestKnownRouteWithQuery", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestUnknownRoute", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestThrow401", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestThrowError", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestOPTIONS", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestOPTIONSWith404", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "cov", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestQueryParams", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestOrigin", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestOriginCSRF", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestRefererCSRF", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestRefererGoodCORS", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "handleRequestHardStopCheckRequest", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "awsEvents", null);
+__decorate([
+    mocha_1.test
+], LambdaHandlerTest.prototype, "computePrefix", null);
+LambdaHandlerTest = __decorate([
+    mocha_1.suite
+], LambdaHandlerTest);
+//# sourceMappingURL=lambdaserver.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"lambdaserver.spec.js","sourceRoot":"","sources":["../../src/services/lambdaserver.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,sCAAgE;AAChE,+CAAuD;AACvD,+CAAiC;AACjC,uCAAyB;AACzB,8CAA8D;AAC9D,iDAA8C;AAG9C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,cAAO;IACrC,UAAU;QACR,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzD,CAAC;IAGK,YAAY,CAAC,GAAG;;YACpB,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE;gBACjC,MAAM,GAAG,CAAC;aACX;iBAAM,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC1C,MAAM,IAAI,KAAK,EAAE,CAAC;aACnB;QACH,CAAC;KAAA;IAGK,QAAQ,CAAC,GAAG;;YAChB,GAAG,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7D,CAAC;KAAA;IAGK,aAAa,CAAC,GAAG;;YACrB,GAAG,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QACxF,CAAC;KAAA;CACF,CAAA;AAjBC;IADC,IAAA,YAAK,EAAC,sBAAsB,CAAC;qDAO7B;AAGD;IADC,IAAA,YAAK,EAAC,sBAAsB,CAAC;iDAG7B;AAGD;IADC,IAAA,YAAK,EAAC,4BAA4B,CAAC;sDAGnC;AAvBG,iBAAiB;IADtB,WAAI;GACC,iBAAiB,CAwBtB;AAGD,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,yBAAY;IAA5C;;QAIE,YAAO,GAAQ,EAAE,CAAC;QAClB,aAAQ,GAAY,KAAK,CAAC;IAuS5B,CAAC;IArSO,MAAM;;YACV,MAAM,IAAA,4BAAe,GAAE,CAAC;YACxB,IAAI,GAAG,GAAG,IAAI,sBAAe,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;YAC3D,GAAG,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,wDAAa,gCAAgC,GAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC3F,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,2BAAY,CAAC,GAAG,CAAC,CAAC;YAClD,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC;gBAC/B,YAAY,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAA,GAAA;aAC/B,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,GAAG;gBACT,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE;oBACP,MAAM,EAAE,aAAa;oBACrB,kBAAkB,EAAE,KAAK;oBACzB,mBAAmB,EAAE,OAAO;iBAC7B;gBACD,cAAc,EAAE;oBACd,QAAQ,EAAE,EAAE;iBACb;gBACD,IAAI,EAAE,sBAAsB;gBAC5B,QAAQ,EAAE,eAAe;gBACzB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;aACzB,CAAC;YACF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC5D,CAAC;KAAA;IAGK,iBAAiB;;YACrB,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAC1B,aAAa;YACb,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,EAAE,CAAC;YAClC,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,qBAAqB,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAClD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;KAAA;IAGK,yBAAyB;;YAC7B,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAC9B;gBACE,OAAO,EAAE,QAAQ;gBACjB,OAAO,EAAE,aAAa;gBACtB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,CAAC,MAAM,CAAC;aACf,EACD,SAAS,CACV,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC;KAAA;IAGK,mCAAmC;;YACvC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAC9B;gBACE,OAAO,EAAE,QAAQ;gBACjB,OAAO,EAAE,cAAc;gBACvB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,CAAC,MAAM,CAAC;aACf,EACD,SAAS,CACV,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC;KAAA;IAGK,kCAAkC;;YACtC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAC9B;gBACE,OAAO,EAAE,QAAQ;gBACjB,OAAO,EAAE,aAAa;gBACtB,MAAM,EAAE,OAAO;aAChB,EACD,SAAS,CACV,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC;KAAA;IAGK,uBAAuB;;YAC3B,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC/C,CAAC;KAAA;IAGK,qBAAqB;;YACzB,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,UAAU,CAAC,mBAAmB,GAAG,oBAAoB,CAAC;YACtF,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,kCAAO,IAAI,CAAC,OAAO,KAAE,YAAY,EAAE,MAAM,IAAG,CAAC;YAChG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAC7C,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC,CAAC;QAChE,CAAC;KAAA;IAGK,wCAAwC;;YAC5C,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,qBAAqB,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAClD,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,0BAA0B,CAAC;YAC3C,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,qBAAqB,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAC3C,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;QACvD,CAAC;KAAA;IAGK,gCAAgC;;YACpC,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,0BAA0B,CAAC;YAC3C,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,qBAAqB,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAC3C,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACnD,CAAC;KAAA;IAGK,gCAAgC;;YACpC,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,qBAAqB,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAClD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACnD,CAAC;KAAA;IAGK,yBAAyB;;YAC7B,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,gBAAgB,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,gBAAgB,CAAC;YACrC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;YAC/B,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;KAAA;IAGK,qBAAqB;;YACzB,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,mBAAmB,CAAC;YACpC,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,mBAAmB,CAAC;YACxC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;KAAA;IAGK,uBAAuB;;YAC3B,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,qBAAqB,CAAC;YACtC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;KAAA;IAGK,oBAAoB;;YACxB,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,SAAS,CAAC;YAChC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACxC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,8BAA8B,CAAC,EAAE,aAAa,CAAC,CAAC;QACjF,CAAC;KAAA;IAGK,2BAA2B;;YAC/B,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,gBAAgB,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,SAAS,CAAC;YAChC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;KAAA;IAGK,GAAG;;YACP,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC;YAChD,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,QAAQ,CAAC;YACzB,8BAA8B;YAC9B,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,CAAC;KAAA;IAGK,wBAAwB;;YAC5B,iCAAiC;YACjC,IAAI,CAAC,GAAG,CAAC,qBAAqB,GAAG;gBAC/B,IAAI,EAAE,MAAM;aACb,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,uBAAuB,CAAC;YAClD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,eAAe,CAAC;YACxC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,CAAC;KAAA;IAGK,mBAAmB;;YACvB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,uBAAuB,CAAC;YAClD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,eAAe,CAAC;YACxC,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;gBACnC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC3C,kCAAkC;oBAClC,UAAU,CAAC,GAAG,EAAE;wBACd,IAAI,GAAG,IAAI,CAAC;wBACZ,OAAO,EAAE,CAAC;oBACZ,CAAC,EAAE,GAAG,CAAC,CAAC;gBACV,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,6BAA6B,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxF,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,CAAC;KAAA;IAGK,uBAAuB;;YAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,wBAAwB,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,gBAAgB,CAAC;YACzC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;KAAA;IAGK,wBAAwB;;YAC5B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,wBAAwB,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,gBAAgB,CAAC;YACzC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;KAAA;IAGK,4BAA4B;;YAChC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,uBAAuB,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,eAAe,CAAC;YACxC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,6BAA6B,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC3F,CAAC;KAAA;IAGK,iCAAiC;;YACrC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,uBAAuB,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,eAAe,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC;QAC5F,CAAC;KAAA;IAEK,YAAY;;YAChB,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;aAC5B;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;KAAA;IAED,cAAc;QACZ,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,uBAAuB,CAAC;QACnD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,eAAe,CAAC;IAC1C,CAAC;IAGK,SAAS;;YACb,IAAI,OAAO,GAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YACxD,IAAI,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,SAAS,GAAG,wBAAwB,CAAC,CAAC;YACjE,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,GAAG,yBAAyB,GAAG,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACjG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACtD,IAAI,IAAI,KAAK,4BAA4B,EAAE;oBACzC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,4DAA4D,CAAC,CAAC;iBACjH;qBAAM;oBACL,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,8BAA8B,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC9G;aACF;QACH,CAAC;KAAA;IAED;;;;OAIG;IAEG,aAAa;;YACjB,IAAI,WAAW,GAAG,IAAI,kBAAW,CAAC,eAAe,EAAE,KAAK,EAAE,8CAA8C,CAAC,CAAC;YAC1G,IAAI,CAAC,OAAO,CAAC,aAAa,CACxB;gBACE,IAAI,EAAE,8CAA8C;gBACpD,QAAQ,EAAE,qBAAqB;gBAC/B,cAAc,EAAE;oBACd,IAAI,EAAE,2BAA2B;iBAClC;aACF,EACD,WAAW,CACZ,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,cAAc,EAAE,EAAE,uCAAuC,CAAC,CAAC;YAC1F,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACpD,CAAC;KAAA;CACF,CAAA;AAzQC;IADC,YAAI;0DASJ;AAGD;IADC,YAAI;kEAYJ;AAGD;IADC,YAAI;4EAYJ;AAGD;IADC,YAAI;2EAWJ;AAGD;IADC,YAAI;gEAKJ;AAGD;IADC,YAAI;8DAOJ;AAGD;IADC,YAAI;iFASJ;AAGD;IADC,YAAI;yEAQJ;AAGD;IADC,YAAI;yEAMJ;AAGD;IADC,YAAI;kEAQJ;AAGD;IADC,YAAI;8DAOJ;AAGD;IADC,YAAI;gEAMJ;AAGD;IADC,YAAI;6DAOJ;AAGD;IADC,YAAI;oEAOJ;AAGD;IADC,YAAI;4CAQJ;AAGD;IADC,YAAI;iEASJ;AAGD;IADC,YAAI;4DAiBJ;AAGD;IADC,YAAI;gEAMJ;AAGD;IADC,YAAI;iEAMJ;AAGD;IADC,YAAI;qEAMJ;AAGD;IADC,YAAI;0EASJ;AAeD;IADC,YAAI;kDAcJ;AAQD;IADC,YAAI;sDAeJ;AA3SG,iBAAiB;IADtB,aAAK;GACA,iBAAiB,CA4StB"}

package/lib/services/route53.d.ts

@@ -1,12 +1,12 @@
+import { HostedZone } from "@aws-sdk/client-route-53";
 import { Service } from "@webda/core";
-import * as AWS from "aws-sdk";
 export declare class Route53Service extends Service {
     /**
      * Get the closest zone to the domain
      *
      * @param domain to get zone for
      */
-    static getZoneForDomainName(domain: any): Promise<AWS.Route53.HostedZone>;
+    static getZoneForDomainName(domain: any): Promise<HostedZone>;
     static completeDomain(domain: string): string;
     /**
      * Create DNS entry
@@ -16,7 +16,7 @@ export declare class Route53Service extends Service {
      * @param value the value of the record
      * @param targetZone
      */
-    static createDNSEntry(domain: string, type: string, value: string, targetZone?: AWS.Route53.HostedZone, Comment?: string): Promise<void>;
+    static createDNSEntry(domain: string, type: string, value: string, targetZone?: HostedZone, Comment?: string): Promise<void>;
     /**
      * Return all entries of a zone in AWS
      *
@@ -27,7 +27,7 @@ export declare class Route53Service extends Service {
      * Import all records to Route53
      * @param file
      */
-    static import(file: string, importEntriesOnly: boolean): Promise<void>;
+    static import(file: string, Console: any): Promise<void>;
     /**
      * Export all records from Route53 into a file
      *

package/lib/services/route53.js

@@ -1,10 +1,4 @@
 "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) {
@@ -16,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Route53Service = void 0;
+const client_route_53_1 = require("@aws-sdk/client-route-53");
 const core_1 = require("@webda/core");
-const AWS = require("aws-sdk");
 class Route53Service extends core_1.Service {
     /**
      * Get the closest zone to the domain
@@ -29,12 +23,12 @@ class Route53Service extends core_1.Service {
             domain = this.completeDomain(domain);
             let targetZone;
             // Find the right zone
-            let r53 = new AWS.Route53();
+            let r53 = new client_route_53_1.Route53({});
             let res;
             let params = {};
             // Identify the right zone first
             do {
-                res = yield r53.listHostedZones(params).promise();
+                res = yield r53.listHostedZones(params);
                 for (let i in res.HostedZones) {
                     let zone = res.HostedZones[i];
                     if (domain.endsWith(zone.Name)) {
@@ -66,7 +60,7 @@ class Route53Service extends core_1.Service {
      */
     static createDNSEntry(domain, type, value, targetZone = undefined, Comment = "@webda/aws-created") {
         return __awaiter(this, void 0, void 0, function* () {
-            let r53 = new AWS.Route53();
+            let r53 = new client_route_53_1.Route53({});
             domain = this.completeDomain(domain);
             if (!targetZone) {
                 targetZone = yield this.getZoneForDomainName(domain);
@@ -74,8 +68,7 @@ class Route53Service extends core_1.Service {
             if (!targetZone) {
                 throw Error(`Domain '${domain}' is not handled on AWS`);
             }
-            yield r53
-                .changeResourceRecordSets({
+            yield r53.changeResourceRecordSets({
                 HostedZoneId: targetZone.Id,
                 ChangeBatch: {
                     Changes: [
@@ -95,8 +88,7 @@ class Route53Service extends core_1.Service {
                     ],
                     Comment
                 }
-            })
-                .promise();
+            });
         });
     }
     /**
@@ -106,7 +98,7 @@ class Route53Service extends core_1.Service {
      */
     static getEntries(domain) {
         return __awaiter(this, void 0, void 0, function* () {
-            let r53 = new AWS.Route53();
+            let r53 = new client_route_53_1.Route53({});
             const zone = yield Route53Service.getZoneForDomainName(domain);
             if (!zone) {
                 throw new Error(`Domain '${domain}' is not handled on AWS`);
@@ -114,12 +106,10 @@ class Route53Service extends core_1.Service {
             const result = [];
             let res;
             do {
-                res = yield r53
-                    .listResourceRecordSets({
+                res = yield r53.listResourceRecordSets({
                     HostedZoneId: zone.Id,
                     StartRecordIdentifier: res ? res.NextRecordIdentifier : undefined
-                })
-                    .promise();
+                });
                 result.push(...res.ResourceRecordSets);
             } while (res.IsTruncated);
             return result;
@@ -129,33 +119,36 @@ class Route53Service extends core_1.Service {
      * Import all records to Route53
      * @param file
      */
-    static import(file, importEntriesOnly) {
+    static import(file, Console) {
         return __awaiter(this, void 0, void 0, function* () {
             let data = core_1.JSONUtils.loadFile(file);
             const targetZone = yield this.getZoneForDomainName(data.domain);
-            const r53 = new AWS.Route53();
+            const r53 = new client_route_53_1.Route53({});
             if (!targetZone) {
                 throw Error(`Domain '${data.domain}' is not handled on AWS`);
             }
-            yield r53
-                .changeResourceRecordSets({
-                HostedZoneId: targetZone.Id,
-                ChangeBatch: {
-                    Changes: data.entries
-                        .filter(r => !(r.Type === "NS" && r.Name === targetZone.Name))
-                        .map(r => {
-                        if (!r.ResourceRecords.length) {
-                            delete r.ResourceRecords;
-                        }
-                        return r;
-                    })
-                        .map(r => ({
-                        Action: "UPSERT",
-                        ResourceRecordSet: r
-                    }))
-                }
-            })
-                .promise();
+            try {
+                yield r53.changeResourceRecordSets({
+                    HostedZoneId: targetZone.Id,
+                    ChangeBatch: {
+                        Changes: data.entries
+                            .filter(r => !(r.Type === "NS" && r.Name === targetZone.Name))
+                            .map(r => {
+                            if (!r.ResourceRecords.length) {
+                                delete r.ResourceRecords;
+                            }
+                            return r;
+                        })
+                            .map(r => ({
+                            Action: "UPSERT",
+                            ResourceRecordSet: r
+                        }))
+                    }
+                });
+            }
+            catch (err) {
+                Console.log("ERROR", err);
+            }
         });
     }
     /**
@@ -183,7 +176,7 @@ class Route53Service extends core_1.Service {
             const command = args._.shift();
             switch (command) {
                 case "import":
-                    yield this.import(args.file, false);
+                    yield this.import(args.file, Console);
                     break;
                 case "export":
                     yield this.export(args.domain, args.file);
@@ -192,8 +185,5 @@ class Route53Service extends core_1.Service {
         });
     }
 }
-__decorate([
-    (0, core_1.Cache)()
-], Route53Service, "getZoneForDomainName", null);
 exports.Route53Service = Route53Service;
 //# sourceMappingURL=route53.js.map