quidproquo-deploy-awscdk 0.0.89 → 0.0.91

package/lib/constructs/basic/Function.d.ts

@@ -12,6 +12,7 @@ export interface FunctionProps extends QpqConstructBlockProps {
         [key: string]: string;
     };
     apiLayerVersions?: aws_lambda.ILayerVersion[];
+    reservedConcurrentExecutions?: number;
 }
 export declare class Function extends QpqConstructBlock {
     readonly lambdaFunction: aws_lambda.Function;

package/lib/constructs/basic/Function.js

@@ -43,6 +43,7 @@ class Function extends QpqConstructBlock_1.QpqConstructBlock {
             code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path_1.default.join(props.buildPath, props.functionType)),
             handler: `index.${props.executorName}`,
             environment: props.environment,
+            reservedConcurrentExecutions: props.reservedConcurrentExecutions,
         });
         // Let lambdas read from the exported variables in cloudformation
         this.lambdaFunction.addToRolePolicy(new aws_cdk_lib_1.aws_iam.PolicyStatement({

package/lib/constructs/feature/core/index.d.ts

@@ -1,5 +1,6 @@
 export * from './auth';
 export * from './eventBus';
+export * from './keyValueStore';
 export * from './parameter';
 export * from './queue';
 export * from './schedule';

package/lib/constructs/feature/core/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./auth"), exports);
 __exportStar(require("./eventBus"), exports);
+__exportStar(require("./keyValueStore"), exports);
 __exportStar(require("./parameter"), exports);
 __exportStar(require("./queue"), exports);
 __exportStar(require("./schedule"), exports);

package/lib/constructs/feature/core/keyValueStore/QpqCoreKeyValueStoreConstruct.d.ts

@@ -0,0 +1,18 @@
+import { KeyValueStoreQPQConfigSetting, QPQConfig } from 'quidproquo-core';
+import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
+import { Construct } from 'constructs';
+import { aws_dynamodb, aws_iam } from 'aws-cdk-lib';
+export interface QpqCoreKeyValueStoreConstructProps extends QpqConstructBlockProps {
+    keyValueStoreConfig: KeyValueStoreQPQConfigSetting;
+}
+export declare abstract class QpqCoreKeyValueStoreConstructBase extends QpqConstructBlock {
+    abstract table: aws_dynamodb.ITable;
+    grantRead(grantee: aws_iam.IGrantable): void;
+    grantWrite(grantee: aws_iam.IGrantable): void;
+    grantAll(grantee: aws_iam.IGrantable): void;
+}
+export declare class QpqCoreKeyValueStoreConstruct extends QpqCoreKeyValueStoreConstructBase {
+    table: aws_dynamodb.ITable;
+    static fromOtherStack(scope: Construct, id: string, qpqConfig: QPQConfig, awsAccountId: string, keyValueStoreName: string): QpqCoreKeyValueStoreConstructBase;
+    constructor(scope: Construct, id: string, props: QpqCoreKeyValueStoreConstructProps);
+}

package/lib/constructs/feature/core/keyValueStore/QpqCoreKeyValueStoreConstruct.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QpqCoreKeyValueStoreConstruct = exports.QpqCoreKeyValueStoreConstructBase = void 0;
+const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+class QpqCoreKeyValueStoreConstructBase extends QpqConstructBlock_1.QpqConstructBlock {
+    grantRead(grantee) {
+        this.table.grantReadData(grantee);
+    }
+    grantWrite(grantee) {
+        this.table.grantWriteData(grantee);
+    }
+    grantAll(grantee) {
+        this.table.grantFullAccess(grantee);
+    }
+}
+exports.QpqCoreKeyValueStoreConstructBase = QpqCoreKeyValueStoreConstructBase;
+class QpqCoreKeyValueStoreConstruct extends QpqCoreKeyValueStoreConstructBase {
+    static fromOtherStack(scope, id, qpqConfig, awsAccountId, keyValueStoreName) {
+        class Import extends QpqCoreKeyValueStoreConstructBase {
+            constructor() {
+                super(...arguments);
+                this.table = aws_cdk_lib_1.aws_dynamodb.Table.fromTableName(this, 'table', this.qpqResourceName(keyValueStoreName, 'kvs'));
+            }
+        }
+        return new Import(scope, id, { qpqConfig, awsAccountId });
+    }
+    constructor(scope, id, props) {
+        super(scope, id, props);
+        this.table = new aws_cdk_lib_1.aws_dynamodb.Table(this, 'table', {
+            tableName: this.qpqResourceName(props.keyValueStoreConfig.keyValueStoreName, 'kvs'),
+            partitionKey: {
+                name: 'key',
+                type: aws_cdk_lib_1.aws_dynamodb.AttributeType.STRING,
+            },
+            billingMode: aws_cdk_lib_1.aws_dynamodb.BillingMode.PAY_PER_REQUEST,
+            timeToLiveAttribute: 'expires',
+        });
+    }
+}
+exports.QpqCoreKeyValueStoreConstruct = QpqCoreKeyValueStoreConstruct;

package/lib/constructs/feature/core/keyValueStore/index.d.ts

@@ -0,0 +1 @@
+export * from './QpqCoreKeyValueStoreConstruct';

package/lib/constructs/feature/core/keyValueStore/index.js

@@ -0,0 +1,17 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./QpqCoreKeyValueStoreConstruct"), exports);

package/lib/constructs/feature/core/queue/QpqApiCoreQueueConstruct.js

@@ -46,6 +46,8 @@ class QpqApiCoreQueueConstruct extends QpqConstructBlock_1.QpqConstructBlock {
             environment: {
                 queueQPQConfigSetting: JSON.stringify(props.queueConfig),
             },
+            // TODO: Expose this as a config option
+            reservedConcurrentExecutions: 1,
         });
         // TODO: Make this a utility function
         const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(this, 'grantable', this.qpqConfig, props.awsAccountId);

package/lib/lambdas/lambdaAPIGatewayEvent.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeAPIGatewayEvent = exports.getAPIGatewayEventExecutor = void 0;
 const quidproquo_actionprocessor_node_1 = require("quidproquo-actionprocessor-node");
 const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
-const quidproquo_actionprocessor_node_2 = require("quidproquo-actionprocessor-node");
 const quidproquo_webserver_1 = require("quidproquo-webserver");
 const quidproquo_core_1 = require("quidproquo-core");
 const lambdaConfig_1 = require("./lambdaConfig");
@@ -45,7 +44,7 @@ const getAPIGatewayEventExecutor = (dynamicModuleLoader, getCustomActionProcesso
         const cdkConfig = yield (0, lambdaConfig_1.getLambdaConfigs)();
         // Build a processor for the session and stuff
         // Remove the non route ones ~ let the story execute action add them
-        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getAPIGatewayEventActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_2.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getServiceFunctionActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
+        const storyActionProcessor = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, quidproquo_actionprocessor_node_1.coreActionProcessor), quidproquo_actionprocessor_node_1.webserverActionProcessor), (0, quidproquo_actionprocessor_awslambda_1.getAPIGatewayEventActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetSecretActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParameterActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getConfigGetParametersActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getSystemActionProcessor)(dynamicModuleLoader)), (0, quidproquo_actionprocessor_awslambda_1.getFileActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_node_1.getConfigActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getQueueActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getEventBusActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getUserDirectoryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getWebEntryActionProcessor)(cdkConfig.qpqConfig)), (0, quidproquo_actionprocessor_awslambda_1.getServiceFunctionActionProcessor)(cdkConfig.qpqConfig)), getCustomActionProcessors(cdkConfig.qpqConfig)), (0, qpq_custom_action_processors_loader_1.default)());
         const logger = (result) => __awaiter(void 0, void 0, void 0, function* () {
             // addResult(
             //   envConfig.appName,

package/lib/stacks/InfQpqServiceStack.js

@@ -56,6 +56,12 @@ class InfQpqServiceStack extends QpqServiceStack_1.QpqServiceStack {
             qpqConfig: props.qpqConfig,
             eventBusConfig: setting,
         }));
