quidproquo-deploy-awscdk 0.0.21 → 0.0.22

package/lib/DeploymentSettings.d.ts

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

package/lib/DeploymentSettings.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/DeploymentType.d.ts

@@ -0,0 +1,5 @@
+export declare enum DeploymentType {
+    Dev = "development",
+    Staging = "staging",
+    Prod = "production"
+}

package/lib/DeploymentType.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeploymentType = void 0;
+var DeploymentType;
+(function (DeploymentType) {
+    DeploymentType["Dev"] = "development";
+    DeploymentType["Staging"] = "staging";
+    DeploymentType["Prod"] = "production";
+})(DeploymentType = exports.DeploymentType || (exports.DeploymentType = {}));

package/lib/QPQPrototypeSingleServiceStack.d.ts

@@ -0,0 +1,12 @@
+import { DeploymentSettings } from './DeploymentSettings';
+import { Stack } from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+export interface QPQPrototypeStackProps extends DeploymentSettings {
+    account: string;
+    region: string;
+    apiBuildPath: string;
+    webBuildPath: string;
+}
+export declare class QPQPrototypeSingleServiceStack extends Stack {
+    constructor(scope: Construct, id: string, props: QPQPrototypeStackProps);
+}

package/lib/{QPQPrototypeStack.js → QPQPrototypeSingleServiceStack.js}

