quidproquo-deploy-awscdk 0.0.78 → 0.0.80

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

@@ -1,68 +1,46 @@
 "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.QpqWebserverSubdomainRedirectConstruct = void 0;
-const path_1 = __importDefault(require("path"));
-const cdk = __importStar(require("aws-cdk-lib"));
 const quidproquo_core_1 = require("quidproquo-core");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
 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");
 class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock_1.QpqConstructBlock {
     constructor(scope, id, props) {
         super(scope, id, props);
-        const buildPath = quidproquo_core_1.qpqCoreUtils.getBuildPath(props.qpqConfig);
         const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(props.qpqConfig);
-        const redirectLambda = new aws_cdk_lib_1.aws_lambda.Function(this, 'lambda', {
-            functionName: this.resourceName(`redirect-${props.subdomainRedirectConfig.subdomain}`),
-            timeout: cdk.Duration.seconds(25),
-            runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_18_X,
-            memorySize: 128,
-            code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path_1.default.join(buildPath, 'lambdaAPIGatewayEvent_redirect')),
-            handler: 'index.executeAPIGatewayEvent',
+        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: 'lambdaAPIGatewayEvent_redirect',
+            executorName: 'executeAPIGatewayEvent',
+            qpqConfig: props.qpqConfig,
             environment: {
                 redirectConfig: JSON.stringify(props.subdomainRedirectConfig),
                 environment: JSON.stringify(environment),
+                featureEnvironment: JSON.stringify(feature),
             },
+            awsAccountId: props.awsAccountId,
         });
         const restApi = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, 'rest-api', {
             restApiName: this.resourceName(`${props.subdomainRedirectConfig.subdomain}-redirect`),
-            handler: redirectLambda,
+            handler: func.lambdaFunction,
             deployOptions: {
                 loggingLevel: aws_cdk_lib_1.aws_apigateway.MethodLoggingLevel.INFO,
                 dataTraceEnabled: true,
             },
             proxy: true,
         });
-        // TODO: Fix this
+        // www.service.domain.com or www.domain.com
+        const apexDomain = props.subdomainRedirectConfig.onRootDomain
+            ? quidproquo_webserver_1.qpqWebServerUtils.getBaseDomainName(props.qpqConfig)
+            : quidproquo_webserver_1.qpqWebServerUtils.getServiceDomainName(props.qpqConfig);
         const serviceDomainName = new SubdomainName_1.SubdomainName(this, 'service-domain-name', {
             subdomain: props.subdomainRedirectConfig.subdomain,
-            apexDomain: '',
+            apexDomain,
             qpqConfig: props.qpqConfig,
             awsAccountId: props.awsAccountId,
         });

package/lib/constructs/feature/webserver/webEntry/QpqWebserverWebEntryConstruct.js

@@ -110,6 +110,7 @@ class QpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBloc
             defaultBehavior: {
                 origin: distributionOrigin,
                 cachePolicy: cachePolicy,
+                viewerProtocolPolicy: aws_cdk_lib_1.aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
             },
             domainNames: [deployDomain],
             certificate: myCertificate,
@@ -121,6 +122,11 @@ class QpqWebserverWebEntryConstruct extends QpqConstructBlock_1.QpqConstructBloc
                 responsePagePath: '/',
             })),
         });
+        props.webEntryConfig.ignoreCache.forEach((pathPattern) => {
+            distribution.addBehavior(pathPattern, distributionOrigin, {
+                cachePolicy: aws_cdk_lib_1.aws_cloudfront.CachePolicy.CACHING_DISABLED,
+            });
+        });
         // TODO: Fix this when they add l2 support for origin access control settings
         // Currently distribution don't have support for origin access control settings
         // So we manually add it.

package/lib/lambdas/lambdaAPIGatewayEvent_redirect.js

