quidproquo-deploy-awscdk 0.0.74 → 0.0.76

package/lib/constructs/basic/Function.js

@@ -49,6 +49,11 @@ class Function extends QpqConstructBlock_1.QpqConstructBlock {
             actions: ['cloudformation:ListExports'],
             resources: ['*'],
         }));
+        // Let lambdas read from api keys in api gateway
+        this.lambdaFunction.addToRolePolicy(new aws_cdk_lib_1.aws_iam.PolicyStatement({
+            actions: ['apigateway:GET'],
+            resources: ['*'],
+        }));
     }
 }
 exports.Function = Function;

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

@@ -60,7 +60,7 @@ class QpqCoreQueueConstruct extends QpqCoreQueueConstructBase {
             visibilityTimeout: cdk.Duration.seconds(props.queueConfig.ttRetryInSeconds),
             removalPolicy: cdk.RemovalPolicy.DESTROY,
             deadLetterQueue: {
-                maxReceiveCount: props.queueConfig.maxRetry,
+                maxReceiveCount: props.queueConfig.maxTries,
                 queue: new aws_cdk_lib_1.aws_sqs.Queue(this, 'DeadLetterQueue', {
                     queueName: this.resourceName(`${props.queueConfig.name}-dead`),
                     removalPolicy: cdk.RemovalPolicy.DESTROY,

package/lib/constructs/feature/webserver/api/QpqWebserverApiConstruct.js

@@ -58,6 +58,10 @@ class QpqWebserverApiConstruct extends QpqConstructBlock_1.QpqConstructBlock {
         grantables.forEach((g) => {
             g.grantAll(func.lambdaFunction);
         });
+        // const routes = qpqWebServerUtils.getAllRoutesForApi(props.apiConfig.apiName, props.qpqConfig);
+        // const apiKeys = routes.reduce((acc, r) => {
+        //   return [...acc, ...(r.options.routeAuthSettings?.apiKeys || [])];
+        // }, [] as ApiKey[]);
         // Create a rest api
         const api = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, 'lambda-rest-api', {
             restApiName: this.resourceName(`${props.apiConfig.apiName}-rest-api`),
@@ -68,7 +72,27 @@ class QpqWebserverApiConstruct extends QpqConstructBlock_1.QpqConstructBlock {
             },
             binaryMediaTypes: ['*/*'],
             proxy: true,
+            // defaultMethodOptions: {
+            //   apiKeyRequired: apiKeys.length > 0,
+            // },
         });
+        // const usagePlan = api.addUsagePlan(this.qpqResourceName(props.apiConfig.apiName, 'usagePlan'), {
+        //   apiStages: [
+        //     {
+        //       api,
+        //       stage: api.deploymentStage,
+        //     },
+        //   ],
+        // });
+        // apiKeys.forEach((apiKey) => {
+        //   const name = `${props.apiConfig.apiName}-${apiKey.name}`;
+        //   const newApiKey = api.addApiKey(this.qpqResourceName(name, 'apiKey'), {
+        //     description: apiKey.description,
+        //     apiKeyName: this.resourceName(name),
+        //     value: apiKey.value,
+        //   });
+        //   // usagePlan.addApiKey(newApiKey);
+        // });
         // Map all requests to this service to /serviceName/*
         new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, 'rest-bpm', {
             domainName: subdomain.domainName,

package/lib/constructs/feature/webserver/apiKey/QpqWebserverApiKeyConstruct.d.ts

@@ -0,0 +1,11 @@
+import { aws_lambda } from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import { ApiKeyQPQWebServerConfigSetting } from 'quidproquo-webserver';
+import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
+export interface QpqWebserverApiKeyConstructProps extends QpqConstructBlockProps {
+    apiKeyConfig: ApiKeyQPQWebServerConfigSetting;
+    apiLayerVersions?: aws_lambda.ILayerVersion[];
+}
+export declare class QpqWebserverApiKeyConstruct extends QpqConstructBlock {
+    constructor(scope: Construct, id: string, props: QpqWebserverApiKeyConstructProps);
+}

package/lib/constructs/feature/webserver/apiKey/QpqWebserverApiKeyConstruct.js

@@ -0,0 +1,44 @@
+"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 __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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QpqWebserverApiKeyConstruct = void 0;
+const aws_cdk_lib_1 = require("aws-cdk-lib");
+const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
+const qpqDeployAwsCdkUtils = __importStar(require("../../../../utils"));
+const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
+class QpqWebserverApiKeyConstruct extends QpqConstructBlock_1.QpqConstructBlock {
+    constructor(scope, id, props) {
+        super(scope, id, props);
+        const apiKeyConfig = props.apiKeyConfig.apiKey;
+        const apiKey = new aws_cdk_lib_1.aws_apigateway.ApiKey(this, apiKeyConfig.name, {
+            description: apiKeyConfig.description,
+            apiKeyName: this.resourceName(apiKeyConfig.name),
+            value: apiKeyConfig.value,
+            enabled: true,
+        });
+        qpqDeployAwsCdkUtils.exportStackValue(this, quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getCFExportNameApiKeyIdFromConfig(apiKeyConfig.name, props.qpqConfig), apiKey.keyId);
+    }
+}
+exports.QpqWebserverApiKeyConstruct = QpqWebserverApiKeyConstruct;

package/lib/constructs/feature/webserver/apiKey/index.d.ts

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

package/lib/constructs/feature/webserver/apiKey/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("./QpqWebserverApiKeyConstruct"), exports);

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

@@ -1,4 +1,5 @@
 export * from './api';
+export * from './apiKey';
 export * from './domain';
 export * from './redirect';
 export * from './webEntry';

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

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
+__exportStar(require("./apiKey"), exports);
 __exportStar(require("./domain"), exports);
 __exportStar(require("./redirect"), exports);
 __exportStar(require("./webEntry"), exports);

package/lib/stacks/InfQpqServiceStack.js

@@ -44,6 +44,12 @@ class InfQpqServiceStack extends QpqServiceStack_1.QpqServiceStack {
             qpqConfig: props.qpqConfig,
             userDirectoryConfig: setting,
         }));
+        // Api Keys
+        const apiKeys = quidproquo_webserver_1.qpqWebServerUtils.getAllApiKeyConfigs(props.qpqConfig).map((setting) => new constructs_1.QpqWebserverApiKeyConstruct(this, quidproquo_core_1.qpqCoreUtils.getUniqueKeyForSetting(setting), {
+            awsAccountId: props.awsAccountId,
+            qpqConfig: props.qpqConfig,
+            apiKeyConfig: setting,
+        }));
     }
 }
 exports.InfQpqServiceStack = InfQpqServiceStack;

