quidproquo-deploy-awscdk 0.0.26 → 0.0.28

package/lib/DeploymentSettings.d.ts

@@ -1,6 +1,4 @@
 import { QPQConfig } from 'quidproquo-core';
-import { DeploymentType } from './DeploymentType';
 export interface DeploymentSettings {
-    environment: DeploymentType;
     qpqConfig: QPQConfig;
 }

package/lib/QPQPrototypeSingleServiceStack.js

@@ -29,16 +29,8 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
 const cdk = __importStar(require("aws-cdk-lib"));
 const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_webserver_1 = require("quidproquo-webserver");
-const DeploymentType_1 = require("./DeploymentType");
-const getEnvironmentDomain = (stackProps) => {
-    const apexDomain = quidproquo_webserver_1.qpqWebServerUtils.getDomainName(stackProps.qpqConfig);
-    if (stackProps.environment === DeploymentType_1.DeploymentType.Prod) {
-        return apexDomain;
-    }
-    return `${stackProps.environment}.${apexDomain}`;
-};
 const createApiDomainName = (stack, id, stackProps) => {
-    const apexDomain = getEnvironmentDomain(stackProps);
+    const apexDomain = quidproquo_webserver_1.qpqWebServerUtils.getFeatureDomainName(stackProps.qpqConfig);
     const apiDomainName = `api.${apexDomain}`;
     const apexHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(stack, `${id}-apex-hostedZone`, {
         domainName: apexDomain,
@@ -62,11 +54,12 @@ const createApiDomainName = (stack, id, stackProps) => {
     return domainName;
 };
 const createWebDistribution = (stack, id, stackProps) => {
-    const apexDomain = getEnvironmentDomain(stackProps);
+    const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(stackProps.qpqConfig);
+    const apexDomain = quidproquo_webserver_1.qpqWebServerUtils.getFeatureDomainName(stackProps.qpqConfig);
     const serviceName = quidproquo_core_1.qpqCoreUtils.getAppName(stackProps.qpqConfig);
     // create an s3 bucket
     const staticWebFilesBucket = new aws_cdk_lib_1.aws_s3.Bucket(stack, `${id}-web`, {
-        bucketName: `${serviceName}-${stackProps.environment}-web`,
+        bucketName: `${serviceName}-${environment}-web`,
         // Disable public access to this bucket, CloudFront will do that
         publicReadAccess: false,
         blockPublicAccess: aws_cdk_lib_1.aws_s3.BlockPublicAccess.BLOCK_ALL,
@@ -152,7 +145,7 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
             },
         });
         const settings = {
-            environment: props.environment,
+            environment: quidproquo_core_1.qpqCoreUtils.getAppFeature(props.qpqConfig),
             service: quidproquo_core_1.qpqCoreUtils.getAppName(props.qpqConfig),
         };
         const domainName = createApiDomainName(this, id, props);
@@ -260,7 +253,7 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
                 functionName: `SE-${index}-${se.runtime}-${settings.environment}-${settings.service}`,
                 entry: props.lambdaEventBridgeEventPath ||
                     path.resolve(__dirname, 'lambdas', 'lambdaEventBridgeEvent.js'),
-                handler: 'execute',
+                handler: 'executeEventBridgeEvent',
                 timeout: cdk.Duration.minutes(15),
                 runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
                 // layers: [BLLayer],

package/lib/lambdas/lambdaAPIGatewayEvent.js

@@ -51,6 +51,7 @@ const getAPIGatewayEventExecutor = (getCustomActionProcessors = () => ({})) => {
         const result = yield resolveStory(quidproquo_core_1.askProcessEvent, [event, context]);
         // // Run the callback
         if (!result.error) {
+            console.log(result.result);
             return {
                 statusCode: result.result.statusCode,
                 body: JSON.stringify(result.result.body),

package/lib/utils.js

@@ -4,6 +4,7 @@ exports.getStackName = void 0;
 const quidproquo_core_1 = require("quidproquo-core");
 const getStackName = (deploymentSettings) => {
     const appName = quidproquo_core_1.qpqCoreUtils.getAppName(deploymentSettings.qpqConfig);
-    return `${appName}-${deploymentSettings.environment}`;
+    const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(deploymentSettings.qpqConfig);
+    return `${appName}-${environment}`;
 };
 exports.getStackName = getStackName;

package/package.json

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