quidproquo-deploy-awscdk 0.0.147 → 0.0.149

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

@@ -7,6 +7,7 @@ const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const SubdomainName_1 = require("../../../basic/SubdomainName");
 const Function_1 = require("../../../basic/Function");
+const CloudflareDnsRecord_1 = require("../../../basic/CloudflareDnsRecord");
 class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock_1.QpqConstructBlock {
     constructor(scope, id, props) {
         super(scope, id, props);
@@ -44,6 +45,17 @@ class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock_1.QpqCons
             qpqConfig: props.qpqConfig,
             awsAccountId: props.awsAccountId,
         });
+        if (props.subdomainRedirectConfig.cloudflareApiKeySecretName) {
+            new CloudflareDnsRecord_1.CloudflareDnsRecord(this, 'certFlare', {
+                awsAccountId: props.awsAccountId,
+                buildPath: quidproquo_webserver_1.qpqWebServerUtils.getRedirectApiBuildFullPath(props.qpqConfig, props.subdomainRedirectConfig),
+                qpqConfig: props.qpqConfig,
+                // certificateArn: subdomain.certificate.certificateArn,
+                certificateDomain: serviceDomainName.deployDomain,
+                dnsEntries: {},
+                apiSecretName: props.subdomainRedirectConfig.cloudflareApiKeySecretName,
+            });
+        }
         // Map all requests to this service to /serviceName/*
         new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, 'base-path-mapping', {
             domainName: serviceDomainName.domainName,
@@ -51,6 +63,21 @@ class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock_1.QpqCons
             // the properties below are optional
             // basePath: settings.service,
         });
+        if (props.subdomainRedirectConfig.cloudflareApiKeySecretName) {
+            new CloudflareDnsRecord_1.CloudflareDnsRecord(this, 'cloudflare', {
+                awsAccountId: props.awsAccountId,
+                buildPath: quidproquo_webserver_1.qpqWebServerUtils.getRedirectApiBuildFullPath(props.qpqConfig, props.subdomainRedirectConfig),
+                qpqConfig: props.qpqConfig,
+                dnsEntries: {
+                    [serviceDomainName.deployDomain]: {
+                        value: serviceDomainName.domainName.domainNameAliasDomainName,
+                        proxied: true,
+                        type: 'CNAME',
+                    },
+                },
+                apiSecretName: props.subdomainRedirectConfig.cloudflareApiKeySecretName,
+            });
+        }
     }
 }
 exports.QpqWebserverSubdomainRedirectConstruct = QpqWebserverSubdomainRedirectConstruct;

package/lib/commonjs/lambdas/lambdaAPIGatewayEvent_redirect.js

