quidproquo-deploy-awscdk 0.0.231 → 0.0.232

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

@@ -3,7 +3,6 @@ import { Construct } from 'constructs';
 import { aws_lambda, aws_iam, aws_ec2 } from 'aws-cdk-lib';
 export interface FunctionProps extends QpqConstructBlockProps {
     functionName?: string;
-    buildPath: string;
     srcFilename?: string;
     functionType: string;
     executorName: string;

package/lib/commonjs/constructs/basic/Function.js

@@ -48,7 +48,7 @@ class Function extends QpqConstructBlock_1.QpqConstructBlock {
             runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_18_X,
             memorySize: props.memoryInBytes || serviceInfo.lambdaMaxMemoryInMiB || 1024,
             layers: props.apiLayerVersions,
-            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path_1.default.join(props.buildPath, props.functionType)),
+            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path_1.default.join(quidproquo_core_1.qpqCoreUtils.getApiBuildPathFullPath(props.qpqConfig), props.functionType)),
             handler: `${handlerFile}.${props.executorName}`,
             environment: Object.assign({ AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1' }, (props.environment || {})),
             reservedConcurrentExecutions: props.reservedConcurrentExecutions,

package/lib/commonjs/constructs/basic/index.d.ts

@@ -1,6 +1,5 @@
 export * from './Function';
 export * from './LambdaLayers';
 export * from './SubdomainName';
-export * from './LogStorage';
 export * from './ServiceDomain';
 export * from './InfQpqWebserverServiceDomainsConstruct';

package/lib/commonjs/constructs/basic/index.js

@@ -17,6 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Function"), exports);
 __exportStar(require("./LambdaLayers"), exports);
 __exportStar(require("./SubdomainName"), exports);
-__exportStar(require("./LogStorage"), exports);
 __exportStar(require("./ServiceDomain"), exports);
 __exportStar(require("./InfQpqWebserverServiceDomainsConstruct"), exports);

package/lib/commonjs/constructs/feature/core/auth/QpqInfCoreUserDirectoryConstruct.js

@@ -77,7 +77,6 @@ class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock_1.QpqConstructB
             props.userDirectoryConfig.emailTemplates.resetPasswordAdmin ||
             props.userDirectoryConfig.emailTemplates.verifyEmail) {
             const customMessageTrigger = new Function_1.Function(this, 'csm-msg-trigger-func', {
-                buildPath: quidproquo_core_1.qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
                 functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cm-trig'),
                 functionType: 'customMessageTriggerEvent_customMessage',
                 executorName: 'customMessageTriggerEvent_customMessage',
@@ -92,7 +91,6 @@ class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock_1.QpqConstructB
         }
         if (props.userDirectoryConfig.customAuthRuntime) {
             const defAuthChallengeTrigger = new Function_1.Function(this, 'def-auth-challenge', {
-                buildPath: quidproquo_core_1.qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
                 functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-define'),
                 functionType: 'customMessageTriggerEvent_defineAuthChallenge',
                 executorName: 'customMessageTriggerEvent_defineAuthChallenge',
@@ -106,7 +104,6 @@ class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock_1.QpqConstructB
             userPool.addTrigger(aws_cdk_lib_1.aws_cognito.UserPoolOperation.DEFINE_AUTH_CHALLENGE, defAuthChallengeTrigger.lambdaFunction);
             if (props.userDirectoryConfig.customAuthRuntime.createAuthChallenge) {
                 const createAuthChallengeTrigger = new Function_1.Function(this, 'create-auth-challenge', {
-                    buildPath: quidproquo_core_1.qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
                     functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-create'),
                     functionType: 'customMessageTriggerEvent_createAuthChallenge',
                     executorName: 'customMessageTriggerEvent_createAuthChallenge',
@@ -121,7 +118,6 @@ class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock_1.QpqConstructB
             }
             if (props.userDirectoryConfig.customAuthRuntime.verifyAuthChallenge) {
                 const verifyAuthChallengeTrigger = new Function_1.Function(this, 'verify-auth-challenge', {
-                    buildPath: quidproquo_core_1.qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
                     functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-verify'),
                     functionType: 'customMessageTriggerEvent_verifyAuthChallenge',
                     executorName: 'customMessageTriggerEvent_verifyAuthChallenge',

package/lib/commonjs/constructs/feature/core/deployEvents/QpqCoreDeployEventConstruct.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QpqCoreDeployEventConstruct = void 0;
-const quidproquo_core_1 = require("quidproquo-core");
 const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const Function_1 = require("../../../basic/Function");
@@ -9,7 +8,6 @@ class QpqCoreDeployEventConstruct extends QpqConstructBlock_1.QpqConstructBlock
     constructor(scope, id, props) {
         super(scope, id, props);
         const func = new Function_1.Function(this, props.deployEventConfig.uniqueKey, {
-            buildPath: quidproquo_core_1.qpqCoreUtils.getDeployEventFullPath(props.qpqConfig, props.deployEventConfig),
             functionName: this.qpqResourceName(`${props.deployEventConfig.name}`, 'de'),
             functionType: 'eventBridgeEvent_stackDeploy',
             executorName: 'eventBridgeEvent_stackDeploy',

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

@@ -36,7 +36,6 @@ class QpqApiCoreQueueConstruct extends QpqConstructBlock_1.QpqConstructBlock {
     constructor(scope, id, props) {
         super(scope, id, props);
         const queueFunction = new Function_1.Function(this, props.queueConfig.uniqueKey, {
-            buildPath: quidproquo_core_1.qpqCoreUtils.getQueueEntryFullPath(props.qpqConfig, props.queueConfig),
             functionName: this.resourceName(`${props.queueConfig.uniqueKey}-queue`),
             functionType: 'sqsEvent_queueEvent',
             executorName: 'sqsEvent_queueEvent',

package/lib/commonjs/constructs/feature/core/schedule/QpqCoreRecurringScheduleConstruct.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QpqCoreRecurringScheduleConstruct = void 0;
-const quidproquo_core_1 = require("quidproquo-core");
 const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const Function_1 = require("../../../basic/Function");
@@ -9,7 +8,6 @@ class QpqCoreRecurringScheduleConstruct extends QpqConstructBlock_1.QpqConstruct
     constructor(scope, id, props) {
         super(scope, id, props);
         const schedulerFunction = new Function_1.Function(this, props.scheduleConfig.uniqueKey, {
-            buildPath: quidproquo_core_1.qpqCoreUtils.getScheduleEntryFullPath(props.qpqConfig, props.scheduleConfig),
             functionName: this.resourceName(`${props.scheduleConfig.uniqueKey}-SE`),
             functionType: 'eventBridgeEvent_recurringSchedule',
             executorName: 'eventBridgeEvent_recurringSchedule',

package/lib/commonjs/constructs/feature/core/storageDrive/QpqApiCoreStorageDriveConstruct.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QpqApiCoreStorageDriveConstruct = void 0;
-const quidproquo_core_1 = require("quidproquo-core");
 const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const QpqCoreStorageDriveConstruct_1 = require("./QpqCoreStorageDriveConstruct");
@@ -13,7 +12,6 @@ class QpqApiCoreStorageDriveConstruct extends QpqConstructBlock_1.QpqConstructBl
         const bucket = QpqCoreStorageDriveConstruct_1.QpqCoreStorageDriveConstruct.fromOtherStack(scope, `bucket-${id}`, props.qpqConfig, props.storageDriveConfig, props.awsAccountId).bucket;
         if ((_a = props.storageDriveConfig.onEvent) === null || _a === void 0 ? void 0 : _a.create) {
             const func = new Function_1.Function(this, 'create', {
-                buildPath: quidproquo_core_1.qpqCoreUtils.getStorageDriveEntryFullPath(props.qpqConfig, props.storageDriveConfig),
                 reacreateOnFunctionNameChange: true,
                 functionName: this.qpqResourceName(props.storageDriveConfig.storageDrive, 's3Create'),
                 functionType: 's3Event_fileEvent',
@@ -32,7 +30,6 @@ class QpqApiCoreStorageDriveConstruct extends QpqConstructBlock_1.QpqConstructBl
         }
         if ((_c = props.storageDriveConfig.onEvent) === null || _c === void 0 ? void 0 : _c.delete) {
             const func = new Function_1.Function(this, 'delete', {
-                buildPath: quidproquo_core_1.qpqCoreUtils.getStorageDriveEntryFullPath(props.qpqConfig, props.storageDriveConfig),
                 reacreateOnFunctionNameChange: true,
                 functionName: this.qpqResourceName(props.storageDriveConfig.storageDrive, 's3Delete'),
                 functionType: 's3Event_fileEvent',

package/lib/commonjs/constructs/feature/webserver/api/ApiQpqWebserverApiConstruct.js

@@ -17,7 +17,6 @@ class ApiQpqWebserverApiConstruct extends QpqConstructBlock_1.QpqConstructBlock
             : undefined;
         // Build Function
         const func = new Function_1.Function(this, 'api-function', {
-            buildPath: quidproquo_webserver_1.qpqWebServerUtils.getApiEntryFullPath(props.qpqConfig, props.apiConfig),
             functionName: this.resourceName(`${props.apiConfig.apiName}-route`),
             functionType: 'apiGatewayEventHandler',
             executorName: 'apiGatewayEventHandler',

package/lib/commonjs/constructs/feature/webserver/redirect/QpqWebserverSubdomainRedirectConstruct.js

@@ -13,7 +13,6 @@ class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock_1.QpqCons
         const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(props.qpqConfig);
         const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(props.qpqConfig);
         const func = new Function_1.Function(this, 'redirect', {
-            buildPath: quidproquo_webserver_1.qpqWebServerUtils.getRedirectApiBuildFullPath(props.qpqConfig, props.subdomainRedirectConfig),
             functionName: this.resourceName(`${props.subdomainRedirectConfig.subdomain}-redirect`),
             functionType: 'apiGatewayEventHandler_redirect',
             executorName: 'apiGatewayEventHandler_redirect',

package/lib/commonjs/constructs/feature/webserver/serviceFunction/QpqWebserverServiceFunctionConstruct.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QpqWebserverServiceFunctionConstruct = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
-const quidproquo_webserver_1 = require("quidproquo-webserver");
 const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
 const Function_1 = require("../../../basic/Function");
 const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
@@ -16,7 +15,6 @@ class QpqWebserverServiceFunctionConstruct extends QpqConstructBlock_1.QpqConstr
             : undefined;
         // Build Function
         const func = new Function_1.Function(this, 'api-function', {
-            buildPath: quidproquo_webserver_1.qpqWebServerUtils.getServiceFunctionFullPath(props.qpqConfig, props.serviceFunctionConfig),
             functionName: this.resourceName(`${props.serviceFunctionConfig.functionName}-sfunc`),
             functionType: 'anyExecuteServiceFunctionEvent_serviceFunction',
             executorName: 'anyExecuteServiceFunctionEvent_serviceFunction',

package/lib/commonjs/constructs/feature/webserver/webEntry/WebQpqWebserverWebEntryConstruct.js

@@ -37,6 +37,7 @@ const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocess
 const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
 const qpqDeployAwsCdkUtils = __importStar(require("../../../../utils"));
 const QpqWebServerCacheConstruct_1 = require("../cache/QpqWebServerCacheConstruct");
+const quidproquo_core_1 = require("quidproquo-core");
 class WebQpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBlock {
     constructor(scope, id, props) {
         super(scope, id, props);
@@ -175,7 +176,7 @@ class WebQpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructB
         const seos = quidproquo_webserver_1.qpqWebServerUtils.getAllSeo(props.qpqConfig).filter((seo) => !seo.webEntry || seo.webEntry === props.webEntryConfig.name);
         // if we have some ~ Build the edge lambdas and deploy
         if (seos.length > 0) {
-            const seoEntryBuildPath = quidproquo_webserver_1.qpqWebServerUtils.getWebEntrySeoFullPath(props.qpqConfig, props.webEntryConfig);
+            const seoEntryBuildPath = quidproquo_core_1.qpqCoreUtils.getApiBuildPathFullPath(props.qpqConfig);
             const edgeFunctionVR = new aws_cdk_lib_1.aws_cloudfront.experimental.EdgeFunction(this, `SEO-VR`, {
                 functionName: this.qpqResourceName(props.webEntryConfig.name, 'SEO-VR'),
                 timeout: cdk.Duration.seconds(5),

package/lib/commonjs/constructs/feature/webserver/websocket/QpqApiWebserverWebsocketConstruct.js

@@ -23,7 +23,6 @@ class QpqApiWebserverWebsocketConstruct extends QpqConstructBlock_1.QpqConstruct
             stageName: 'prod',
         });
         const func = new Function_1.Function(this, 'api-function', {
-            buildPath: quidproquo_webserver_1.qpqWebServerUtils.getWebsocketEntryFullPath(props.qpqConfig, props.websocketConfig),
             functionName: this.resourceName(`${props.websocketConfig.apiName}-ws`),
             functionType: 'apiGatwayEventWebsocketWithIdentity_websocketEvent',
             executorName: 'apiGatwayEventWebsocketWithIdentity_websocketEvent',

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

@@ -3,7 +3,6 @@ import { Construct } from 'constructs';
 import { aws_lambda, aws_iam, aws_ec2 } from 'aws-cdk-lib';
 export interface FunctionProps extends QpqConstructBlockProps {
     functionName?: string;
-    buildPath: string;
     srcFilename?: string;
     functionType: string;
     executorName: string;

package/lib/esm/constructs/basic/Function.js

@@ -19,7 +19,7 @@ export class Function extends QpqConstructBlock {
             runtime: aws_lambda.Runtime.NODEJS_18_X,
             memorySize: props.memoryInBytes || serviceInfo.lambdaMaxMemoryInMiB || 1024,
             layers: props.apiLayerVersions,
-            code: aws_lambda.Code.fromAsset(path.join(props.buildPath, props.functionType)),
+            code: aws_lambda.Code.fromAsset(path.join(qpqCoreUtils.getApiBuildPathFullPath(props.qpqConfig), props.functionType)),
             handler: `${handlerFile}.${props.executorName}`,
             environment: {
                 AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',

package/lib/esm/constructs/basic/index.d.ts

@@ -1,6 +1,5 @@
 export * from './Function';
 export * from './LambdaLayers';
 export * from './SubdomainName';
-export * from './LogStorage';
 export * from './ServiceDomain';
 export * from './InfQpqWebserverServiceDomainsConstruct';

package/lib/esm/constructs/basic/index.js

@@ -1,6 +1,5 @@
 export * from './Function';
 export * from './LambdaLayers';
 export * from './SubdomainName';
-export * from './LogStorage';
 export * from './ServiceDomain';
 export * from './InfQpqWebserverServiceDomainsConstruct';

package/lib/esm/constructs/feature/core/auth/QpqInfCoreUserDirectoryConstruct.js

@@ -48,7 +48,6 @@ export class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock {
             props.userDirectoryConfig.emailTemplates.resetPasswordAdmin ||
             props.userDirectoryConfig.emailTemplates.verifyEmail) {
             const customMessageTrigger = new Function(this, 'csm-msg-trigger-func', {
-                buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
                 functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cm-trig'),
                 functionType: 'customMessageTriggerEvent_customMessage',
                 executorName: 'customMessageTriggerEvent_customMessage',
@@ -63,7 +62,6 @@ export class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock {
         }
         if (props.userDirectoryConfig.customAuthRuntime) {
             const defAuthChallengeTrigger = new Function(this, 'def-auth-challenge', {
-                buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
                 functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-define'),
                 functionType: 'customMessageTriggerEvent_defineAuthChallenge',
                 executorName: 'customMessageTriggerEvent_defineAuthChallenge',
@@ -77,7 +75,6 @@ export class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock {
             userPool.addTrigger(aws_cognito.UserPoolOperation.DEFINE_AUTH_CHALLENGE, defAuthChallengeTrigger.lambdaFunction);
             if (props.userDirectoryConfig.customAuthRuntime.createAuthChallenge) {
                 const createAuthChallengeTrigger = new Function(this, 'create-auth-challenge', {
-                    buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
                     functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-create'),
                     functionType: 'customMessageTriggerEvent_createAuthChallenge',
                     executorName: 'customMessageTriggerEvent_createAuthChallenge',
@@ -92,7 +89,6 @@ export class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock {
             }
             if (props.userDirectoryConfig.customAuthRuntime.verifyAuthChallenge) {
                 const verifyAuthChallengeTrigger = new Function(this, 'verify-auth-challenge', {
-                    buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
                     functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-verify'),
                     functionType: 'customMessageTriggerEvent_verifyAuthChallenge',
                     executorName: 'customMessageTriggerEvent_verifyAuthChallenge',

package/lib/esm/constructs/feature/core/deployEvents/QpqCoreDeployEventConstruct.js

@@ -1,4 +1,3 @@
-import { qpqCoreUtils } from 'quidproquo-core';
 import { QpqConstructBlock } from '../../../base/QpqConstructBlock';
 import { aws_events, aws_events_targets } from 'aws-cdk-lib';
 import { Function } from '../../../basic/Function';
@@ -6,7 +5,6 @@ export class QpqCoreDeployEventConstruct extends QpqConstructBlock {
     constructor(scope, id, props) {
         super(scope, id, props);
         const func = new Function(this, props.deployEventConfig.uniqueKey, {
-            buildPath: qpqCoreUtils.getDeployEventFullPath(props.qpqConfig, props.deployEventConfig),
             functionName: this.qpqResourceName(`${props.deployEventConfig.name}`, 'de'),
             functionType: 'eventBridgeEvent_stackDeploy',
             executorName: 'eventBridgeEvent_stackDeploy',

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

@@ -10,7 +10,6 @@ export class QpqApiCoreQueueConstruct extends QpqConstructBlock {
     constructor(scope, id, props) {
         super(scope, id, props);
         const queueFunction = new Function(this, props.queueConfig.uniqueKey, {
-            buildPath: qpqCoreUtils.getQueueEntryFullPath(props.qpqConfig, props.queueConfig),
             functionName: this.resourceName(`${props.queueConfig.uniqueKey}-queue`),
             functionType: 'sqsEvent_queueEvent',
             executorName: 'sqsEvent_queueEvent',

package/lib/esm/constructs/feature/core/schedule/QpqCoreRecurringScheduleConstruct.js

@@ -1,4 +1,3 @@
-import { qpqCoreUtils } from 'quidproquo-core';
 import { QpqConstructBlock } from '../../../base/QpqConstructBlock';
 import { aws_events, aws_events_targets } from 'aws-cdk-lib';
 import { Function } from '../../../basic/Function';
@@ -6,7 +5,6 @@ export class QpqCoreRecurringScheduleConstruct extends QpqConstructBlock {
     constructor(scope, id, props) {
         super(scope, id, props);
         const schedulerFunction = new Function(this, props.scheduleConfig.uniqueKey, {
-            buildPath: qpqCoreUtils.getScheduleEntryFullPath(props.qpqConfig, props.scheduleConfig),
             functionName: this.resourceName(`${props.scheduleConfig.uniqueKey}-SE`),
             functionType: 'eventBridgeEvent_recurringSchedule',
             executorName: 'eventBridgeEvent_recurringSchedule',

package/lib/esm/constructs/feature/core/storageDrive/QpqApiCoreStorageDriveConstruct.js

@@ -1,4 +1,3 @@
-import { qpqCoreUtils } from 'quidproquo-core';
 import { QpqConstructBlock } from '../../../base/QpqConstructBlock';
 import { aws_s3, aws_s3_notifications } from 'aws-cdk-lib';
 import { QpqCoreStorageDriveConstruct } from './QpqCoreStorageDriveConstruct';
@@ -9,7 +8,6 @@ export class QpqApiCoreStorageDriveConstruct extends QpqConstructBlock {
         const bucket = QpqCoreStorageDriveConstruct.fromOtherStack(scope, `bucket-${id}`, props.qpqConfig, props.storageDriveConfig, props.awsAccountId).bucket;
         if (props.storageDriveConfig.onEvent?.create) {
             const func = new Function(this, 'create', {
-                buildPath: qpqCoreUtils.getStorageDriveEntryFullPath(props.qpqConfig, props.storageDriveConfig),
                 reacreateOnFunctionNameChange: true,
                 functionName: this.qpqResourceName(props.storageDriveConfig.storageDrive, 's3Create'),
                 functionType: 's3Event_fileEvent',
@@ -28,7 +26,6 @@ export class QpqApiCoreStorageDriveConstruct extends QpqConstructBlock {
         }
         if (props.storageDriveConfig.onEvent?.delete) {
             const func = new Function(this, 'delete', {
-                buildPath: qpqCoreUtils.getStorageDriveEntryFullPath(props.qpqConfig, props.storageDriveConfig),
                 reacreateOnFunctionNameChange: true,
                 functionName: this.qpqResourceName(props.storageDriveConfig.storageDrive, 's3Delete'),
                 functionType: 's3Event_fileEvent',

package/lib/esm/constructs/feature/webserver/api/ApiQpqWebserverApiConstruct.js

@@ -14,7 +14,6 @@ export class ApiQpqWebserverApiConstruct extends QpqConstructBlock {
             : undefined;
         // Build Function
         const func = new Function(this, 'api-function', {
-            buildPath: qpqWebServerUtils.getApiEntryFullPath(props.qpqConfig, props.apiConfig),
             functionName: this.resourceName(`${props.apiConfig.apiName}-route`),
             functionType: 'apiGatewayEventHandler',
             executorName: 'apiGatewayEventHandler',

package/lib/esm/constructs/feature/webserver/redirect/QpqWebserverSubdomainRedirectConstruct.js

@@ -10,7 +10,6 @@ export class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock {
         const environment = qpqCoreUtils.getApplicationModuleEnvironment(props.qpqConfig);
         const feature = qpqCoreUtils.getApplicationModuleFeature(props.qpqConfig);
         const func = new Function(this, 'redirect', {
-            buildPath: qpqWebServerUtils.getRedirectApiBuildFullPath(props.qpqConfig, props.subdomainRedirectConfig),
             functionName: this.resourceName(`${props.subdomainRedirectConfig.subdomain}-redirect`),
             functionType: 'apiGatewayEventHandler_redirect',
             executorName: 'apiGatewayEventHandler_redirect',

package/lib/esm/constructs/feature/webserver/serviceFunction/QpqWebserverServiceFunctionConstruct.js

@@ -1,5 +1,4 @@
 import { aws_ec2 } from 'aws-cdk-lib';
-import { qpqWebServerUtils } from 'quidproquo-webserver';
 import { QpqConstructBlock } from '../../../base/QpqConstructBlock';
 import { Function } from '../../../basic/Function';
 import { awsNamingUtils } from 'quidproquo-actionprocessor-awslambda';
@@ -13,7 +12,6 @@ export class QpqWebserverServiceFunctionConstruct extends QpqConstructBlock {
             : undefined;
         // Build Function
         const func = new Function(this, 'api-function', {
-            buildPath: qpqWebServerUtils.getServiceFunctionFullPath(props.qpqConfig, props.serviceFunctionConfig),
             functionName: this.resourceName(`${props.serviceFunctionConfig.functionName}-sfunc`),
             functionType: 'anyExecuteServiceFunctionEvent_serviceFunction',
             executorName: 'anyExecuteServiceFunctionEvent_serviceFunction',

package/lib/esm/constructs/feature/webserver/webEntry/WebQpqWebserverWebEntryConstruct.js

@@ -8,6 +8,7 @@ import { awsNamingUtils } from 'quidproquo-actionprocessor-awslambda';
 import { QpqConstructBlock } from '../../../base/QpqConstructBlock';
 import * as qpqDeployAwsCdkUtils from '../../../../utils';
 import { QpqWebServerCacheConstruct } from '../cache/QpqWebServerCacheConstruct';
+import { qpqCoreUtils } from 'quidproquo-core';
 export class WebQpqWebserverWebEntryConstruct extends QpqConstructBlock {
     constructor(scope, id, props) {
         super(scope, id, props);
@@ -146,7 +147,7 @@ export class WebQpqWebserverWebEntryConstruct extends QpqConstructBlock {
         const seos = qpqWebServerUtils.getAllSeo(props.qpqConfig).filter((seo) => !seo.webEntry || seo.webEntry === props.webEntryConfig.name);
         // if we have some ~ Build the edge lambdas and deploy
         if (seos.length > 0) {
-            const seoEntryBuildPath = qpqWebServerUtils.getWebEntrySeoFullPath(props.qpqConfig, props.webEntryConfig);
+            const seoEntryBuildPath = qpqCoreUtils.getApiBuildPathFullPath(props.qpqConfig);
             const edgeFunctionVR = new aws_cloudfront.experimental.EdgeFunction(this, `SEO-VR`, {
                 functionName: this.qpqResourceName(props.webEntryConfig.name, 'SEO-VR'),
                 timeout: cdk.Duration.seconds(5),

package/lib/esm/constructs/feature/webserver/websocket/QpqApiWebserverWebsocketConstruct.js

@@ -20,7 +20,6 @@ export class QpqApiWebserverWebsocketConstruct extends QpqConstructBlock {
             stageName: 'prod',
         });
         const func = new Function(this, 'api-function', {
-            buildPath: qpqWebServerUtils.getWebsocketEntryFullPath(props.qpqConfig, props.websocketConfig),
             functionName: this.resourceName(`${props.websocketConfig.apiName}-ws`),
             functionType: 'apiGatwayEventWebsocketWithIdentity_websocketEvent',
             executorName: 'apiGatwayEventWebsocketWithIdentity_websocketEvent',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-awscdk",
-  "version": "0.0.231",
+  "version": "0.0.232",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -36,18 +36,18 @@
     "constructs": "^10.1.208",
     "esbuild": "^0.15.16",
     "liquidjs": "^10.7.0",
-    "quidproquo-actionprocessor-awslambda": "0.0.231",
-    "quidproquo-actionprocessor-node": "0.0.231",
-    "quidproquo-config-aws": "0.0.231",
-    "quidproquo-core": "0.0.231",
-    "quidproquo-webserver": "0.0.231"
+    "quidproquo-actionprocessor-awslambda": "0.0.232",
+    "quidproquo-actionprocessor-node": "0.0.232",
+    "quidproquo-config-aws": "0.0.232",
+    "quidproquo-core": "0.0.232",
+    "quidproquo-webserver": "0.0.232"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.109",
     "@types/babel__traverse": "7.18.2",
     "@types/node": "^20.2.1",
     "@types/prettier": "2.6.0",
-    "quidproquo-tsconfig": "0.0.231",
+    "quidproquo-tsconfig": "0.0.232",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.3"
   }

package/src/constructs/basic/Function.ts

@@ -13,7 +13,6 @@ import { qpqCoreUtils } from 'quidproquo-core';
 export interface FunctionProps extends QpqConstructBlockProps {
   functionName?: string;
 
-  buildPath: string;
   srcFilename?: string;
   functionType: string; // TODO: Rename this to subFolder / folder or something
   executorName: string; // TODO: Rename this to handlerName or something maybe?
@@ -58,7 +57,7 @@ export class Function extends QpqConstructBlock {
       memorySize: props.memoryInBytes || serviceInfo.lambdaMaxMemoryInMiB || 1024,
       layers: props.apiLayerVersions,
 
-      code: aws_lambda.Code.fromAsset(path.join(props.buildPath, props.functionType)),
+      code: aws_lambda.Code.fromAsset(path.join(qpqCoreUtils.getApiBuildPathFullPath(props.qpqConfig), props.functionType)),
       handler: `${handlerFile}.${props.executorName}`,
 
       environment: {

package/src/constructs/basic/index.ts

@@ -1,6 +1,5 @@
 export * from './Function';
 export * from './LambdaLayers';
 export * from './SubdomainName';
-export * from './LogStorage';
 export * from './ServiceDomain';
 export * from './InfQpqWebserverServiceDomainsConstruct';

package/src/constructs/feature/core/auth/QpqInfCoreUserDirectoryConstruct.ts

@@ -76,7 +76,6 @@ export class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock {
       props.userDirectoryConfig.emailTemplates.verifyEmail
     ) {
       const customMessageTrigger = new Function(this, 'csm-msg-trigger-func', {
-        buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
         functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cm-trig'),
         functionType: 'customMessageTriggerEvent_customMessage',
         executorName: 'customMessageTriggerEvent_customMessage',
@@ -97,7 +96,6 @@ export class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock {
 
     if (props.userDirectoryConfig.customAuthRuntime) {
       const defAuthChallengeTrigger = new Function(this, 'def-auth-challenge', {
-        buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
         functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-define'),
         functionType: 'customMessageTriggerEvent_defineAuthChallenge',
         executorName: 'customMessageTriggerEvent_defineAuthChallenge',
@@ -117,7 +115,6 @@ export class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock {
 
       if (props.userDirectoryConfig.customAuthRuntime.createAuthChallenge) {
         const createAuthChallengeTrigger = new Function(this, 'create-auth-challenge', {
-          buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
           functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-create'),
           functionType: 'customMessageTriggerEvent_createAuthChallenge',
           executorName: 'customMessageTriggerEvent_createAuthChallenge',
@@ -137,7 +134,6 @@ export class QpqInfCoreUserDirectoryConstruct extends QpqConstructBlock {
 
       if (props.userDirectoryConfig.customAuthRuntime.verifyAuthChallenge) {
         const verifyAuthChallengeTrigger = new Function(this, 'verify-auth-challenge', {
-          buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
           functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cac-verify'),
           functionType: 'customMessageTriggerEvent_verifyAuthChallenge',
           executorName: 'customMessageTriggerEvent_verifyAuthChallenge',

package/src/constructs/feature/core/deployEvents/QpqCoreDeployEventConstruct.ts

@@ -18,7 +18,6 @@ export class QpqCoreDeployEventConstruct extends QpqConstructBlock {
     super(scope, id, props);
 
     const func = new Function(this, props.deployEventConfig.uniqueKey, {
-      buildPath: qpqCoreUtils.getDeployEventFullPath(props.qpqConfig, props.deployEventConfig),
       functionName: this.qpqResourceName(`${props.deployEventConfig.name}`, 'de'),
       functionType: 'eventBridgeEvent_stackDeploy',
       executorName: 'eventBridgeEvent_stackDeploy',

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

@@ -21,7 +21,6 @@ export class QpqApiCoreQueueConstruct extends QpqConstructBlock {
     super(scope, id, props);
 
     const queueFunction = new Function(this, props.queueConfig.uniqueKey, {
-      buildPath: qpqCoreUtils.getQueueEntryFullPath(props.qpqConfig, props.queueConfig),
       functionName: this.resourceName(`${props.queueConfig.uniqueKey}-queue`),
       functionType: 'sqsEvent_queueEvent',
       executorName: 'sqsEvent_queueEvent',

package/src/constructs/feature/core/schedule/QpqCoreRecurringScheduleConstruct.ts

@@ -18,7 +18,6 @@ export class QpqCoreRecurringScheduleConstruct extends QpqConstructBlock {
     super(scope, id, props);
 
     const schedulerFunction = new Function(this, props.scheduleConfig.uniqueKey, {
-      buildPath: qpqCoreUtils.getScheduleEntryFullPath(props.qpqConfig, props.scheduleConfig),
       functionName: this.resourceName(`${props.scheduleConfig.uniqueKey}-SE`),
       functionType: 'eventBridgeEvent_recurringSchedule',
       executorName: 'eventBridgeEvent_recurringSchedule',

package/src/constructs/feature/core/storageDrive/QpqApiCoreStorageDriveConstruct.ts

@@ -26,8 +26,6 @@ export class QpqApiCoreStorageDriveConstruct extends QpqConstructBlock {
 
     if (props.storageDriveConfig.onEvent?.create) {
       const func = new Function(this, 'create', {
-        buildPath: qpqCoreUtils.getStorageDriveEntryFullPath(props.qpqConfig, props.storageDriveConfig),
-
         reacreateOnFunctionNameChange: true,
         functionName: this.qpqResourceName(props.storageDriveConfig.storageDrive, 's3Create'),
 
@@ -54,8 +52,6 @@ export class QpqApiCoreStorageDriveConstruct extends QpqConstructBlock {
 
     if (props.storageDriveConfig.onEvent?.delete) {
       const func = new Function(this, 'delete', {
-        buildPath: qpqCoreUtils.getStorageDriveEntryFullPath(props.qpqConfig, props.storageDriveConfig),
-
         reacreateOnFunctionNameChange: true,
         functionName: this.qpqResourceName(props.storageDriveConfig.storageDrive, 's3Delete'),
 

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

@@ -28,7 +28,6 @@ export class ApiQpqWebserverApiConstruct extends QpqConstructBlock {
 
     // Build Function
     const func = new Function(this, 'api-function', {
-      buildPath: qpqWebServerUtils.getApiEntryFullPath(props.qpqConfig, props.apiConfig),
       functionName: this.resourceName(`${props.apiConfig.apiName}-route`),
       functionType: 'apiGatewayEventHandler',
       executorName: 'apiGatewayEventHandler',

package/src/constructs/feature/webserver/redirect/QpqWebserverSubdomainRedirectConstruct.ts

@@ -25,7 +25,6 @@ export class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock {
     const feature = qpqCoreUtils.getApplicationModuleFeature(props.qpqConfig);
 
     const func = new Function(this, 'redirect', {
-      buildPath: qpqWebServerUtils.getRedirectApiBuildFullPath(props.qpqConfig, props.subdomainRedirectConfig),
       functionName: this.resourceName(`${props.subdomainRedirectConfig.subdomain}-redirect`),
       functionType: 'apiGatewayEventHandler_redirect',
       executorName: 'apiGatewayEventHandler_redirect',

package/src/constructs/feature/webserver/serviceFunction/QpqWebserverServiceFunctionConstruct.ts

@@ -1,12 +1,13 @@
 import { aws_ec2, aws_lambda } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 
-import { ServiceFunctionQPQWebServerConfigSetting, qpqWebServerUtils } from 'quidproquo-webserver';
+import { ServiceFunctionQPQWebServerConfigSetting } from 'quidproquo-webserver';
 
 import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
 
 import { Function } from '../../../basic/Function';
 import { awsNamingUtils } from 'quidproquo-actionprocessor-awslambda';
+import { qpqCoreUtils } from 'quidproquo-core';
 
 export interface QpqWebserverServiceFunctionConstructProps extends QpqConstructBlockProps {
   serviceFunctionConfig: ServiceFunctionQPQWebServerConfigSetting;
@@ -25,7 +26,6 @@ export class QpqWebserverServiceFunctionConstruct extends QpqConstructBlock {
 
     // Build Function
     const func = new Function(this, 'api-function', {
-      buildPath: qpqWebServerUtils.getServiceFunctionFullPath(props.qpqConfig, props.serviceFunctionConfig),
       functionName: this.resourceName(`${props.serviceFunctionConfig.functionName}-sfunc`),
       functionType: 'anyExecuteServiceFunctionEvent_serviceFunction',
       executorName: 'anyExecuteServiceFunctionEvent_serviceFunction',

package/src/constructs/feature/webserver/webEntry/WebQpqWebserverWebEntryConstruct.ts

@@ -25,6 +25,7 @@ import { Construct } from 'constructs';
 
 import * as qpqDeployAwsCdkUtils from '../../../../utils';
 import { QpqWebServerCacheConstruct } from '../cache/QpqWebServerCacheConstruct';
+import { qpqCoreUtils } from 'quidproquo-core';
 
 export interface WebQpqWebserverWebEntryConstructProps extends QpqConstructBlockProps {
   webEntryConfig: WebEntryQPQWebServerConfigSetting;
@@ -210,7 +211,7 @@ export class WebQpqWebserverWebEntryConstruct extends QpqConstructBlock {
 
     // if we have some ~ Build the edge lambdas and deploy
     if (seos.length > 0) {
-      const seoEntryBuildPath = qpqWebServerUtils.getWebEntrySeoFullPath(props.qpqConfig, props.webEntryConfig);
+      const seoEntryBuildPath = qpqCoreUtils.getApiBuildPathFullPath(props.qpqConfig);
 
       const edgeFunctionVR = new aws_cloudfront.experimental.EdgeFunction(this, `SEO-VR`, {
         functionName: this.qpqResourceName(props.webEntryConfig.name, 'SEO-VR'),

package/src/constructs/feature/webserver/websocket/QpqApiWebserverWebsocketConstruct.ts

@@ -35,7 +35,6 @@ export class QpqApiWebserverWebsocketConstruct extends QpqConstructBlock {
     });
 
     const func = new Function(this, 'api-function', {
-      buildPath: qpqWebServerUtils.getWebsocketEntryFullPath(props.qpqConfig, props.websocketConfig),
       functionName: this.resourceName(`${props.websocketConfig.apiName}-ws`),
       functionType: 'apiGatwayEventWebsocketWithIdentity_websocketEvent',
       executorName: 'apiGatwayEventWebsocketWithIdentity_websocketEvent',

package/lib/commonjs/constructs/basic/LogStorage.d.ts

@@ -1,22 +0,0 @@
-import { QPQConfig } from 'quidproquo-core';
-import { Construct } from 'constructs';
-import { aws_s3, aws_iam, aws_dynamodb } from 'aws-cdk-lib';
-import { QpqConstructBlock, QpqConstructBlockProps } from '../base/QpqConstructBlock';
-import { QpqResource } from '../base';
-export interface LogStorageProps extends QpqConstructBlockProps {
-}
-export declare abstract class LogStorageConstructBase extends QpqConstructBlock implements QpqResource {
-    abstract bucket: aws_s3.IBucket;
-    abstract storyResultsTable: aws_dynamodb.ITable;
-    abstract fromStoryResultsTable: aws_dynamodb.ITable;
-    grantRead(grantee: aws_iam.IGrantable): void;
-    grantWrite(grantee: aws_iam.IGrantable): void;
-    grantAll(grantee: aws_iam.IGrantable): void;
-}
-export declare class LogStorage extends QpqConstructBlock {
-    readonly bucket: aws_s3.IBucket;
-    readonly storyResultsTable: aws_dynamodb.ITable;
-    readonly fromStoryResultsTable: aws_dynamodb.ITable;
-    static fromOtherStack(scope: Construct, id: string, qpqConfig: QPQConfig, awsAccountId: string, serviceBucketName: string): QpqResource;
-    constructor(scope: Construct, id: string, props: LogStorageProps);
-}

package/lib/commonjs/constructs/basic/LogStorage.js

@@ -1,117 +0,0 @@
-"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;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogStorage = exports.LogStorageConstructBase = void 0;
-const path_1 = __importDefault(require("path"));
-const aws_cdk_lib_1 = require("aws-cdk-lib");
-const cdk = __importStar(require("aws-cdk-lib"));
-const QpqConstructBlock_1 = require("../base/QpqConstructBlock");
-const constants_1 = require("../../constants");
-const Function_1 = require("./Function");
-class LogStorageConstructBase extends QpqConstructBlock_1.QpqConstructBlock {
-    grantRead(grantee) {
-        this.storyResultsTable.grantReadData(grantee);
-        this.fromStoryResultsTable.grantReadData(grantee);
-        this.bucket.grantRead(grantee);
-    }
-    grantWrite(grantee) {
-        this.storyResultsTable.grantWriteData(grantee);
-        this.fromStoryResultsTable.grantWriteData(grantee);
-        this.bucket.grantWrite(grantee);
-    }
-    grantAll(grantee) {
-        this.grantRead(grantee);
-        this.grantWrite(grantee);
-    }
-}
-exports.LogStorageConstructBase = LogStorageConstructBase;
-class LogStorage extends QpqConstructBlock_1.QpqConstructBlock {
-    static fromOtherStack(scope, id, qpqConfig, awsAccountId, serviceBucketName) {
-        class Import extends LogStorageConstructBase {
-            constructor() {
-                super(...arguments);
-                this.bucket = aws_cdk_lib_1.aws_s3.Bucket.fromBucketName(scope, `${id}-log-storage`, this.qpqResourceName(serviceBucketName, 'log'));
-                this.storyResultsTable = aws_cdk_lib_1.aws_dynamodb.Table.fromTableName(scope, `${id}-log-table`, this.qpqResourceName(serviceBucketName, 'log'));
-                this.fromStoryResultsTable = aws_cdk_lib_1.aws_dynamodb.Table.fromTableName(scope, `${id}-flog-table`, this.qpqResourceName(serviceBucketName, 'flog'));
-            }
-        }
-        return new Import(scope, id, { qpqConfig, awsAccountId });
-    }
-    constructor(scope, id, props) {
-        super(scope, id, props);
-        this.bucket = new aws_cdk_lib_1.aws_s3.Bucket(this, 'bucket', {
-            bucketName: this.qpqResourceName(constants_1.QPQ_LOG_BUCKET_NAME, 'log'),
-            // Disable public access to this bucket
-            publicReadAccess: false,
-            blockPublicAccess: aws_cdk_lib_1.aws_s3.BlockPublicAccess.BLOCK_ALL,
-            // Allow bucket to auto delete upon cdk:Destroy
-            removalPolicy: cdk.RemovalPolicy.DESTROY,
-            autoDeleteObjects: true,
-        });
-        // Time based query over all logs for a given runtimeType
-        const storyResultsTable = new aws_cdk_lib_1.aws_dynamodb.Table(this, 'table', {
-            tableName: this.qpqResourceName(constants_1.QPQ_LOG_BUCKET_NAME, 'log'),
-            partitionKey: { name: 'runtimeType', type: aws_cdk_lib_1.aws_dynamodb.AttributeType.STRING },
-            sortKey: { name: 'startedAtWithCorrelation', type: aws_cdk_lib_1.aws_dynamodb.AttributeType.STRING },
-            billingMode: aws_cdk_lib_1.aws_dynamodb.BillingMode.PAY_PER_REQUEST,
-            removalPolicy: cdk.RemovalPolicy.DESTROY,
-        });
-        // Query by correlation
-        storyResultsTable.addGlobalSecondaryIndex({
-            indexName: 'CorrelationIndex',
-            partitionKey: { name: 'correlation', type: aws_cdk_lib_1.aws_dynamodb.AttributeType.STRING },
-        });
-        // Second table for the from logs ~ Second table because a GSI will dupe the data more then needed
-        // Also, we cant have a GSI on keys that can be undefined, this table will only contain
-        // logs with a fromCorrelation
-        const fromStoryResultsTable = new aws_cdk_lib_1.aws_dynamodb.Table(this, 'from-table', {
-            tableName: this.qpqResourceName(constants_1.QPQ_LOG_BUCKET_NAME, 'flog'),
-            partitionKey: { name: 'fromCorrelation', type: aws_cdk_lib_1.aws_dynamodb.AttributeType.STRING },
-            sortKey: { name: 'startedAtWithCorrelation', type: aws_cdk_lib_1.aws_dynamodb.AttributeType.STRING },
-            billingMode: aws_cdk_lib_1.aws_dynamodb.BillingMode.PAY_PER_REQUEST,
-            removalPolicy: cdk.RemovalPolicy.DESTROY,
-        });
-        this.storyResultsTable = storyResultsTable;
-        this.fromStoryResultsTable = fromStoryResultsTable;
-        // Create a lambda that is trigged when files are written to the bucket
-        const func = new Function_1.Function(this, 'function', {
-            buildPath: path_1.default.join(__dirname, '../..'),
-            functionName: this.qpqResourceName(constants_1.QPQ_LOG_BUCKET_NAME, 'log'),
-            functionType: 'lambdas',
-            executorName: 'executeS3FileWriteEvent',
-            srcFilename: 'lambdaS3FileWriteEvent_log',
-            qpqConfig: props.qpqConfig,
-            awsAccountId: props.awsAccountId,
-        });
-        // Grant the Lambda function read access to the S3 bucket / dynamo table
-        // this.bucket.grantRead(func.lambdaFunction);
-        // storyResultsTable.grantWriteData(func.lambdaFunction);
-        this.bucket.addEventNotification(aws_cdk_lib_1.aws_s3.EventType.OBJECT_CREATED, new aws_cdk_lib_1.aws_s3_notifications.LambdaDestination(func.lambdaFunction));
-    }
-}
-exports.LogStorage = LogStorage;

package/lib/esm/constructs/basic/LogStorage.d.ts

@@ -1,22 +0,0 @@
-import { QPQConfig } from 'quidproquo-core';
-import { Construct } from 'constructs';
-import { aws_s3, aws_iam, aws_dynamodb } from 'aws-cdk-lib';
-import { QpqConstructBlock, QpqConstructBlockProps } from '../base/QpqConstructBlock';
-import { QpqResource } from '../base';
-export interface LogStorageProps extends QpqConstructBlockProps {
-}
-export declare abstract class LogStorageConstructBase extends QpqConstructBlock implements QpqResource {
-    abstract bucket: aws_s3.IBucket;
-    abstract storyResultsTable: aws_dynamodb.ITable;
-    abstract fromStoryResultsTable: aws_dynamodb.ITable;
-    grantRead(grantee: aws_iam.IGrantable): void;
-    grantWrite(grantee: aws_iam.IGrantable): void;
-    grantAll(grantee: aws_iam.IGrantable): void;
-}
-export declare class LogStorage extends QpqConstructBlock {
-    readonly bucket: aws_s3.IBucket;
-    readonly storyResultsTable: aws_dynamodb.ITable;
-    readonly fromStoryResultsTable: aws_dynamodb.ITable;
-    static fromOtherStack(scope: Construct, id: string, qpqConfig: QPQConfig, awsAccountId: string, serviceBucketName: string): QpqResource;
-    constructor(scope: Construct, id: string, props: LogStorageProps);
-}

package/lib/esm/constructs/basic/LogStorage.js

@@ -1,86 +0,0 @@
-import path from 'path';
-import { aws_s3, aws_dynamodb, aws_s3_notifications } from 'aws-cdk-lib';
-import * as cdk from 'aws-cdk-lib';
-import { QpqConstructBlock } from '../base/QpqConstructBlock';
-import { QPQ_LOG_BUCKET_NAME } from '../../constants';
-import { Function } from './Function';
-export class LogStorageConstructBase extends QpqConstructBlock {
-    grantRead(grantee) {
-        this.storyResultsTable.grantReadData(grantee);
-        this.fromStoryResultsTable.grantReadData(grantee);
-        this.bucket.grantRead(grantee);
-    }
-    grantWrite(grantee) {
-        this.storyResultsTable.grantWriteData(grantee);
-        this.fromStoryResultsTable.grantWriteData(grantee);
-        this.bucket.grantWrite(grantee);
-    }
-    grantAll(grantee) {
-        this.grantRead(grantee);
-        this.grantWrite(grantee);
-    }
-}
-export class LogStorage extends QpqConstructBlock {
-    bucket;
-    storyResultsTable;
-    fromStoryResultsTable;
-    static fromOtherStack(scope, id, qpqConfig, awsAccountId, serviceBucketName) {
-        class Import extends LogStorageConstructBase {
-            bucket = aws_s3.Bucket.fromBucketName(scope, `${id}-log-storage`, this.qpqResourceName(serviceBucketName, 'log'));
-            storyResultsTable = aws_dynamodb.Table.fromTableName(scope, `${id}-log-table`, this.qpqResourceName(serviceBucketName, 'log'));
-            fromStoryResultsTable = aws_dynamodb.Table.fromTableName(scope, `${id}-flog-table`, this.qpqResourceName(serviceBucketName, 'flog'));
-        }
-        return new Import(scope, id, { qpqConfig, awsAccountId });
-    }
-    constructor(scope, id, props) {
-        super(scope, id, props);
-        this.bucket = new aws_s3.Bucket(this, 'bucket', {
-            bucketName: this.qpqResourceName(QPQ_LOG_BUCKET_NAME, 'log'),
-            // Disable public access to this bucket
-            publicReadAccess: false,
-            blockPublicAccess: aws_s3.BlockPublicAccess.BLOCK_ALL,
-            // Allow bucket to auto delete upon cdk:Destroy
-            removalPolicy: cdk.RemovalPolicy.DESTROY,
-            autoDeleteObjects: true,
-        });
-        // Time based query over all logs for a given runtimeType
-        const storyResultsTable = new aws_dynamodb.Table(this, 'table', {
-            tableName: this.qpqResourceName(QPQ_LOG_BUCKET_NAME, 'log'),
-            partitionKey: { name: 'runtimeType', type: aws_dynamodb.AttributeType.STRING },
-            sortKey: { name: 'startedAtWithCorrelation', type: aws_dynamodb.AttributeType.STRING },
-            billingMode: aws_dynamodb.BillingMode.PAY_PER_REQUEST,
-            removalPolicy: cdk.RemovalPolicy.DESTROY,
-        });
-        // Query by correlation
-        storyResultsTable.addGlobalSecondaryIndex({
-            indexName: 'CorrelationIndex',
-            partitionKey: { name: 'correlation', type: aws_dynamodb.AttributeType.STRING },
-        });
-        // Second table for the from logs ~ Second table because a GSI will dupe the data more then needed
-        // Also, we cant have a GSI on keys that can be undefined, this table will only contain
-        // logs with a fromCorrelation
-        const fromStoryResultsTable = new aws_dynamodb.Table(this, 'from-table', {
-            tableName: this.qpqResourceName(QPQ_LOG_BUCKET_NAME, 'flog'),
-            partitionKey: { name: 'fromCorrelation', type: aws_dynamodb.AttributeType.STRING },
-            sortKey: { name: 'startedAtWithCorrelation', type: aws_dynamodb.AttributeType.STRING },
-            billingMode: aws_dynamodb.BillingMode.PAY_PER_REQUEST,
-            removalPolicy: cdk.RemovalPolicy.DESTROY,
-        });
-        this.storyResultsTable = storyResultsTable;
-        this.fromStoryResultsTable = fromStoryResultsTable;
-        // Create a lambda that is trigged when files are written to the bucket
-        const func = new Function(this, 'function', {
-            buildPath: path.join(__dirname, '../..'),
-            functionName: this.qpqResourceName(QPQ_LOG_BUCKET_NAME, 'log'),
-            functionType: 'lambdas',
-            executorName: 'executeS3FileWriteEvent',
-            srcFilename: 'lambdaS3FileWriteEvent_log',
-            qpqConfig: props.qpqConfig,
-            awsAccountId: props.awsAccountId,
-        });
-        // Grant the Lambda function read access to the S3 bucket / dynamo table
-        // this.bucket.grantRead(func.lambdaFunction);
-        // storyResultsTable.grantWriteData(func.lambdaFunction);
-        this.bucket.addEventNotification(aws_s3.EventType.OBJECT_CREATED, new aws_s3_notifications.LambdaDestination(func.lambdaFunction));
-    }
-}

package/src/constructs/basic/LogStorage.ts

@@ -1,140 +0,0 @@
-import path from 'path';
-
-import { QPQConfig } from 'quidproquo-core';
-import { Construct } from 'constructs';
-import { aws_s3, aws_iam, aws_dynamodb, aws_s3_notifications } from 'aws-cdk-lib';
-import * as cdk from 'aws-cdk-lib';
-
-import { QpqConstructBlock, QpqConstructBlockProps } from '../base/QpqConstructBlock';
-import { QpqResource } from '../base';
-import { QPQ_LOG_BUCKET_NAME } from '../../constants';
-import { Function } from './Function';
-// import { qpqWebServerUtils } from '../../utils';
-
-export interface LogStorageProps extends QpqConstructBlockProps {}
-
-export abstract class LogStorageConstructBase extends QpqConstructBlock implements QpqResource {
-  abstract bucket: aws_s3.IBucket;
-  abstract storyResultsTable: aws_dynamodb.ITable;
-  abstract fromStoryResultsTable: aws_dynamodb.ITable;
-
-  public grantRead(grantee: aws_iam.IGrantable): void {
-    this.storyResultsTable.grantReadData(grantee);
-    this.fromStoryResultsTable.grantReadData(grantee);
-    this.bucket.grantRead(grantee);
-  }
-
-  public grantWrite(grantee: aws_iam.IGrantable): void {
-    this.storyResultsTable.grantWriteData(grantee);
-    this.fromStoryResultsTable.grantWriteData(grantee);
-    this.bucket.grantWrite(grantee);
-  }
-
-  public grantAll(grantee: aws_iam.IGrantable): void {
-    this.grantRead(grantee);
-    this.grantWrite(grantee);
-  }
-}
-
-export class LogStorage extends QpqConstructBlock {
-  public readonly bucket: aws_s3.IBucket;
-  public readonly storyResultsTable: aws_dynamodb.ITable;
-  public readonly fromStoryResultsTable: aws_dynamodb.ITable;
-
-  static fromOtherStack(
-    scope: Construct,
-    id: string,
-    qpqConfig: QPQConfig,
-    awsAccountId: string,
-    serviceBucketName: string,
-  ): QpqResource {
-    class Import extends LogStorageConstructBase {
-      bucket = aws_s3.Bucket.fromBucketName(
-        scope,
-        `${id}-log-storage`,
-        this.qpqResourceName(serviceBucketName, 'log'),
-      );
-
-      storyResultsTable = aws_dynamodb.Table.fromTableName(
-        scope,
-        `${id}-log-table`,
-        this.qpqResourceName(serviceBucketName, 'log'),
-      );
-
-      fromStoryResultsTable = aws_dynamodb.Table.fromTableName(
-        scope,
-        `${id}-flog-table`,
-        this.qpqResourceName(serviceBucketName, 'flog'),
-      );
-    }
-
-    return new Import(scope, id, { qpqConfig, awsAccountId });
-  }
-
-  constructor(scope: Construct, id: string, props: LogStorageProps) {
-    super(scope, id, props);
-
-    this.bucket = new aws_s3.Bucket(this, 'bucket', {
-      bucketName: this.qpqResourceName(QPQ_LOG_BUCKET_NAME, 'log'),
-
-      // Disable public access to this bucket
-      publicReadAccess: false,
-      blockPublicAccess: aws_s3.BlockPublicAccess.BLOCK_ALL,
-
-      // Allow bucket to auto delete upon cdk:Destroy
-      removalPolicy: cdk.RemovalPolicy.DESTROY,
-      autoDeleteObjects: true,
-    });
-
-    // Time based query over all logs for a given runtimeType
-    const storyResultsTable = new aws_dynamodb.Table(this, 'table', {
-      tableName: this.qpqResourceName(QPQ_LOG_BUCKET_NAME, 'log'),
-      partitionKey: { name: 'runtimeType', type: aws_dynamodb.AttributeType.STRING },
-      sortKey: { name: 'startedAtWithCorrelation', type: aws_dynamodb.AttributeType.STRING },
-      billingMode: aws_dynamodb.BillingMode.PAY_PER_REQUEST,
-      removalPolicy: cdk.RemovalPolicy.DESTROY,
-    });
-
-    // Query by correlation
-    storyResultsTable.addGlobalSecondaryIndex({
-      indexName: 'CorrelationIndex',
-      partitionKey: { name: 'correlation', type: aws_dynamodb.AttributeType.STRING },
-    });
-
-    // Second table for the from logs ~ Second table because a GSI will dupe the data more then needed
-    // Also, we cant have a GSI on keys that can be undefined, this table will only contain
-    // logs with a fromCorrelation
-    const fromStoryResultsTable = new aws_dynamodb.Table(this, 'from-table', {
-      tableName: this.qpqResourceName(QPQ_LOG_BUCKET_NAME, 'flog'),
-      partitionKey: { name: 'fromCorrelation', type: aws_dynamodb.AttributeType.STRING },
-      sortKey: { name: 'startedAtWithCorrelation', type: aws_dynamodb.AttributeType.STRING },
-      billingMode: aws_dynamodb.BillingMode.PAY_PER_REQUEST,
-      removalPolicy: cdk.RemovalPolicy.DESTROY,
-    });
-
-    this.storyResultsTable = storyResultsTable;
-    this.fromStoryResultsTable = fromStoryResultsTable;
-
-    // Create a lambda that is trigged when files are written to the bucket
-    const func = new Function(this, 'function', {
-      buildPath: path.join(__dirname, '../..'),
-      functionName: this.qpqResourceName(QPQ_LOG_BUCKET_NAME, 'log'),
-      functionType: 'lambdas',
-      executorName: 'executeS3FileWriteEvent',
-      srcFilename: 'lambdaS3FileWriteEvent_log',
-
-      qpqConfig: props.qpqConfig,
-
-      awsAccountId: props.awsAccountId,
-    });
-
-    // Grant the Lambda function read access to the S3 bucket / dynamo table
-    // this.bucket.grantRead(func.lambdaFunction);
-    // storyResultsTable.grantWriteData(func.lambdaFunction);
-
-    this.bucket.addEventNotification(
-      aws_s3.EventType.OBJECT_CREATED,
-      new aws_s3_notifications.LambdaDestination(func.lambdaFunction),
-    );
-  }
-}