+        // key value store
+        const keyValueStores = quidproquo_core_1.qpqCoreUtils.getAllKeyValueStores(props.qpqConfig).map((setting) => new constructs_1.QpqCoreKeyValueStoreConstruct(this, quidproquo_core_1.qpqCoreUtils.getUniqueKeyForSetting(setting), {
+            awsAccountId: props.awsAccountId,
+            qpqConfig: props.qpqConfig,
+            keyValueStoreConfig: setting,
+        }));
     }
 }
 exports.InfQpqServiceStack = InfQpqServiceStack;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-awscdk",
-  "version": "0.0.89",
+  "version": "0.0.91",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",

package/src/constructs/basic/Function.ts

@@ -20,6 +20,8 @@ export interface FunctionProps extends QpqConstructBlockProps {
   };
 
   apiLayerVersions?: aws_lambda.ILayerVersion[];
+
+  reservedConcurrentExecutions?: number;
 }
 
 export class Function extends QpqConstructBlock {
@@ -40,6 +42,8 @@ export class Function extends QpqConstructBlock {
       handler: `index.${props.executorName}`,
 
       environment: props.environment,
+
+      reservedConcurrentExecutions: props.reservedConcurrentExecutions,
     });
 
     // Let lambdas read from the exported variables in cloudformation

package/src/constructs/feature/core/index.ts

@@ -1,5 +1,6 @@
 export * from './auth';
 export * from './eventBus';
+export * from './keyValueStore';
 export * from './parameter';
 export * from './queue';
 export * from './schedule';

package/src/constructs/feature/core/keyValueStore/QpqCoreKeyValueStoreConstruct.ts