@@ -23,21 +23,29 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QPQPrototypeStack = void 0;
+exports.QPQPrototypeSingleServiceStack = void 0;
 const path = __importStar(require("path"));
 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 createApiDomainName = (stack, id, qpqConfig) => {
-    const serviceName = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
-    const apexDomain = quidproquo_webserver_1.qpqWebServerUtils.getDomainName(qpqConfig);
-    const apiDomainName = `api.${serviceName}.${apexDomain}`;
+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 apiDomainName = `api.${apexDomain}`;
     const apexHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(stack, `${id}-apex-hostedZone`, {
         domainName: apexDomain,
     });
     const certificate = new aws_cdk_lib_1.aws_certificatemanager.Certificate(stack, `${id}-api-certificate`, {
         domainName: apiDomainName,
+        certificateName: `api-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`, {
@@ -53,24 +61,108 @@ const createApiDomainName = (stack, id, qpqConfig) => {
     });
     return domainName;
 };
-class QPQPrototypeStack extends aws_cdk_lib_1.Stack {
-    constructor(scope, props) {
+const createWebDistribution = (stack, id, stackProps) => {
+    const apexDomain = getEnvironmentDomain(stackProps);
+    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`,
+        // Disable public access to this bucket, CloudFront will do that
+        publicReadAccess: false,
+        blockPublicAccess: aws_cdk_lib_1.aws_s3.BlockPublicAccess.BLOCK_ALL,
+        // Default website file
+        websiteIndexDocument: 'index.html',
+        // Allow bucket to auto delete upon cdk:Destroy
+        removalPolicy: cdk.RemovalPolicy.DESTROY,
+        autoDeleteObjects: true,
+    });
+    // Create OriginAccessIdentity for the bucket.
+    const websiteOAI = new aws_cdk_lib_1.aws_cloudfront.OriginAccessIdentity(stack, `${id}-website-OAI`);
+    staticWebFilesBucket.grantRead(websiteOAI);
+    // Grab the hosted zone we want to add
+    const serviceHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(stack, 'hosted-zone', {
+        domainName: apexDomain,
+    });
+    // Create a certificate for the distribution - Seems to a bug where Route 53 records not cleaned up
+    // after removing the DNS Validated certificate see: https://github.com/aws/aws-cdk/issues/3333
+    // `switch over to using the Certificate with the new built-in (CloudFormation-based) DNS validation`
+    const validationCertificate = aws_cdk_lib_1.aws_certificatemanager.CertificateValidation.fromDns(serviceHostedZone);
+    const certificate = new aws_cdk_lib_1.aws_certificatemanager.DnsValidatedCertificate(stack, `${id}-viewer-cert`, {
+        hostedZone: serviceHostedZone,
+        domainName: apexDomain,
+        region: 'us-east-1',
+        validation: validationCertificate,
+    });
+    const viewerCertificate = aws_cdk_lib_1.aws_cloudfront.ViewerCertificate.fromAcmCertificate(certificate, {
+        aliases: [apexDomain],
+    });
+    new aws_cdk_lib_1.aws_s3_deployment.BucketDeployment(stack, `${id}-DeployWebsite`, {
+        sources: [aws_cdk_lib_1.aws_s3_deployment.Source.asset(stackProps.webBuildPath)],
+        destinationBucket: staticWebFilesBucket,
+    });
+    // Create a cloud front distribution
+    // TODO: use aws_cloudfront.Distribution
+    const distribution = new aws_cdk_lib_1.aws_cloudfront.CloudFrontWebDistribution(stack, 'cf-distribution', {
+        originConfigs: [
+            {
+                s3OriginSource: {
+                    s3BucketSource: staticWebFilesBucket,
+                    originAccessIdentity: websiteOAI,
+                },
+                behaviors: [
+                    ...[
+                        '/remoteEntry.js',
+                        '/index.js',
+                        '/index.html', // Add this if we need it
+                    ].map((pp) => ({
+                        pathPattern: pp,
+                        maxTtl: cdk.Duration.seconds(0),
+                        minTtl: cdk.Duration.seconds(0),
+                        defaultTtl: cdk.Duration.seconds(0),
+                    })),
+                    {
+                        isDefaultBehavior: true,
+                    },
+                ],
+            },
+        ],
+        viewerCertificate: viewerCertificate,
+        errorConfigurations: [
+            {
+                errorCode: 404,
+                responseCode: 200,
+                responsePagePath: '/',
+            },
+        ],
+    });
+    // Create a cdn link
+    new aws_cdk_lib_1.aws_route53.ARecord(stack, `${id}-web-alias`, {
+        zone: serviceHostedZone,
+        recordName: apexDomain,
+        target: aws_cdk_lib_1.aws_route53.RecordTarget.fromAlias(new aws_cdk_lib_1.aws_route53_targets.CloudFrontTarget(distribution)),
+    });
+    return distribution;
+};
+class QPQPrototypeSingleServiceStack extends aws_cdk_lib_1.Stack {
+    constructor(scope, id, props) {
+        super(scope, id, {
+            env: {
+                account: props.account,
+                region: props.region,
+            },
+        });
         const settings = {
             environment: props.environment,
             service: quidproquo_core_1.qpqCoreUtils.getAppName(props.qpqConfig),
-            id: `${quidproquo_core_1.qpqCoreUtils.getAppName(props.qpqConfig)}-${props.environment}`,
         };
-        super(scope, settings.id, Object.assign(Object.assign({}, props), { env: {
-                account: props.account,
-                region: props.region,
-            } }));
-        const domainName = createApiDomainName(this, settings.id, props.qpqConfig);
+        const domainName = createApiDomainName(this, id, props);
+        createWebDistribution(this, `${id}-web-dist`, props);
         const resourceName = (name) => {
             return `${settings.service}-${settings.environment}-${name}`;
         };
-        const BLLayer = new aws_cdk_lib_1.aws_lambda.LayerVersion(this, `${settings.id}-BLLayer`, {
-            layerVersionName: `${settings.id}-BLLayer`,
-            code: new aws_cdk_lib_1.aws_lambda.AssetCode(props.serviceBuildPath),
+        const BLLayer = new aws_cdk_lib_1.aws_lambda.LayerVersion(this, `${id}-BLLayer`, {
+            layerVersionName: `${id}-BLLayer`,
+            code: new aws_cdk_lib_1.aws_lambda.AssetCode(props.apiBuildPath),
             compatibleRuntimes: [aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X],
         });
         const ownedSecrets = quidproquo_core_1.qpqCoreUtils.getOwnedSecrets(props.qpqConfig).map((secret) => {
@@ -78,7 +170,7 @@ class QPQPrototypeStack extends aws_cdk_lib_1.Stack {
             return {
                 secretName: secret.key,
                 realName: realSecretName,
-                secret: new aws_cdk_lib_1.aws_secretsmanager.Secret(this, `${settings.id}-secret-${secret.key}`, {
+                secret: new aws_cdk_lib_1.aws_secretsmanager.Secret(this, `${id}-secret-${secret.key}`, {
                     secretName: realSecretName,
                     removalPolicy: cdk.RemovalPolicy.DESTROY,
                     description: `${settings.environment}-${settings.service}`,
@@ -139,7 +231,7 @@ class QPQPrototypeStack extends aws_cdk_lib_1.Stack {
             proxy: true,
         });
         // Map all requests to this service to /serviceName/*
-        new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, `${settings.id}-rest-bpm`, {
+        new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, `${id}-rest-bpm`, {
             domainName: domainName,
             restApi: api,
             // the properties below are optional
@@ -170,12 +262,12 @@ class QPQPrototypeStack extends aws_cdk_lib_1.Stack {
             buckets.forEach((b) => b.bucket.grantReadWrite(schedulerFunction));
             ownedSecrets.forEach((os) => os.secret.grantRead(schedulerFunction));
             // EventBridge rule which runs every five minutes
-            const cronRule = new aws_cdk_lib_1.aws_events.Rule(this, `${settings.id}-se-cronrule-${index}`, {
+            const cronRule = new aws_cdk_lib_1.aws_events.Rule(this, `${id}-se-cronrule-${index}`, {
                 schedule: aws_cdk_lib_1.aws_events.Schedule.expression(`cron(${se.cronExpression})`),
             });
-            // Set the targert as lambda function
+            // Set the target as lambda function
             cronRule.addTarget(new aws_cdk_lib_1.aws_events_targets.LambdaFunction(schedulerFunction));
         });
     }
 }
-exports.QPQPrototypeStack = QPQPrototypeStack;
+exports.QPQPrototypeSingleServiceStack = QPQPrototypeSingleServiceStack;

package/lib/index.d.ts

@@ -1 +1,4 @@
-export * from './QPQPrototypeStack';
+export * from './utils';
+export * from './DeploymentType';
+export * from './DeploymentSettings';
+export * from './QPQPrototypeSingleServiceStack';

package/lib/index.js

@@ -14,4 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./QPQPrototypeStack"), exports);
+__exportStar(require("./utils"), exports);
+__exportStar(require("./DeploymentType"), exports);
+__exportStar(require("./DeploymentSettings"), exports);
+__exportStar(require("./QPQPrototypeSingleServiceStack"), exports);

package/lib/utils.d.ts

@@ -0,0 +1,2 @@
+import { DeploymentSettings } from './DeploymentSettings';
+export declare const getStackName: (deploymentSettings: DeploymentSettings) => string;

package/lib/utils.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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}`;
+};
+exports.getStackName = getStackName;

package/package.json

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

package/lib/QPQPrototypeStack.d.ts

@@ -1,13 +0,0 @@
-import { Stack, StackProps } from 'aws-cdk-lib';
-import { Construct } from 'constructs';
-import { QPQConfig } from 'quidproquo-core';
-export interface QPQPrototypeStackProps extends StackProps {
-    environment: string;
-    serviceBuildPath: string;
-    qpqConfig: QPQConfig;
-    account: string;
-    region: string;
-}
-export declare class QPQPrototypeStack extends Stack {
-    constructor(scope: Construct, props: QPQPrototypeStackProps);
-}