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

package/lib/services/cloudwatchlogger.spec.js

@@ -0,0 +1,147 @@
+"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_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
+const mocha_1 = require("@testdeck/mocha");
+const assert = __importStar(require("assert"));
+const index_spec_1 = require("../index.spec");
+let CloudWatchLoggerTest = class CloudWatchLoggerTest extends index_spec_1.WebdaAwsTest {
+    getTestConfiguration() {
+        return process.cwd() + "/test/config-cloudwatch.json";
+    }
+    before() {
+        const _super = Object.create(null, {
+            before: { get: () => super.before }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield (0, index_spec_1.checkLocalStack)();
+            let cloudwatch = new client_cloudwatch_logs_1.CloudWatchLogs({
+                credentials: index_spec_1.defaultCreds,
+                endpoint: "http://localhost:4566",
+                region: "us-east-1"
+            });
+            try {
+                yield cloudwatch.deleteLogGroup({
+                    logGroupName: "webda-test"
+                });
+            }
+            catch (err) {
+                // Skip bad delete
+            }
+            yield _super.before.call(this);
+            this.service = this.getService("CloudWatchLogger");
+            assert.notStrictEqual(this.service, undefined);
+        });
+    }
+    basic() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.webda.log("INFO", "Plop 0", "Test");
+            this.webda.log("DEBUG", "Plop 1", "Test");
+            this.webda.log("DEBUG", "Plop 2", "Test");
+            this.webda.log("DEBUG", "Plop 3", "Test");
+            this.webda.getLogger("whatever").logProgressStart("test", 100, "other");
+            this.webda.log("DEBUG", "Plop 4", "Test");
+            yield this.webda.emitSync("Webda.Result");
+            let res = yield this.service._cloudwatch.describeLogStreams({
+                logGroupName: "webda-test"
+            });
+            assert.strictEqual(res.logStreams.length, 1);
+            assert.notStrictEqual(res.logStreams[0].lastEventTimestamp, undefined);
+            this.service.getParameters().logGroupName = undefined;
+            yield assert.rejects(() => this.service.init(), /Require a log group `logGroupName` parameter/);
+        });
+    }
+    aws() {
+        assert.deepStrictEqual(this.service.getARNPolicy("plop"), {
+            Action: ["logs:*"],
+            Effect: "Allow",
+            Resource: [
+                "arn:aws:logs:us-east-1:plop:log-group:webda-test",
+                "arn:aws:logs:us-east-1:plop:log-group:webda-test:*:*"
+            ],
+            Sid: "CloudWatchLoggerCloudWatchLogger"
+        });
+        assert.deepStrictEqual(this.service.getCloudFormation(), {
+            CloudWatchLoggerLogGroup: {
+                Properties: {
+                    LogGroupName: "webda-test"
+                },
+                Type: "AWS::Logs::LogGroup"
+            }
+        });
+        this.service.getParameters().CloudFormationSkip = true;
+        assert.deepStrictEqual(this.service.getCloudFormation(), {});
+    }
+    secondRun() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Update config to use the stepper
+            this.service.getParameters().singlePush = true;
+            this.webda.log("INFO", "Plop 0", "Test");
+            this.webda.log("DEBUG", "Plop 1", "Test");
+            yield this.sleep(1000);
+            let res = yield this.service._cloudwatch.describeLogStreams({
+                logGroupName: "webda-test"
+            });
+            assert.strictEqual(res.logStreams.length, 1);
+            assert.notStrictEqual(res.logStreams[0].lastEventTimestamp, undefined);
+            this.webda.log("DEBUG", "Plop 2", "Test");
+            this.webda.log("DEBUG", "Plop 3", "Test");
+            this.webda.log("DEBUG", "Plop 4", "Test");
+            yield this.webda.emitSync("Webda.Result");
+            res = yield this.service._cloudwatch.describeLogStreams({
+                logGroupName: "webda-test"
+            });
+            assert.strictEqual(res.logStreams.length, 1);
+        });
+    }
+};
+__decorate([
+    mocha_1.test
+], CloudWatchLoggerTest.prototype, "basic", null);
+__decorate([
+    mocha_1.test
+], CloudWatchLoggerTest.prototype, "aws", null);
+__decorate([
+    mocha_1.test
+], CloudWatchLoggerTest.prototype, "secondRun", null);
+CloudWatchLoggerTest = __decorate([
+    mocha_1.suite
+], CloudWatchLoggerTest);
+//# sourceMappingURL=cloudwatchlogger.spec.js.map

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

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

package/lib/services/dynamodb.d.ts

