quidproquo-deploy-awscdk 0.0.49 → 0.0.51

package/lib/QPQPrototypeSingleServiceStack.js

@@ -50,24 +50,24 @@ const createServiceParameter = (stack, id, service, environment, parameterKey, v
         }),
     };
 };
-const createApiDomainName = (stack, id, stackProps) => {
+const createApiDomainName = (stack, id, stackProps, subdomain) => {
     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`, {
+    const apiDomainName = `${subdomain}.${apexDomain}`;
+    const apexHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(stack, `${id}-hostedZone-${subdomain}`, {
         domainName: apexDomain,
     });
-    const certificate = new aws_cdk_lib_1.aws_certificatemanager.Certificate(stack, `${id}-api-certificate`, {
+    const certificate = new aws_cdk_lib_1.aws_certificatemanager.Certificate(stack, `${id}-${subdomain}-certificate`, {
         domainName: apiDomainName,
-        certificateName: `api-cert-${quidproquo_core_1.qpqCoreUtils.getAppName(stackProps.qpqConfig)}`,
+        certificateName: `${subdomain}-cert-${quidproquo_core_1.qpqCoreUtils.getAppName(stackProps.qpqConfig)}`,
         validation: aws_cdk_lib_1.aws_certificatemanager.CertificateValidation.fromDns(apexHostedZone),
     });
-    const domainName = new aws_cdk_lib_1.aws_apigateway.DomainName(stack, `${id}-api-custom-domain`, {
+    const domainName = new aws_cdk_lib_1.aws_apigateway.DomainName(stack, `${id}-${subdomain}-custom-domain`, {
         domainName: apiDomainName,
         certificate,
         securityPolicy: aws_cdk_lib_1.aws_apigateway.SecurityPolicy.TLS_1_2,
         endpointType: aws_cdk_lib_1.aws_apigateway.EndpointType.REGIONAL,
     });
-    new aws_cdk_lib_1.aws_route53.ARecord(stack, `${id}-a-record`, {
+    new aws_cdk_lib_1.aws_route53.ARecord(stack, `${id}-a-record-${subdomain}`, {
         zone: apexHostedZone,
         recordName: apiDomainName,
         target: aws_cdk_lib_1.aws_route53.RecordTarget.fromAlias(new aws_cdk_lib_1.aws_route53_targets.ApiGatewayDomain(domainName)),
@@ -204,7 +204,7 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
             environment: quidproquo_core_1.qpqCoreUtils.getAppFeature(props.qpqConfig),
             service: quidproquo_core_1.qpqCoreUtils.getAppName(props.qpqConfig),
         };
-        const domainName = createApiDomainName(this, id, props);
+        const domainName = createApiDomainName(this, id, props, 'api');
         const resourceName = (name) => {
             return `${settings.service}-${settings.environment}-${name}`;
         };
@@ -258,8 +258,8 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         // Finished building resources, now we can build the lambdas
         ////////////////////////////////////////////////////////////////////////////////////
         createWebDistribution(this, `${id}-web-dist`, props, ownedResourceSettings);
-        const customLayers = (props.layers || []).map((layer, index) => {
-            const layerName = `${layer.split('/').pop()}-${index}-${settings.environment}-${settings.service}`;
+        const customLayers = (props.layers || []).map((layer) => {
+            const layerName = `${layer.replace(/\\/g, '/').split('/').pop()}-${settings.environment}-${settings.service}`;
             return new aws_cdk_lib_1.aws_lambda.LayerVersion(this, `${id}-${layerName}`, {
                 layerVersionName: `${layerName}`,
                 code: new aws_cdk_lib_1.aws_lambda.AssetCode(layer),
@@ -281,6 +281,36 @@ class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
         });
         // Grant access to the lambda
         grantReadToOwnedResources(ownedResourceSettings, lambdaHandler);
+        quidproquo_webserver_1.qpqWebServerUtils.getSubdomainRedirects(props.qpqConfig).forEach((redirect) => {
+            const redirectLambda = new aws_cdk_lib_1.aws_lambda.Function(this, `${settings.environment}-${settings.service}-lambda-redirect-${redirect.subdomain}`, {
+                functionName: `redirect-${redirect.subdomain}-${settings.service}-${settings.environment}`,
+                timeout: cdk.Duration.seconds(25),
+                runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
+                memorySize: 128,
+                code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path.join(props.apiBuildPath, 'lambdaAPIGatewayEvent_redirect')),
+                handler: 'index.executeAPIGatewayEvent',
+                environment: {
+                    redirectConfig: JSON.stringify(redirect),
+                    environment: JSON.stringify(settings.environment),
+                },
+            });
+            const restApi = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, `${id}-redirect-${redirect.subdomain}`, {
+                restApiName: `subdomain-redirect-${redirect.subdomain}-${settings.environment}-${settings.service}`,
+                handler: redirectLambda,
+                deployOptions: {
+                    loggingLevel: aws_cdk_lib_1.aws_apigateway.MethodLoggingLevel.INFO,
+                    dataTraceEnabled: true,
+                },
+                proxy: true,
+            });
+            // Map all requests to this service to /serviceName/*
+            new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, `${id}-subdomain-bpm-${redirect.subdomain}`, {
+                domainName: createApiDomainName(this, id, props, redirect.subdomain),
+                restApi: restApi,
+                // the properties below are optional
+                // basePath: settings.service,
+            });
+        });
         // Create a rest api
         const api = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, `${settings.environment}-${settings.service}-http-api`, {
             restApiName: `${settings.environment}-${settings.service}-http-api`,

package/lib/lambdas/lambdaAPIGatewayEvent_redirect.d.ts

@@ -0,0 +1,8 @@
+import { Context } from 'aws-lambda';
+export declare const executeAPIGatewayEvent: (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<{
+    statusCode: number;
+    body: string;
+    headers: {
+        Location: string;
+    };
+}>;

package/lib/lambdas/lambdaAPIGatewayEvent_redirect.js

@@ -0,0 +1,39 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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,
+            },
+        };
+    }
+    // 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}`;
+    return {
+        statusCode: 301,
+        body: '',
+        headers: {
+            Location: fullUrl,
+        },
+    };
+});
+exports.executeAPIGatewayEvent = executeAPIGatewayEvent;

