quidproquo-deploy-awscdk 0.0.52 → 0.0.53

package/lib/constructs/QpqCoreParameterConstruct.js

@@ -28,7 +28,7 @@ class QpqCoreParameterConstruct extends QpqCoreParameterConstructBase {
     }
     constructor(scope, id, props) {
         super(scope, id, props);
-        this.stringParameter = new aws_cdk_lib_1.aws_ssm.StringParameter(this, this.childId('param'), {
+        this.stringParameter = new aws_cdk_lib_1.aws_ssm.StringParameter(this, 'param', {
             parameterName: this.resourceName(props.setting.key),
             description: props.setting.key,
             stringValue: props.setting.value,

package/lib/constructs/QpqCoreRecurringScheduleConstruct.js

@@ -32,7 +32,7 @@ const qpqDeployAwsCdkUtils = __importStar(require("../qpqDeployAwsCdkUtils"));
 class QpqCoreRecurringScheduleConstruct extends QpqConstruct_1.QpqConstruct {
     constructor(scope, id, props) {
         super(scope, id, props);
-        const schedulerFunction = new Function_1.Function(this, this.childId(props.setting.uniqueKey), {
+        const schedulerFunction = new Function_1.Function(this, props.setting.uniqueKey, {
             buildPath: quidproquo_core_1.qpqCoreUtils.getScheduleEntryFullPath(props.qpqConfig, props.setting),
             functionName: this.resourceName(`${props.setting.uniqueKey}-SE`),
             functionType: 'lambdaEventBridgeEvent',
@@ -48,13 +48,13 @@ class QpqCoreRecurringScheduleConstruct extends QpqConstruct_1.QpqConstruct {
             },
         });
         // TODO: Make this a utility function
-        const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(this, this.childId('grantable'), this.qpqConfig);
+        const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(this, 'grantable', this.qpqConfig);
         grantables.forEach((g) => {
             g.grantAll(schedulerFunction.lambdaFunction);
         });
         // ///////// end todo
         // EventBridge rule which runs every five minutes
-        const cronRule = new aws_cdk_lib_1.aws_events.Rule(this, this.childId('cron'), {
+        const cronRule = new aws_cdk_lib_1.aws_events.Rule(this, 'cron', {
             schedule: aws_cdk_lib_1.aws_events.Schedule.expression(`cron(${props.setting.cronExpression})`),
         });
         // Set the target as lambda function

package/lib/constructs/QpqCoreSecretConstruct.js

@@ -52,7 +52,7 @@ class QpqCoreSecretConstruct extends QpqCoreSecretConstructBase {
     }
     constructor(scope, id, props) {
         super(scope, id, props);
-        this.secret = new aws_cdk_lib_1.aws_secretsmanager.Secret(this, this.childId('secret'), {
+        this.secret = new aws_cdk_lib_1.aws_secretsmanager.Secret(this, 'secret', {
             secretName: this.resourceName(props.setting.key),
             removalPolicy: cdk.RemovalPolicy.DESTROY,
             description: props.setting.key,

package/lib/constructs/QpqCoreStorageDriveConstruct.js

@@ -52,7 +52,7 @@ class QpqCoreStorageDriveConstruct extends QpqCoreStorageDriveConstructBase {
     }
     constructor(scope, id, props) {
         super(scope, id, props);
-        this.bucket = new aws_cdk_lib_1.aws_s3.Bucket(this, this.childId('bucket'), {
+        this.bucket = new aws_cdk_lib_1.aws_s3.Bucket(this, 'bucket', {
             bucketName: this.resourceName(props.setting.storageDrive),
             // Disable public access to this bucket, CloudFront will do that
             publicReadAccess: false,

package/lib/constructs/QpqWebserverApiConstruct.js

@@ -35,17 +35,17 @@ class QpqWebserverApiConstruct extends QpqConstruct_1.QpqConstruct {
         super(scope, id, props);
         // api.service.domain.com or api.domain.com
         const apexDomain = props.setting.onRootDomain
-            ? quidproquo_webserver_1.qpqWebServerUtils.getFeatureDomainName(props.qpqConfig)
+            ? quidproquo_webserver_1.qpqWebServerUtils.getBaseDomainName(props.qpqConfig)
             : quidproquo_webserver_1.qpqWebServerUtils.getServiceDomainName(props.qpqConfig);
         // Create subdomain
-        const subdomain = new SubdomainName_1.SubdomainName(this, this.childId('subdomain'), {
+        const subdomain = new SubdomainName_1.SubdomainName(this, 'subdomain', {
             apexDomain,
             subdomain: props.setting.apiSubdomain,
             qpqConfig: props.qpqConfig,
             setting: props.setting,
         });
         // Build Function
-        const func = new Function_1.Function(this, this.childId('api-function'), {
+        const func = new Function_1.Function(this, 'api-function', {
             buildPath: quidproquo_webserver_1.qpqWebServerUtils.getApiEntryFullPath(props.qpqConfig, props.setting),
             functionName: this.resourceName(`${props.setting.apiName}-route`),
             functionType: 'lambdaAPIGatewayEvent',
@@ -54,12 +54,12 @@ class QpqWebserverApiConstruct extends QpqConstruct_1.QpqConstruct {
             setting: props.setting,
             apiLayerVersions: props.apiLayerVersions,
         });
-        const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(this, this.childId('grantable'), this.qpqConfig);
+        const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(this, 'grantable', this.qpqConfig);
         grantables.forEach((g) => {
             g.grantAll(func.lambdaFunction);
         });
         // Create a rest api
-        const api = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, this.childId('lambda-rest-api'), {
+        const api = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, 'lambda-rest-api', {
             restApiName: this.resourceName(`${props.setting.apiName}-rest-api`),
             handler: func.lambdaFunction,
             deployOptions: {
@@ -70,7 +70,7 @@ class QpqWebserverApiConstruct extends QpqConstruct_1.QpqConstruct {
             proxy: true,
         });
         // Map all requests to this service to /serviceName/*
-        new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, this.childId('rest-bpm'), {
+        new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, 'rest-bpm', {
             domainName: subdomain.domainName,
             restApi: api,
             // the properties below are optional

package/lib/constructs/QpqWebserverDomainConstruct.d.ts

@@ -4,7 +4,7 @@ import { DnsQPQWebServerConfigSetting } from 'quidproquo-webserver';
 import { QpqConstruct, QpqConstructProps } from './core/QpqConstruct';
 export interface QpqWebserverDomainConstructProps extends QpqConstructProps<DnsQPQWebServerConfigSetting> {
 }
-export declare const getFeatureDomainName: (qpqConfig: QPQConfig, domain: string) => string;
+export declare const getEnvironmentDomainName: (qpqConfig: QPQConfig, domain: string) => string;
 export declare class QpqWebserverDomainConstruct extends QpqConstruct<DnsQPQWebServerConfigSetting> {
     constructor(scope: Construct, id: string, props: QpqWebserverDomainConstructProps);
 }

package/lib/constructs/QpqWebserverDomainConstruct.js

@@ -1,43 +1,87 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QpqWebserverDomainConstruct = exports.getFeatureDomainName = void 0;
+exports.QpqWebserverDomainConstruct = exports.getEnvironmentDomainName = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_webserver_1 = require("quidproquo-webserver");
-const qpqDeployAwsCdkUtils_1 = require("../qpqDeployAwsCdkUtils");
+const qpqDeployAwsCdkUtils = __importStar(require("../qpqDeployAwsCdkUtils"));
 const QpqConstruct_1 = require("./core/QpqConstruct");
-const getFeatureDomainName = (qpqConfig, domain) => {
-    const feature = quidproquo_core_1.qpqCoreUtils.getAppFeature(qpqConfig);
-    if (feature === 'production') {
+const getEnvironmentDomainName = (qpqConfig, domain) => {
+    const environment = quidproquo_core_1.qpqCoreUtils.getApplicationEnvironment(qpqConfig);
+    if (environment === 'production') {
         return domain;
     }
-    return `${feature}.${domain}`;
+    return `${environment}.${domain}`;
 };
-exports.getFeatureDomainName = getFeatureDomainName;
+exports.getEnvironmentDomainName = getEnvironmentDomainName;
 class QpqWebserverDomainConstruct extends QpqConstruct_1.QpqConstruct {
     constructor(scope, id, props) {
         super(scope, id, props);
-        // Only create a shared hosted zone if we need to
-        if (!(0, qpqDeployAwsCdkUtils_1.serviceNeedsServiceHostedZone)(this.qpqConfig)) {
-            return;
-        }
         // example.com
         // dev.example.com
-        const featureDomain = (0, exports.getFeatureDomainName)(props.qpqConfig, props.setting.dnsBase);
+        const feature = quidproquo_core_1.qpqCoreUtils.getApplicationFeature(props.qpqConfig);
+        const environmentDomain = (0, exports.getEnvironmentDomainName)(props.qpqConfig, props.setting.dnsBase);
+        const featureDomainName = quidproquo_webserver_1.qpqWebServerUtils.getBaseDomainName(props.qpqConfig);
         // The hosted zone already setup
-        const apexHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(this, this.childId('hosted-zone'), {
-            domainName: featureDomain,
+        // development.example.com
+        // staging.example.com
+        // example.com
+        let apexHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(this, 'hosted-zone', {
+            domainName: feature ? featureDomainName : environmentDomain,
         });
+        // const feature = qpqCoreUtils.getApplicationFeature(props.qpqConfig);
+        // if (feature) {
+        //   const featureDomainName = qpqWebServerUtils.getBaseDomainName(props.qpqConfig);
+        //   console.log('featureDomainName', featureDomainName);
+        //   // Create the root hosted zone for our service
+        //   const featureHostedZone = new aws_route53.HostedZone(this, 'feature-hosted-zone', {
+        //     zoneName: featureDomainName,
+        //   });
+        //   // Add the new NS Records to the root hosted zone so subdomains can be resolved
+        //   new aws_route53.NsRecord(this, 'feature-ns-records', {
+        //     zone: apexHostedZone,
+        //     recordName: featureDomainName,
+        //     values: featureHostedZone.hostedZoneNameServers || [],
+        //   });
+        //   apexHostedZone = featureHostedZone;
+        // }
+        // Only create a shared hosted zone if we need to
+        if (!qpqDeployAwsCdkUtils.serviceNeedsServiceHostedZone(props.qpqConfig)) {
+            return;
+        }
         // Root domain name for our service
         // search.example.com
         // search.dev.example.com
         const serviceDomainName = quidproquo_webserver_1.qpqWebServerUtils.getServiceDomainName(props.qpqConfig);
         // Create the root hosted zone for our service
-        const serviceHostedZone = new aws_cdk_lib_1.aws_route53.HostedZone(this, this.childId('service-hosted-zone'), {
+        const serviceHostedZone = new aws_cdk_lib_1.aws_route53.HostedZone(this, 'service-hosted-zone', {
             zoneName: serviceDomainName,
         });
         // Add the new NS Records to the root hosted zone so subdomains can be resolved
-        new aws_cdk_lib_1.aws_route53.NsRecord(this, this.childId('ns-records'), {
+        new aws_cdk_lib_1.aws_route53.NsRecord(this, 'service-ns-records', {
             zone: apexHostedZone,
             recordName: serviceDomainName,
             values: serviceHostedZone.hostedZoneNameServers || [],

package/lib/constructs/QpqWebserverSubdomainRedirectConstruct.js

@@ -37,8 +37,8 @@ class QpqWebserverSubdomainRedirectConstruct extends QpqConstruct_1.QpqConstruct
     constructor(scope, id, props) {
         super(scope, id, props);
         const buildPath = quidproquo_core_1.qpqCoreUtils.getBuildPath(props.qpqConfig);
-        const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(props.qpqConfig);
-        const redirectLambda = new aws_cdk_lib_1.aws_lambda.Function(this, this.childId('lambda'), {
+        const environment = quidproquo_core_1.qpqCoreUtils.getApplicationEnvironment(props.qpqConfig);
+        const redirectLambda = new aws_cdk_lib_1.aws_lambda.Function(this, 'lambda', {
             functionName: this.resourceName(`redirect-${props.setting.subdomain}`),
             timeout: cdk.Duration.seconds(25),
             runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
@@ -50,7 +50,7 @@ class QpqWebserverSubdomainRedirectConstruct extends QpqConstruct_1.QpqConstruct
                 environment: JSON.stringify(environment),
             },
         });
-        const restApi = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, this.childId('rest-api'), {
+        const restApi = new aws_cdk_lib_1.aws_apigateway.LambdaRestApi(this, 'rest-api', {
             restApiName: this.resourceName(`${props.setting.subdomain}-redirect`),
             handler: redirectLambda,
             deployOptions: {
@@ -60,14 +60,14 @@ class QpqWebserverSubdomainRedirectConstruct extends QpqConstruct_1.QpqConstruct
             proxy: true,
         });
         // TODO: Fix this
-        const serviceDomainName = new SubdomainName_1.SubdomainName(this, this.childId('service-domain-name'), {
+        const serviceDomainName = new SubdomainName_1.SubdomainName(this, 'service-domain-name', {
             subdomain: props.setting.subdomain,
             apexDomain: '',
             setting: props.setting,
             qpqConfig: props.qpqConfig,
         });
         // Map all requests to this service to /serviceName/*
-        new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, this.childId('base-path-mapping'), {
+        new aws_cdk_lib_1.aws_apigateway.BasePathMapping(this, 'base-path-mapping', {
             domainName: serviceDomainName.domainName,
             restApi: restApi,
             // the properties below are optional

package/lib/constructs/QpqWebserverWebEntryConstruct.js

@@ -36,13 +36,12 @@ const qpqDeployAwsCdkUtils = __importStar(require("../qpqDeployAwsCdkUtils"));
 class QpqWebserverWebEntryConstruct extends QpqConstruct_1.QpqConstruct {
     constructor(scope, id, props) {
         super(scope, id, props);
-        console.log(JSON.stringify(props.setting));
-        const apexDomain = quidproquo_webserver_1.qpqWebServerUtils.getFeatureDomainName(props.qpqConfig);
+        const apexDomain = quidproquo_webserver_1.qpqWebServerUtils.getBaseDomainName(props.qpqConfig);
         const webEntryBuildPath = quidproquo_webserver_1.qpqWebServerUtils.getWebEntryFullPath(props.qpqConfig, props.setting);
         const seoEntryBuildPath = quidproquo_webserver_1.qpqWebServerUtils.getWebEntrySeoFullPath(props.qpqConfig, props.setting);
         // create an s3 bucket
-        const staticWebFilesBucket = new aws_cdk_lib_1.aws_s3.Bucket(this, this.childId('bucket'), {
-            bucketName: this.resourceName('web-files'),
+        const staticWebFilesBucket = new aws_cdk_lib_1.aws_s3.Bucket(this, 'bucket', {
+            bucketName: this.qpqResourceName('web-files'),
             // Disable public access to this bucket, CloudFront will do that
             publicReadAccess: false,
             blockPublicAccess: aws_cdk_lib_1.aws_s3.BlockPublicAccess.BLOCK_ALL,
@@ -53,17 +52,17 @@ class QpqWebserverWebEntryConstruct extends QpqConstruct_1.QpqConstruct {
             autoDeleteObjects: true,
         });
         // Create OriginAccessIdentity for the bucket.
-        const websiteOAI = new aws_cdk_lib_1.aws_cloudfront.OriginAccessIdentity(this, this.childId('website-oai'));
+        const websiteOAI = new aws_cdk_lib_1.aws_cloudfront.OriginAccessIdentity(this, 'website-oai');
         staticWebFilesBucket.grantRead(websiteOAI);
         // Grab the hosted zone we want to add
-        const serviceHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(this, this.childId('hosted-zone'), {
+        const serviceHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(this, '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(this, this.childId('viewer-cert'), {
+        const certificate = new aws_cdk_lib_1.aws_certificatemanager.DnsValidatedCertificate(this, 'viewer-cert', {
             hostedZone: serviceHostedZone,
             domainName: apexDomain,
             region: 'us-east-1',
@@ -72,23 +71,21 @@ class QpqWebserverWebEntryConstruct extends QpqConstruct_1.QpqConstruct {
         const viewerCertificate = aws_cdk_lib_1.aws_cloudfront.ViewerCertificate.fromAcmCertificate(certificate, {
             aliases: [apexDomain],
         });
-        console.log('\n\n\n webEntryBuildPath: ', webEntryBuildPath, '\n\n\n');
-        console.log('\n\n\n this.childId: ', this.childId('deploy'), '\n\n\n');
         // TODO: This with an option
-        new aws_cdk_lib_1.aws_s3_deployment.BucketDeployment(this, this.childId('deploy'), {
+        new aws_cdk_lib_1.aws_s3_deployment.BucketDeployment(this, 'deploy', {
             sources: [aws_cdk_lib_1.aws_s3_deployment.Source.asset(webEntryBuildPath)],
             destinationBucket: staticWebFilesBucket,
         });
-        const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(this, this.childId('grantable'), this.qpqConfig);
+        const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(this, 'grantable', this.qpqConfig);
         const cloudFrontBehaviors = quidproquo_webserver_1.qpqWebServerUtils.getAllSeo(props.qpqConfig).map((seo) => {
-            const edgeFunctionVR = new aws_cdk_lib_1.aws_cloudfront.experimental.EdgeFunction(this, this.childId(`SEO-${seo.uniqueKey}-VR`), {
+            const edgeFunctionVR = new aws_cdk_lib_1.aws_cloudfront.experimental.EdgeFunction(this, `SEO-${seo.uniqueKey}-VR`, {
                 functionName: this.resourceName(`SEO-VR-${seo.uniqueKey}`),
                 timeout: cdk.Duration.seconds(5),
                 runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
                 code: aws_cdk_lib_1.aws_lambda.Code.fromAsset(path_1.default.join(seoEntryBuildPath, 'lambdaEventViewerRequest')),
                 handler: 'index.executeEventViewerRequest',
             });
-            const edgeFunctionOR = new aws_cdk_lib_1.aws_cloudfront.experimental.EdgeFunction(this, this.childId(`SEO-${seo.uniqueKey}-OR`), {
+            const edgeFunctionOR = new aws_cdk_lib_1.aws_cloudfront.experimental.EdgeFunction(this, `SEO-${seo.uniqueKey}-OR`, {
                 functionName: this.resourceName(`SEO-OR-${seo.uniqueKey}`),
                 timeout: cdk.Duration.seconds(30),
                 runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,
@@ -126,7 +123,7 @@ class QpqWebserverWebEntryConstruct extends QpqConstruct_1.QpqConstruct {
         // TODO: Somehow expose query strings: Note ~
         // (Lambda@Edge only) To access the query string in an origin request or origin response function,
         // your cache policy or origin request policy must be set to All for Query strings.
-        const distribution = new aws_cdk_lib_1.aws_cloudfront.CloudFrontWebDistribution(this, this.childId('cf-distribution'), {
+        const distribution = new aws_cdk_lib_1.aws_cloudfront.CloudFrontWebDistribution(this, 'cf-distribution', {
             originConfigs: [
                 {
                     s3OriginSource: {
@@ -155,7 +152,7 @@ class QpqWebserverWebEntryConstruct extends QpqConstruct_1.QpqConstruct {
             ],
         });
         // Create a cdn link
-        new aws_cdk_lib_1.aws_route53.ARecord(this, this.childId(`web-alias`), {
+        new aws_cdk_lib_1.aws_route53.ARecord(this, '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)),

package/lib/constructs/basic/Function.js

@@ -34,7 +34,7 @@ const cdk = __importStar(require("aws-cdk-lib"));
 class Function extends QpqConstruct_1.QpqConstruct {
     constructor(scope, id, props) {
         super(scope, id, props);
-        this.lambdaFunction = new aws_cdk_lib_1.aws_lambda.Function(this, this.childId('function'), {
+        this.lambdaFunction = new aws_cdk_lib_1.aws_lambda.Function(this, 'function', {
             functionName: props.functionName,
             timeout: cdk.Duration.seconds(props.timeoutInSeconds || 25),
             runtime: aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X,

package/lib/constructs/basic/SubdomainName.js

@@ -7,21 +7,21 @@ class SubdomainName extends QpqConstruct_1.QpqConstruct {
     constructor(scope, id, props) {
         super(scope, id, props);
         const newDomainName = `${props.subdomain}.${props.apexDomain}`;
-        const apexHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(this, this.childId('hosted-zone'), {
+        const apexHostedZone = aws_cdk_lib_1.aws_route53.HostedZone.fromLookup(this, 'hosted-zone', {
             domainName: props.apexDomain,
         });
-        const certificate = new aws_cdk_lib_1.aws_certificatemanager.Certificate(this, this.childId('certificate'), {
+        const certificate = new aws_cdk_lib_1.aws_certificatemanager.Certificate(this, 'certificate', {
             domainName: newDomainName,
-            certificateName: this.resourceName(props.subdomain),
+            certificateName: this.qpqResourceName(props.subdomain),
             validation: aws_cdk_lib_1.aws_certificatemanager.CertificateValidation.fromDns(apexHostedZone),
         });
-        this.domainName = new aws_cdk_lib_1.aws_apigateway.DomainName(this, this.childId('domain-name'), {
+        this.domainName = new aws_cdk_lib_1.aws_apigateway.DomainName(this, 'domain-name', {
             domainName: newDomainName,
             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(this, this.childId('a-record'), {
+        new aws_cdk_lib_1.aws_route53.ARecord(this, 'a-record', {
             zone: apexHostedZone,
             recordName: newDomainName,
             target: aws_cdk_lib_1.aws_route53.RecordTarget.fromAlias(new aws_cdk_lib_1.aws_route53_targets.ApiGatewayDomain(this.domainName)),

package/lib/constructs/core/QPQServiceStack.d.ts

@@ -13,7 +13,5 @@ export declare class QpqServiceStack extends Stack {
     qpqConfig: QPQConfig;
     apiLayerVersions?: aws_lambda.ILayerVersion[];
     constructor(scope: Construct, id: string, { account, qpqConfig, apiLayers }: QpqServiceStackProps);
-    resourceName(name: string, maxLength?: number): string;
-    childId(uniqueName: string): string;
     childProps(setting: QPQConfigSetting): QpqConstructProps<any>;
 }

package/lib/constructs/core/QPQServiceStack.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QpqServiceStack = void 0;
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const quidproquo_core_1 = require("quidproquo-core");
+const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
 class QpqServiceStack extends aws_cdk_lib_1.Stack {
     constructor(scope, id, { account, qpqConfig, apiLayers }) {
         super(scope, id, {
@@ -14,22 +15,13 @@ class QpqServiceStack extends aws_cdk_lib_1.Stack {
         this.id = id;
         this.qpqConfig = qpqConfig;
         this.apiLayerVersions = (apiLayers || []).map((layer) => {
-            return new aws_cdk_lib_1.aws_lambda.LayerVersion(this, this.childId(`${layer.name}-layer`), {
-                layerVersionName: this.resourceName(layer.name),
+            return new aws_cdk_lib_1.aws_lambda.LayerVersion(this, `${layer.name}-layer`, {
+                layerVersionName: quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getQpqRuntimeResourceName(layer.name, qpqConfig),
                 code: new aws_cdk_lib_1.aws_lambda.AssetCode(layer.buildPath),
                 compatibleRuntimes: [aws_cdk_lib_1.aws_lambda.Runtime.NODEJS_16_X],
             });
         });
     }
-    resourceName(name, maxLength = 60) {
-        const app = quidproquo_core_1.qpqCoreUtils.getAppName(this.qpqConfig);
-        const env = quidproquo_core_1.qpqCoreUtils.getAppFeature(this.qpqConfig);
-        return `${name}-${app}-${env}`;
-    }
-    childId(uniqueName) {
-        // return `${uniqueName}-${this.id}`;
-        return uniqueName;
-    }
     childProps(setting) {
         return {
             qpqConfig: this.qpqConfig,

package/lib/constructs/core/QpqConstructBase.d.ts

@@ -10,9 +10,6 @@ export declare class QpqConstructBase extends Construct {
     qpqConfig: QPQConfig;
     apiLayerVersions?: aws_lambda.ILayerVersion[];
     constructor(scope: Construct, id: string, props: QpqConstructBaseProps);
-    environment(): string;
-    service(): string;
-    deploymentPrefix(): string;
-    resourceName(name: string, maxLength?: number): string;
-    childId(uniqueName: string): string;
+    resourceName(name: string): string;
+    qpqResourceName(name: string): string;
 }

package/lib/constructs/core/QpqConstructBase.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QpqConstructBase = void 0;
 const constructs_1 = require("constructs");
-const quidproquo_core_1 = require("quidproquo-core");
+const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
 class QpqConstructBase extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
@@ -10,21 +10,11 @@ class QpqConstructBase extends constructs_1.Construct {
         this.qpqConfig = props.qpqConfig;
         this.apiLayerVersions = props.apiLayerVersions;
     }
-    environment() {
-        return quidproquo_core_1.qpqCoreUtils.getAppFeature(this.qpqConfig);
+    resourceName(name) {
+        return quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getConfigRuntimeResourceName(name, this.qpqConfig);
     }
-    service() {
-        return quidproquo_core_1.qpqCoreUtils.getAppName(this.qpqConfig);
-    }
-    deploymentPrefix() {
-        return `${this.service()}-${this.environment()}`;
-    }
-    resourceName(name, maxLength = 60) {
-        return `${name}-${this.service()}-${this.environment()}`;
-    }
-    childId(uniqueName) {
-        // return `${uniqueName}-${this.id}`;
-        return uniqueName;
+    qpqResourceName(name) {
+        return quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getQpqRuntimeResourceName(name, this.qpqConfig);
     }
 }
 exports.QpqConstructBase = QpqConstructBase;

package/lib/index.d.ts

@@ -2,7 +2,6 @@ export * from './utils';
 export * from './DeploymentType';
 export * from './DeploymentSettings';
 export * from './QPQApp';
-export * from './QPQPrototypeSingleServiceStack';
 export * from './ApiQPQServiceStack';
 export * from './InfrastructureQPQServiceStack';
 export * from './WebQPQServiceStack';

package/lib/index.js

@@ -18,7 +18,6 @@ __exportStar(require("./utils"), exports);
 __exportStar(require("./DeploymentType"), exports);
 __exportStar(require("./DeploymentSettings"), exports);
 __exportStar(require("./QPQApp"), exports);
-__exportStar(require("./QPQPrototypeSingleServiceStack"), exports);
 __exportStar(require("./ApiQPQServiceStack"), exports);
 __exportStar(require("./InfrastructureQPQServiceStack"), exports);
 __exportStar(require("./WebQPQServiceStack"), exports);

package/lib/qpqDeployAwsCdkUtils.js

@@ -8,7 +8,7 @@ const QpqCoreSecretConstruct_1 = require("./constructs/QpqCoreSecretConstruct");
 const QpqCoreStorageDriveConstruct_1 = require("./constructs/QpqCoreStorageDriveConstruct");
 const getResourceName = (name, qpqConfig) => {
     const service = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(qpqConfig);
+    const environment = quidproquo_core_1.qpqCoreUtils.getApplicationEnvironment(qpqConfig);
     return `${name}-${service}-${environment}`;
 };
 exports.getResourceName = getResourceName;
@@ -43,10 +43,13 @@ const getQqpStorageDriveGrantables = (scope, id, qpqConfig) => {
 };
 exports.getQqpStorageDriveGrantables = getQqpStorageDriveGrantables;
 const serviceNeedsServiceHostedZone = (qpqConfig) => {
+    // We need it if we are deploying our api to a service domain
     const apiConfigs = quidproquo_core_1.qpqCoreUtils
         .getConfigSettings(qpqConfig, quidproquo_webserver_1.QPQWebServerConfigSettingType.Api)
         .filter((config) => !config.onRootDomain);
-    return apiConfigs.length > 0;
+    // // Or if we are deploying to a feature env ~ like joecoady
+    // const hasFeatureName = !!qpqCoreUtils.getApplicationFeature(qpqConfig);
+    return apiConfigs.length > 0; // || hasFeatureName;
 };
 exports.serviceNeedsServiceHostedZone = serviceNeedsServiceHostedZone;
 // Get resources that we can use to grant permissions to lambdas etc

package/lib/utils.d.ts

@@ -1,8 +1,7 @@
 import { QPQConfig } from 'quidproquo-core';
-import { DeploymentSettings } from './DeploymentSettings';
 import { QpqSettingConstructMap } from './QpqSettingConstructMap';
 import { QpqServiceStack } from './constructs/core/QPQServiceStack';
-export declare const getStackName: (deploymentSettings: DeploymentSettings) => string;
+export declare const getBaseStackName: (qpqConfig: QPQConfig) => string;
 export declare const getInfrastructureStackName: (qpqConfig: QPQConfig) => string;
 export declare const getWebStackName: (qpqConfig: QPQConfig) => string;
 export declare const getApiStackName: (qpqConfig: QPQConfig) => string;

package/lib/utils.js

@@ -1,29 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConstructs = exports.getApiStackName = exports.getWebStackName = exports.getInfrastructureStackName = exports.getStackName = void 0;
+exports.createConstructs = exports.getApiStackName = exports.getWebStackName = exports.getInfrastructureStackName = exports.getBaseStackName = void 0;
 const quidproquo_core_1 = require("quidproquo-core");
-const getStackName = (deploymentSettings) => {
-    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(deploymentSettings.qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(deploymentSettings.qpqConfig);
+const getBaseStackName = (qpqConfig) => {
+    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
+    const environment = quidproquo_core_1.qpqCoreUtils.getApplicationEnvironment(qpqConfig);
+    const feature = quidproquo_core_1.qpqCoreUtils.getApplicationFeature(qpqConfig);
+    if (feature) {
+        return `${appName}-${environment}-${feature}`;
+    }
     return `${appName}-${environment}`;
 };
-exports.getStackName = getStackName;
+exports.getBaseStackName = getBaseStackName;
 const getInfrastructureStackName = (qpqConfig) => {
-    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(qpqConfig);
-    return `${appName}-${environment}-inf`;
+    return `${(0, exports.getBaseStackName)(qpqConfig)}-inf`;
 };
 exports.getInfrastructureStackName = getInfrastructureStackName;
 const getWebStackName = (qpqConfig) => {
-    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(qpqConfig);
-    return `${appName}-${environment}-web`;
+    return `${(0, exports.getBaseStackName)(qpqConfig)}-web`;
 };
 exports.getWebStackName = getWebStackName;
 const getApiStackName = (qpqConfig) => {
-    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getAppFeature(qpqConfig);
-    return `${appName}-${environment}-api`;
+    return `${(0, exports.getBaseStackName)(qpqConfig)}-api`;
 };
 exports.getApiStackName = getApiStackName;
 const createConstructs = (owner, qpqConfig, settingsToCreate, qpqSettingConstructMap) => {
@@ -32,7 +30,7 @@ const createConstructs = (owner, qpqConfig, settingsToCreate, qpqSettingConstruc
         if (settingsToCreate.indexOf(qpqCoreConfigSettingType) >= 0 &&
             qpqSettingConstructMap[qpqCoreConfigSettingType]) {
             const ConstructClass = qpqSettingConstructMap[qpqCoreConfigSettingType];
-            new ConstructClass(owner, owner.childId(quidproquo_core_1.qpqCoreUtils.getUniqueKeyForSetting(setting)), owner.childProps(setting));
+            new ConstructClass(owner, quidproquo_core_1.qpqCoreUtils.getUniqueKeyForSetting(setting), owner.childProps(setting));
         }
     }
 };

package/package.json

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

package/src/constructs/QpqCoreParameterConstruct.ts

@@ -51,7 +51,7 @@ export class QpqCoreParameterConstruct extends QpqCoreParameterConstructBase {
   constructor(scope: Construct, id: string, props: QpqCoreParameterConstructProps) {
     super(scope, id, props);
 
-    this.stringParameter = new aws_ssm.StringParameter(this, this.childId('param'), {
+    this.stringParameter = new aws_ssm.StringParameter(this, 'param', {
       parameterName: this.resourceName(props.setting.key),
       description: props.setting.key,
       stringValue: props.setting.value,

package/src/constructs/QpqCoreRecurringScheduleConstruct.ts

@@ -15,7 +15,7 @@ export class QpqCoreRecurringScheduleConstruct extends QpqConstruct<ScheduleQPQC
   constructor(scope: Construct, id: string, props: QpqCoreRecurringScheduleConstructProps) {
     super(scope, id, props);
 
-    const schedulerFunction = new Function(this, this.childId(props.setting.uniqueKey), {
+    const schedulerFunction = new Function(this, props.setting.uniqueKey, {
       buildPath: qpqCoreUtils.getScheduleEntryFullPath(props.qpqConfig, props.setting),
       functionName: this.resourceName(`${props.setting.uniqueKey}-SE`),
       functionType: 'lambdaEventBridgeEvent',
@@ -37,7 +37,7 @@ export class QpqCoreRecurringScheduleConstruct extends QpqConstruct<ScheduleQPQC
     // TODO: Make this a utility function
     const grantables = qpqDeployAwsCdkUtils.getQqpGrantableResources(
       this,
-      this.childId('grantable'),
+      'grantable',
       this.qpqConfig,
     );
 
@@ -47,7 +47,7 @@ export class QpqCoreRecurringScheduleConstruct extends QpqConstruct<ScheduleQPQC
     // ///////// end todo
 
     // EventBridge rule which runs every five minutes
-    const cronRule = new aws_events.Rule(this, this.childId('cron'), {
+    const cronRule = new aws_events.Rule(this, 'cron', {
       schedule: aws_events.Schedule.expression(`cron(${props.setting.cronExpression})`),
     });