@@ -13,26 +13,25 @@ exports.executeAPIGatewayEvent = void 0;
 const executeAPIGatewayEvent = (event, context) => __awaiter(void 0, void 0, void 0, function* () {
     const redirectConfig = JSON.parse(process.env.redirectConfig);
     // For direct urls ~ Go straight to the url
-    if (redirectConfig.redirectUrl.startsWith('http')) {
-        return {
-            statusCode: 301,
-            body: '',
-            headers: {
-                Location: redirectConfig.redirectUrl,
-            },
-        };
-    }
+    let redirectUrl = redirectConfig.redirectUrl;
     // Otherwise it must be a domain redirect
-    const environment = JSON.parse(process.env.environment);
-    const baseDomain = redirectConfig.addFeatureEnvironment
-        ? `${environment}.${redirectConfig.redirectUrl}`
-        : redirectConfig.redirectUrl;
-    const fullUrl = `https://${baseDomain}${event.path}`;
+    if (!redirectConfig.redirectUrl.startsWith('http')) {
+        const environment = JSON.parse(process.env.environment);
+        const featureEnvironment = JSON.parse(process.env.featureEnvironment);
+        let baseDomain = redirectConfig.redirectUrl;
+        if (redirectConfig.addEnvironment) {
+            baseDomain = `${environment}.${baseDomain}`;
+        }
+        if (redirectConfig.addFeatureEnvironment && featureEnvironment) {
+            baseDomain = `${featureEnvironment}.${baseDomain}`;
+        }
+        redirectUrl = `https://${baseDomain}${event.path}`;
+    }
     return {
         statusCode: 301,
         body: '',
         headers: {
-            Location: fullUrl,
+            Location: redirectUrl,
         },
     };
 });

package/lib/stacks/ApiQpqServiceStack.js

@@ -37,6 +37,12 @@ class ApiQpqServiceStack extends QpqServiceStack_1.QpqServiceStack {
             queueConfig: setting,
             apiLayerVersions: layers.layers,
         }));
+        // Queues
+        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,
+            subdomainRedirectConfig: setting,
+        }));
     }
 }
 exports.ApiQpqServiceStack = ApiQpqServiceStack;

package/package.json

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

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

@@ -2,7 +2,10 @@ import path from 'path';
 import * as cdk from 'aws-cdk-lib';
 
 import { qpqCoreUtils } from 'quidproquo-core';
-import { SubdomainRedirectQPQWebServerConfigSetting } from 'quidproquo-webserver';
+import {
+  SubdomainRedirectQPQWebServerConfigSetting,
+  qpqWebServerUtils,
+} from 'quidproquo-webserver';
 
 import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
 
@@ -10,6 +13,9 @@ import { Construct } from 'constructs';
 import { aws_lambda, aws_apigateway } from 'aws-cdk-lib';
 import { SubdomainName } from '../../../basic/SubdomainName';
 
+import { Function } from '../../../basic/Function';
+import * as qpqDeployAwsCdkUtils from '../../../../utils';
+
 export interface QpqWebserverSubdomainRedirectConstructProps extends QpqConstructBlockProps {
   subdomainRedirectConfig: SubdomainRedirectQPQWebServerConfigSetting;
 }