@@ -1,15 +1,44 @@
-import { CoreModel, ModdaDefinition, Store, StoreParameters } from "@webda/core";
+import { DynamoDBDocument } from "@aws-sdk/lib-dynamodb";
+import { CoreModel, Store, StoreFindResult, StoreParameters, WebdaQL } from "@webda/core";
+import { WorkerOutput } from "@webda/workout";
 import { CloudFormationContributor } from ".";
 import { CloudFormationDeployer } from "../deployers/cloudformation";
-import * as AWS from "aws-sdk";
-import { WorkerOutput } from "@webda/workout";
-export declare class DynamoStoreParameters extends StoreParameters {
+declare const DynamoStoreParameters_base: {
+    new (...args: any[]): {
+        endpoint?: string;
+        credentials?: {
+            accessKeyId: string;
+            secretAccessKey: string;
+            sessionToken?: string;
+        };
+        region?: string;
+        type: string;
+    };
+} & typeof StoreParameters;
+/**
+ * Define DynamoDB parameters
+ */
+export declare class DynamoStoreParameters extends DynamoStoreParameters_base {
+    /**
+     * Table name
+     */
     table: string;
-    endpoint: string;
+    /**
+     * Additional global indexes
+     */
+    globalIndexes?: {
+        [key: string]: {
+            key: string;
+            sort?: string;
+        };
+    };
+    /**
+     * CloudFormation customization
+     */
     CloudFormation: any;
     CloudFormationSkip: boolean;
-    region: string;
     scanPage: number;
+    constructor(params: any, service: DynamoStore);
 }
 /**
  * DynamoStore handles the DynamoDB
@@ -20,9 +49,10 @@ export declare class DynamoStoreParameters extends StoreParameters {
  *   table: ''
  *   region: ''
  *
+ * @WebdaModda
  */
-export default class DynamoStore<T extends CoreModel, K extends DynamoStoreParameters = DynamoStoreParameters> extends Store<T, K> implements CloudFormationContributor {
-    _client: AWS.DynamoDB.DocumentClient;
+export default class DynamoStore<T extends CoreModel = CoreModel, K extends DynamoStoreParameters = DynamoStoreParameters> extends Store<T, K> implements CloudFormationContributor {
+    _client: DynamoDBDocument;
     /**
      * Load the parameters
      *
@@ -32,7 +62,7 @@ export default class DynamoStore<T extends CoreModel, K extends DynamoStoreParam
     /**
      * Create the AWS client
      */
-    computeParameters(): void;
+    resolve(): void;
     /**
      * Copy one DynamoDB table to another
      *
@@ -49,7 +79,13 @@ export default class DynamoStore<T extends CoreModel, K extends DynamoStoreParam
      * @inheritdoc
      */
     _save(object: any, uid?: string): Promise<any>;
-    _find(request: any): Promise<any>;
+    /**
+     * @override
+     *
+     * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Query.html
+     * @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GSI.html
+     */
+    find(query: WebdaQL.Query): Promise<StoreFindResult<T>>;
     /**
      * Serialize a date for DynamoDB
      * @param date
@@ -74,7 +110,7 @@ export default class DynamoStore<T extends CoreModel, K extends DynamoStoreParam
     /**
      * @inheritdoc
      */
-    _upsertItemToCollection(uid: any, prop: any, item: any, index: any, itemWriteCondition: any, itemWriteConditionField: any, updateDate: Date): Promise<void>;
+    _upsertItemToCollection(uuid: string, prop: string, item: any, index: number | undefined, itemWriteCondition: any | undefined, itemWriteConditionField: string | undefined, updateDate: Date): Promise<void>;
     /**
      * REturn the write condition as string
      * @param writeCondition
@@ -97,7 +133,7 @@ export default class DynamoStore<T extends CoreModel, K extends DynamoStoreParam
     /**
      * @inheritdoc
      */
-    _scan(items: any, paging?: any): Promise<T[]>;
+    _scan(items?: any[], paging?: any): Promise<T[]>;
     /**
      * @inheritdoc
      */
@@ -109,7 +145,7 @@ export default class DynamoStore<T extends CoreModel, K extends DynamoStoreParam
     /**
      * @inheritdoc
      */
-    _incrementAttribute(uid: any, prop: any, value: any, updateDate: Date): Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.UpdateItemOutput, AWS.AWSError>>;
+    _incrementAttribute(uid: any, prop: any, value: any, updateDate: Date): Promise<import("@aws-sdk/lib-dynamodb").UpdateCommandOutput>;
     /**
      * @inheritdoc
      */
@@ -127,9 +163,5 @@ export default class DynamoStore<T extends CoreModel, K extends DynamoStoreParam
      * @inheritdoc
      */
     getCloudFormation(deployer: CloudFormationDeployer): {};
-    /**
-     * @inheritdoc
-     */
-    static getModda(): ModdaDefinition;
 }
 export { DynamoStore };