package/package.json

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

package/src/constructs/basic/Function.ts

@@ -49,5 +49,13 @@ export class Function extends QpqConstructBlock {
         resources: ['*'],
       }),
     );
+
+    // Let lambdas read from api keys in api gateway
+    this.lambdaFunction.addToRolePolicy(
+      new aws_iam.PolicyStatement({
+        actions: ['apigateway:GET'],
+        resources: ['*'],
+      }),
+    );
   }
 }

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

@@ -65,7 +65,7 @@ export class QpqCoreQueueConstruct extends QpqCoreQueueConstructBase {
       removalPolicy: cdk.RemovalPolicy.DESTROY,
 
       deadLetterQueue: {
-        maxReceiveCount: props.queueConfig.maxRetry,
+        maxReceiveCount: props.queueConfig.maxTries,
         queue: new aws_sqs.Queue(this, 'DeadLetterQueue', {
           queueName: this.resourceName(`${props.queueConfig.name}-dead`),
           removalPolicy: cdk.RemovalPolicy.DESTROY,

package/src/constructs/feature/webserver/api/QpqWebserverApiConstruct.ts

@@ -59,6 +59,11 @@ export class QpqWebserverApiConstruct extends QpqConstructBlock {
       g.grantAll(func.lambdaFunction);
     });
 
+    // const routes = qpqWebServerUtils.getAllRoutesForApi(props.apiConfig.apiName, props.qpqConfig);
+    // const apiKeys = routes.reduce((acc, r) => {
+    //   return [...acc, ...(r.options.routeAuthSettings?.apiKeys || [])];
+    // }, [] as ApiKey[]);
+
     // Create a rest api
     const api = new aws_apigateway.LambdaRestApi(this, 'lambda-rest-api', {
       restApiName: this.resourceName(`${props.apiConfig.apiName}-rest-api`),
@@ -69,8 +74,31 @@ export class QpqWebserverApiConstruct extends QpqConstructBlock {
       },
       binaryMediaTypes: ['*/*'],
       proxy: true,
+      // defaultMethodOptions: {
+      //   apiKeyRequired: apiKeys.length > 0,
+      // },
     });
 
+    // const usagePlan = api.addUsagePlan(this.qpqResourceName(props.apiConfig.apiName, 'usagePlan'), {
+    //   apiStages: [
+    //     {
+    //       api,
+    //       stage: api.deploymentStage,
+    //     },
+    //   ],
+    // });
+
+    // apiKeys.forEach((apiKey) => {
+    //   const name = `${props.apiConfig.apiName}-${apiKey.name}`;
+    //   const newApiKey = api.addApiKey(this.qpqResourceName(name, 'apiKey'), {
+    //     description: apiKey.description,
+    //     apiKeyName: this.resourceName(name),
+    //     value: apiKey.value,
+    //   });
+
+    //   // usagePlan.addApiKey(newApiKey);
+    // });
+
     // Map all requests to this service to /serviceName/*
     new aws_apigateway.BasePathMapping(this, 'rest-bpm', {
       domainName: subdomain.domainName,

package/src/constructs/feature/webserver/apiKey/QpqWebserverApiKeyConstruct.ts

@@ -0,0 +1,35 @@
+import { aws_apigateway, aws_lambda } from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+
+import { ApiKeyQPQWebServerConfigSetting, qpqWebServerUtils } from 'quidproquo-webserver';
+
+import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
+
+import * as qpqDeployAwsCdkUtils from '../../../../utils';
+import { awsNamingUtils } from 'quidproquo-actionprocessor-awslambda';
+
+export interface QpqWebserverApiKeyConstructProps extends QpqConstructBlockProps {
+  apiKeyConfig: ApiKeyQPQWebServerConfigSetting;
+  apiLayerVersions?: aws_lambda.ILayerVersion[];
+}
+
+export class QpqWebserverApiKeyConstruct extends QpqConstructBlock {
+  constructor(scope: Construct, id: string, props: QpqWebserverApiKeyConstructProps) {
+    super(scope, id, props);
+
+    const apiKeyConfig = props.apiKeyConfig.apiKey;
+
+    const apiKey = new aws_apigateway.ApiKey(this, apiKeyConfig.name, {
+      description: apiKeyConfig.description,
+      apiKeyName: this.resourceName(apiKeyConfig.name),
+      value: apiKeyConfig.value,
+      enabled: true,
+    });
+
+    qpqDeployAwsCdkUtils.exportStackValue(
+      this,
+      awsNamingUtils.getCFExportNameApiKeyIdFromConfig(apiKeyConfig.name, props.qpqConfig),
+      apiKey.keyId,
+    );
+  }
+}

package/src/constructs/feature/webserver/apiKey/index.ts

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

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

@@ -1,4 +1,5 @@
 export * from './api';
+export * from './apiKey';
 export * from './domain';
 export * from './redirect';
 export * from './webEntry';

package/src/stacks/InfQpqServiceStack.ts

@@ -11,6 +11,7 @@ import {
   QpqCoreSecretConstruct,
   QpqWebserverDomainConstruct,
   QpqCoreUserDirectoryConstruct,
+  QpqWebserverApiKeyConstruct,
 } from '../constructs';
 
 export interface InfQpqServiceStackProps extends QpqServiceStackProps {}
@@ -84,5 +85,16 @@ export class InfQpqServiceStack extends QpqServiceStack {
           userDirectoryConfig: setting,
         }),
     );
+
+    // Api Keys
+    const apiKeys = qpqWebServerUtils.getAllApiKeyConfigs(props.qpqConfig).map(
+      (setting) =>
+        new QpqWebserverApiKeyConstruct(this, qpqCoreUtils.getUniqueKeyForSetting(setting), {
+          awsAccountId: props.awsAccountId,
+          qpqConfig: props.qpqConfig,
+
+          apiKeyConfig: setting,
+        }),
+    );
   }
 }