@@ -18,28 +24,32 @@ export class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock {
   constructor(scope: Construct, id: string, props: QpqWebserverSubdomainRedirectConstructProps) {
     super(scope, id, props);
 
-    const buildPath = qpqCoreUtils.getBuildPath(props.qpqConfig);
     const environment = qpqCoreUtils.getApplicationModuleEnvironment(props.qpqConfig);
+    const feature = qpqCoreUtils.getApplicationModuleFeature(props.qpqConfig);
 
-    const redirectLambda = new aws_lambda.Function(this, 'lambda', {
-      functionName: this.resourceName(`redirect-${props.subdomainRedirectConfig.subdomain}`),
-      timeout: cdk.Duration.seconds(25),
-
-      runtime: aws_lambda.Runtime.NODEJS_18_X,
-      memorySize: 128,
+    const func = new Function(this, 'redirect', {
+      buildPath: qpqWebServerUtils.getRedirectApiBuildFullPath(
+        props.qpqConfig,
+        props.subdomainRedirectConfig,
+      ),
+      functionName: this.resourceName(`${props.subdomainRedirectConfig.subdomain}-redirect`),
+      functionType: 'lambdaAPIGatewayEvent_redirect',
+      executorName: 'executeAPIGatewayEvent',
 
-      code: aws_lambda.Code.fromAsset(path.join(buildPath, 'lambdaAPIGatewayEvent_redirect')),
-      handler: 'index.executeAPIGatewayEvent',
+      qpqConfig: props.qpqConfig,
 
       environment: {
         redirectConfig: JSON.stringify(props.subdomainRedirectConfig),
         environment: JSON.stringify(environment),
+        featureEnvironment: JSON.stringify(feature),
       },
+
+      awsAccountId: props.awsAccountId,
     });
 
     const restApi = new aws_apigateway.LambdaRestApi(this, 'rest-api', {
       restApiName: this.resourceName(`${props.subdomainRedirectConfig.subdomain}-redirect`),
-      handler: redirectLambda,
+      handler: func.lambdaFunction,
       deployOptions: {
         loggingLevel: aws_apigateway.MethodLoggingLevel.INFO,
         dataTraceEnabled: true,
@@ -47,10 +57,14 @@ export class QpqWebserverSubdomainRedirectConstruct extends QpqConstructBlock {
       proxy: true,
     });
 
-    // TODO: Fix this
+    // www.service.domain.com or www.domain.com
+    const apexDomain = props.subdomainRedirectConfig.onRootDomain
+      ? qpqWebServerUtils.getBaseDomainName(props.qpqConfig)
+      : qpqWebServerUtils.getServiceDomainName(props.qpqConfig);
+
     const serviceDomainName = new SubdomainName(this, 'service-domain-name', {
       subdomain: props.subdomainRedirectConfig.subdomain,
-      apexDomain: '',
+      apexDomain,
       qpqConfig: props.qpqConfig,
       awsAccountId: props.awsAccountId,
     });

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

@@ -131,6 +131,7 @@ export class QpqWebserverWebEntryConstruct extends QpqConstructBlock {
       defaultBehavior: {
         origin: distributionOrigin,
         cachePolicy: cachePolicy,
+        viewerProtocolPolicy: aws_cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
       },
       domainNames: [deployDomain],
       certificate: myCertificate,
@@ -144,6 +145,12 @@ export class QpqWebserverWebEntryConstruct extends QpqConstructBlock {
       })),
     });
 
+    props.webEntryConfig.ignoreCache.forEach((pathPattern) => {
+      distribution.addBehavior(pathPattern, distributionOrigin, {
+        cachePolicy: aws_cloudfront.CachePolicy.CACHING_DISABLED,
+      });
+    });
+
     // TODO: Fix this when they add l2 support for origin access control settings
 
     // Currently distribution don't have support for origin access control settings

package/src/lambdas/lambdaAPIGatewayEvent_redirect.ts

@@ -7,31 +7,33 @@ export const executeAPIGatewayEvent = async (event: APIGatewayEvent, context: Co
   );
 
   // For direct urls ~ Go straight to the url
-  if (redirectConfig.redirectUrl.startsWith('http')) {
-    return {
-      statusCode: 301,
-      body: '',
-      headers: {
-        Location: redirectConfig.redirectUrl,
-      },
-    };
-  }
+  let redirectUrl = redirectConfig.redirectUrl;
 
   // Otherwise it must be a domain redirect
-  const environment: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
-    process.env.environment as string,
-  );
-  const baseDomain = redirectConfig.addFeatureEnvironment
-    ? `${environment}.${redirectConfig.redirectUrl}`
-    : redirectConfig.redirectUrl;
+  if (!redirectConfig.redirectUrl.startsWith('http')) {
+    const environment: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
+      process.env.environment as string,
+    );
+    const featureEnvironment: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
+      process.env.featureEnvironment as string,
+    );
 
-  const fullUrl = `https://${baseDomain}${event.path}`;
+    let baseDomain = redirectConfig.redirectUrl;
+    if (redirectConfig.addEnvironment) {
+      baseDomain = `${environment}.${baseDomain}`;
+    }
+    if (redirectConfig.addFeatureEnvironment && featureEnvironment) {
+      baseDomain = `${featureEnvironment}.${baseDomain}`;
+    }
+
+    redirectUrl = `https://${baseDomain}${event.path}`;
+  }
 
   return {
     statusCode: 301,
     body: '',
     headers: {
-      Location: fullUrl,
+      Location: redirectUrl,
     },
   };
 };

package/src/stacks/ApiQpqServiceStack.ts

@@ -11,6 +11,7 @@ import {
   QpqCoreRecurringScheduleConstruct,
   QpqWebserverApiConstruct,
   QpqApiCoreQueueConstruct,
+  QpqWebserverSubdomainRedirectConstruct,
 } from '../constructs';
 
 export interface ApiQpqServiceStackProps extends QpqServiceStackProps {
@@ -68,5 +69,20 @@ export class ApiQpqServiceStack extends QpqServiceStack {
           apiLayerVersions: layers.layers,
         }),
     );
+
+    // Queues
+    const redirects = qpqWebServerUtils.getSubdomainRedirects(props.qpqConfig).map(
+      (setting) =>
+        new QpqWebserverSubdomainRedirectConstruct(
+          this,
+          qpqCoreUtils.getUniqueKeyForSetting(setting),
+          {
+            awsAccountId: props.awsAccountId,
+            qpqConfig: props.qpqConfig,
+
+            subdomainRedirectConfig: setting,
+          },
+        ),
+    );
   }
 }