package/package.json

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

package/src/QPQPrototypeSingleServiceStack.ts

@@ -99,29 +99,38 @@ const createServiceParameter = (
   };
 };
 
-const createApiDomainName = (stack: cdk.Stack, id: string, stackProps: QPQPrototypeStackProps) => {
+const createApiDomainName = (
+  stack: cdk.Stack,
+  id: string,
+  stackProps: QPQPrototypeStackProps,
+  subdomain: string,
+) => {
   const apexDomain = qpqWebServerUtils.getFeatureDomainName(stackProps.qpqConfig);
 
-  const apiDomainName = `api.${apexDomain}`;
+  const apiDomainName = `${subdomain}.${apexDomain}`;
 
-  const apexHostedZone = aws_route53.HostedZone.fromLookup(stack, `${id}-apex-hostedZone`, {
+  const apexHostedZone = aws_route53.HostedZone.fromLookup(stack, `${id}-hostedZone-${subdomain}`, {
     domainName: apexDomain,
   });
 
-  const certificate = new aws_certificatemanager.Certificate(stack, `${id}-api-certificate`, {
-    domainName: apiDomainName,
-    certificateName: `api-cert-${qpqCoreUtils.getAppName(stackProps.qpqConfig)}`,
-    validation: aws_certificatemanager.CertificateValidation.fromDns(apexHostedZone),
-  });
+  const certificate = new aws_certificatemanager.Certificate(
+    stack,
+    `${id}-${subdomain}-certificate`,
+    {
+      domainName: apiDomainName,
+      certificateName: `${subdomain}-cert-${qpqCoreUtils.getAppName(stackProps.qpqConfig)}`,
+      validation: aws_certificatemanager.CertificateValidation.fromDns(apexHostedZone),
+    },
+  );
 
-  const domainName = new aws_apigateway.DomainName(stack, `${id}-api-custom-domain`, {
+  const domainName = new aws_apigateway.DomainName(stack, `${id}-${subdomain}-custom-domain`, {
     domainName: apiDomainName,
     certificate,
     securityPolicy: aws_apigateway.SecurityPolicy.TLS_1_2,
     endpointType: aws_apigateway.EndpointType.REGIONAL,
   });
 
-  new aws_route53.ARecord(stack, `${id}-a-record`, {
+  new aws_route53.ARecord(stack, `${id}-a-record-${subdomain}`, {
     zone: apexHostedZone,
     recordName: apiDomainName,
     target: aws_route53.RecordTarget.fromAlias(
@@ -309,7 +318,7 @@ export class QPQPrototypeSingleServiceStack extends Stack {
       service: qpqCoreUtils.getAppName(props.qpqConfig),
     };
 
-    const domainName = createApiDomainName(this, id, props);
+    const domainName = createApiDomainName(this, id, props, 'api');
 
     const resourceName = (name: string) => {
       return `${settings.service}-${settings.environment}-${name}`;
@@ -420,10 +429,11 @@ export class QPQPrototypeSingleServiceStack extends Stack {
 
     createWebDistribution(this, `${id}-web-dist`, props, ownedResourceSettings);
 
-    const customLayers = (props.layers || []).map((layer, index) => {
-      const layerName = `${layer.split('/').pop()}-${index}-${settings.environment}-${
+    const customLayers = (props.layers || []).map((layer) => {
+      const layerName = `${layer.replace(/\\/g, '/').split('/').pop()}-${settings.environment}-${
         settings.service
       }`;
+
       return new aws_lambda.LayerVersion(this, `${id}-${layerName}`, {
         layerVersionName: `${layerName}`,
         code: new aws_lambda.AssetCode(layer),
@@ -455,6 +465,53 @@ export class QPQPrototypeSingleServiceStack extends Stack {
     // Grant access to the lambda
     grantReadToOwnedResources(ownedResourceSettings, lambdaHandler);
 
+    qpqWebServerUtils.getSubdomainRedirects(props.qpqConfig).forEach((redirect) => {
+      const redirectLambda = new aws_lambda.Function(
+        this,
+        `${settings.environment}-${settings.service}-lambda-redirect-${redirect.subdomain}`,
+        {
+          functionName: `redirect-${redirect.subdomain}-${settings.service}-${settings.environment}`,
+          timeout: cdk.Duration.seconds(25),
+
+          runtime: aws_lambda.Runtime.NODEJS_16_X,
+          memorySize: 128,
+
+          code: aws_lambda.Code.fromAsset(
+            path.join(props.apiBuildPath, 'lambdaAPIGatewayEvent_redirect'),
+          ),
+          handler: 'index.executeAPIGatewayEvent',
+
+          environment: {
+            redirectConfig: JSON.stringify(redirect),
+            environment: JSON.stringify(settings.environment),
+          },
+        },
+      );
+
+      const restApi = new aws_apigateway.LambdaRestApi(
+        this,
+        `${id}-redirect-${redirect.subdomain}`,
+        {
+          restApiName: `subdomain-redirect-${redirect.subdomain}-${settings.environment}-${settings.service}`,
+          handler: redirectLambda,
+          deployOptions: {
+            loggingLevel: aws_apigateway.MethodLoggingLevel.INFO,
+            dataTraceEnabled: true,
+          },
+          proxy: true,
+        },
+      );
+
+      // Map all requests to this service to /serviceName/*
+      new aws_apigateway.BasePathMapping(this, `${id}-subdomain-bpm-${redirect.subdomain}`, {
+        domainName: createApiDomainName(this, id, props, redirect.subdomain),
+        restApi: restApi,
+
+        // the properties below are optional
+        // basePath: settings.service,
+      });
+    });
+
     // Create a rest api
     const api = new aws_apigateway.LambdaRestApi(
       this,

package/src/lambdas/lambdaAPIGatewayEvent_redirect.ts

@@ -0,0 +1,37 @@
+import { APIGatewayEvent, Context } from 'aws-lambda';
+import { SubdomainRedirectQPQWebServerConfigSetting } from 'quidproquo-webserver';
+
+export const executeAPIGatewayEvent = async (event: APIGatewayEvent, context: Context) => {
+  const redirectConfig: SubdomainRedirectQPQWebServerConfigSetting = JSON.parse(
+    process.env.redirectConfig as string,
+  );
+
+  // For direct urls ~ Go straight to the url
+  if (redirectConfig.redirectUrl.startsWith('http')) {
+    return {
+      statusCode: 301,
+      body: '',
+      headers: {
+        Location: 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;
+
+  const fullUrl = `https://${baseDomain}${event.path}`;
+
+  return {
+    statusCode: 301,
+    body: '',
+    headers: {
+      Location: fullUrl,
+    },
+  };
+};