@@ -11,13 +11,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeAPIGatewayEvent = void 0;
 const executeAPIGatewayEvent = (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+    // console.log('event: ', JSON.stringify(event, null, 2));
+    // console.log('process.env: ', JSON.stringify(process.env, null, 2));
     const redirectConfig = JSON.parse(process.env.redirectConfig);
     // For direct urls ~ Go straight to the url
     let redirectUrl = redirectConfig.redirectUrl;
     // Otherwise it must be a domain redirect
     if (!redirectConfig.redirectUrl.startsWith('http')) {
         const environment = JSON.parse(process.env.environment);
-        const featureEnvironment = JSON.parse(process.env.featureEnvironment);
+        const featureEnvironment = JSON.parse(process.env.featureEnvironment || '""');
         let baseDomain = redirectConfig.redirectUrl;
         if (redirectConfig.addEnvironment) {
             baseDomain = `${environment}.${baseDomain}`;

package/lib/commonjs/stacks/ApiQpqServiceStack.js

@@ -38,7 +38,7 @@ class ApiQpqServiceStack extends QpqServiceStack_1.QpqServiceStack {
             queueConfig: setting,
             apiLayerVersions: layers.layers,
         }));
-        // Queues
+        // Redirects
         const redirects = quidproquo_webserver_1.qpqWebServerUtils.getSubdomainRedirects(props.qpqConfig).map((setting) => new constructs_1.QpqWebserverSubdomainRedirectConstruct(this, quidproquo_core_1.qpqCoreUtils.getUniqueKeyForSetting(setting), {
             awsAccountId: props.awsAccountId,
             qpqConfig: props.qpqConfig,

package/package.json

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

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

@@ -15,6 +15,7 @@ import { SubdomainName } from '../../../basic/SubdomainName';
 
 import { Function } from '../../../basic/Function';
 import * as qpqDeployAwsCdkUtils from '../../../../utils';
+import { CloudflareDnsRecord } from '../../../basic/CloudflareDnsRecord';
 
 export interface QpqWebserverSubdomainRedirectConstructProps extends QpqConstructBlockProps {
   subdomainRedirectConfig: SubdomainRedirectQPQWebServerConfigSetting;
@@ -69,6 +70,23 @@ export class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock {
       awsAccountId: props.awsAccountId,
     });
 
+    if (props.subdomainRedirectConfig.cloudflareApiKeySecretName) {
+      new CloudflareDnsRecord(this, 'certFlare', {
+        awsAccountId: props.awsAccountId,
+        buildPath: qpqWebServerUtils.getRedirectApiBuildFullPath(
+          props.qpqConfig,
+          props.subdomainRedirectConfig,
+        ),
+        qpqConfig: props.qpqConfig,
+
+        // certificateArn: subdomain.certificate.certificateArn,
+        certificateDomain: serviceDomainName.deployDomain,
+
+        dnsEntries: {},
+        apiSecretName: props.subdomainRedirectConfig.cloudflareApiKeySecretName,
+      });
+    }
+
     // Map all requests to this service to /serviceName/*
     new aws_apigateway.BasePathMapping(this, 'base-path-mapping', {
       domainName: serviceDomainName.domainName,
@@ -77,5 +95,25 @@ export class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock {
       // the properties below are optional
       // basePath: settings.service,
     });
+
+    if (props.subdomainRedirectConfig.cloudflareApiKeySecretName) {
+      new CloudflareDnsRecord(this, 'cloudflare', {
+        awsAccountId: props.awsAccountId,
+        buildPath: qpqWebServerUtils.getRedirectApiBuildFullPath(
+          props.qpqConfig,
+          props.subdomainRedirectConfig,
+        ),
+        qpqConfig: props.qpqConfig,
+
+        dnsEntries: {
+          [serviceDomainName.deployDomain]: {
+            value: serviceDomainName.domainName.domainNameAliasDomainName,
+            proxied: true,
+            type: 'CNAME',
+          },
+        },
+        apiSecretName: props.subdomainRedirectConfig.cloudflareApiKeySecretName,
+      });
+    }
   }
 }

package/src/lambdas/lambdaAPIGatewayEvent_redirect.ts

@@ -2,6 +2,9 @@ import { APIGatewayEvent, Context } from 'aws-lambda';
 import { SubdomainRedirectQPQWebServerConfigSetting } from 'quidproquo-webserver';
 
 export const executeAPIGatewayEvent = async (event: APIGatewayEvent, context: Context) => {
+  // console.log('event: ', JSON.stringify(event, null, 2));
+  // console.log('process.env: ', JSON.stringify(process.env, null, 2));
+
   const redirectConfig: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
     process.env.redirectConfig as string,
   );
@@ -14,8 +17,9 @@ export const executeAPIGatewayEvent = async (event: APIGatewayEvent, context: Co
     const environment: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
       process.env.environment as string,
     );
+
     const featureEnvironment: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
-      process.env.featureEnvironment as string,
+      (process.env.featureEnvironment as string | undefined) || '""',
     );
 
     let baseDomain = redirectConfig.redirectUrl;

package/src/stacks/ApiQpqServiceStack.ts

@@ -14,7 +14,7 @@ import {
   QpqWebserverServiceFunctionConstruct,
   QpqApiWebserverWebsocketConstruct,
   QpqCoreDeployEventConstruct,
-  QpqApiCoreStorageDriveConstruct
+  QpqApiCoreStorageDriveConstruct,
 } from '../constructs';
 
 export interface ApiQpqServiceStackProps extends QpqServiceStackProps {
@@ -72,7 +72,7 @@ export class ApiQpqServiceStack extends QpqServiceStack {
         }),
     );
 
-    // Queues
+    // Redirects
     const redirects = qpqWebServerUtils.getSubdomainRedirects(props.qpqConfig).map(
       (setting) =>
         new QpqWebserverSubdomainRedirectConstruct(
@@ -103,8 +103,8 @@ export class ApiQpqServiceStack extends QpqServiceStack {
         ),
     );
 
-     // Build websocket apis
-     const websockets = qpqWebServerUtils.getWebsocketSettings(props.qpqConfig).map(
+    // Build websocket apis
+    const websockets = qpqWebServerUtils.getWebsocketSettings(props.qpqConfig).map(
       (setting) =>
         new QpqApiWebserverWebsocketConstruct(this, qpqCoreUtils.getUniqueKeyForSetting(setting), {
           awsAccountId: props.awsAccountId,