@@ -0,0 +1,61 @@
+import { KeyValueStoreQPQConfigSetting, QPQConfig } from 'quidproquo-core';
+import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
+
+import { Construct } from 'constructs';
+import { aws_dynamodb, aws_iam } from 'aws-cdk-lib';
+
+export interface QpqCoreKeyValueStoreConstructProps extends QpqConstructBlockProps {
+  keyValueStoreConfig: KeyValueStoreQPQConfigSetting;
+}
+
+export abstract class QpqCoreKeyValueStoreConstructBase extends QpqConstructBlock {
+  abstract table: aws_dynamodb.ITable;
+
+  public grantRead(grantee: aws_iam.IGrantable) {
+    this.table.grantReadData(grantee);
+  }
+
+  public grantWrite(grantee: aws_iam.IGrantable) {
+    this.table.grantWriteData(grantee);
+  }
+
+  public grantAll(grantee: aws_iam.IGrantable) {
+    this.table.grantFullAccess(grantee);
+  }
+}
+
+export class QpqCoreKeyValueStoreConstruct extends QpqCoreKeyValueStoreConstructBase {
+  table: aws_dynamodb.ITable;
+
+  static fromOtherStack(
+    scope: Construct,
+    id: string,
+    qpqConfig: QPQConfig,
+    awsAccountId: string,
+    keyValueStoreName: string,
+  ): QpqCoreKeyValueStoreConstructBase {
+    class Import extends QpqCoreKeyValueStoreConstructBase {
+      table = aws_dynamodb.Table.fromTableName(
+        this,
+        'table',
+        this.qpqResourceName(keyValueStoreName, 'kvs'),
+      );
+    }
+
+    return new Import(scope, id, { qpqConfig, awsAccountId });
+  }
+
+  constructor(scope: Construct, id: string, props: QpqCoreKeyValueStoreConstructProps) {
+    super(scope, id, props);
+
+    this.table = new aws_dynamodb.Table(this, 'table', {
+      tableName: this.qpqResourceName(props.keyValueStoreConfig.keyValueStoreName, 'kvs'),
+      partitionKey: {
+        name: 'key',
+        type: aws_dynamodb.AttributeType.STRING,
+      },
+      billingMode: aws_dynamodb.BillingMode.PAY_PER_REQUEST,
+      timeToLiveAttribute: 'expires',
+    });
+  }
+}

package/src/constructs/feature/core/keyValueStore/index.ts

@@ -0,0 +1 @@
+export * from './QpqCoreKeyValueStoreConstruct';

package/src/constructs/feature/core/queue/QpqApiCoreQueueConstruct.ts

@@ -36,6 +36,9 @@ export class QpqApiCoreQueueConstruct extends QpqConstructBlock {
       environment: {
         queueQPQConfigSetting: JSON.stringify(props.queueConfig),
       },
+
+      // TODO: Expose this as a config option
+      reservedConcurrentExecutions: 1,
     });
 
     // TODO: Make this a utility function

package/src/lambdas/lambdaAPIGatewayEvent.ts

@@ -1,4 +1,8 @@
-import { coreActionProcessor, webserverActionProcessor } from 'quidproquo-actionprocessor-node';
+import {
+  coreActionProcessor,
+  webserverActionProcessor,
+  getConfigActionProcessor,
+} from 'quidproquo-actionprocessor-node';
 
 import {
   getAPIGatewayEventActionProcessor,
@@ -16,8 +20,6 @@ import {
   DynamicModuleLoader,
 } from 'quidproquo-actionprocessor-awslambda';
 
-import { getConfigActionProcessor } from 'quidproquo-actionprocessor-node';
-
 import { qpqWebServerUtils } from 'quidproquo-webserver';
 
 import { createRuntime, askProcessEvent, ErrorTypeEnum } from 'quidproquo-core';

package/src/stacks/InfQpqServiceStack.ts

@@ -13,6 +13,7 @@ import {
   QpqWebserverDomainConstruct,
   QpqCoreUserDirectoryConstruct,
   QpqWebserverApiKeyConstruct,
+  QpqCoreKeyValueStoreConstruct,
 } from '../constructs';
 
 export interface InfQpqServiceStackProps extends QpqServiceStackProps {}
@@ -108,5 +109,16 @@ export class InfQpqServiceStack extends QpqServiceStack {
           eventBusConfig: setting,
         }),
     );
+
+    // key value store
+    const keyValueStores = qpqCoreUtils.getAllKeyValueStores(props.qpqConfig).map(
+      (setting) =>
+        new QpqCoreKeyValueStoreConstruct(this, qpqCoreUtils.getUniqueKeyForSetting(setting), {
+          awsAccountId: props.awsAccountId,
+          qpqConfig: props.qpqConfig,
+
+          keyValueStoreConfig: setting,
+        }),
+    );
   }
 }