quidproquo-deploy-awscdk 0.0.62 → 0.0.63

package/lib/constructs/QpqWebserverWebEntryConstruct.js

@@ -46,7 +46,7 @@ class QpqWebserverWebEntryConstruct extends QpqConstruct_1.QpqConstruct {
         let originBucket = null;
         if (!this.setting.storageDrive.sourceStorageDrive) {
             originBucket = new aws_cdk_lib_1.aws_s3.Bucket(this, 'bucket', {
-                bucketName: this.qpqResourceName(`${props.setting.name}-web-entry`),
+                bucketName: this.qpqResourceName(`${props.setting.name}`, 'we'),
                 // Disable public access to this bucket, CloudFront will do that
                 publicReadAccess: false,
                 blockPublicAccess: aws_cdk_lib_1.aws_s3.BlockPublicAccess.BLOCK_ALL,

package/lib/constructs/basic/SubdomainName.js

@@ -12,7 +12,7 @@ class SubdomainName extends QpqConstruct_1.QpqConstruct {
         });
         const certificate = new aws_cdk_lib_1.aws_certificatemanager.Certificate(this, 'certificate', {
             domainName: newDomainName,
-            certificateName: this.qpqResourceName(props.subdomain),
+            certificateName: this.qpqResourceName(props.subdomain, 'cert'),
             validation: aws_cdk_lib_1.aws_certificatemanager.CertificateValidation.fromDns(apexHostedZone),
         });
         this.domainName = new aws_cdk_lib_1.aws_apigateway.DomainName(this, 'domain-name', {

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

@@ -11,5 +11,5 @@ export declare class QpqConstructBase extends Construct {
     apiLayerVersions?: aws_lambda.ILayerVersion[];
     constructor(scope: Construct, id: string, props: QpqConstructBaseProps);
     resourceName(name: string): string;
-    qpqResourceName(name: string): string;
+    qpqResourceName(name: string, resourceType: string): string;
 }

package/lib/constructs/core/QpqConstructBase.js

@@ -13,8 +13,8 @@ class QpqConstructBase extends constructs_1.Construct {
     resourceName(name) {
         return quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getConfigRuntimeResourceName(name, this.qpqConfig);
     }
-    qpqResourceName(name) {
-        return quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getQpqRuntimeResourceName(name, this.qpqConfig);
+    qpqResourceName(name, resourceType) {
+        return quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getQpqRuntimeResourceName(name, this.qpqConfig, resourceType);
     }
 }
 exports.QpqConstructBase = QpqConstructBase;

package/package.json

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

package/src/constructs/QpqWebserverWebEntryConstruct.ts

@@ -39,7 +39,7 @@ export class QpqWebserverWebEntryConstruct extends QpqConstruct<WebEntryQPQWebSe
 
     if (!this.setting.storageDrive.sourceStorageDrive) {
       originBucket = new aws_s3.Bucket(this, 'bucket', {
-        bucketName: this.qpqResourceName(`${props.setting.name}-web-entry`),
+        bucketName: this.qpqResourceName(`${props.setting.name}`, 'we'),
         // Disable public access to this bucket, CloudFront will do that
         publicReadAccess: false,
         blockPublicAccess: aws_s3.BlockPublicAccess.BLOCK_ALL,

package/src/constructs/basic/SubdomainName.ts

@@ -26,7 +26,7 @@ export class SubdomainName extends QpqConstruct<any> {
 
     const certificate = new aws_certificatemanager.Certificate(this, 'certificate', {
       domainName: newDomainName,
-      certificateName: this.qpqResourceName(props.subdomain),
+      certificateName: this.qpqResourceName(props.subdomain, 'cert'),
       validation: aws_certificatemanager.CertificateValidation.fromDns(apexHostedZone),
     });
 

package/src/constructs/core/QpqConstructBase.ts

@@ -26,7 +26,7 @@ export class QpqConstructBase extends Construct {
     return awsNamingUtils.getConfigRuntimeResourceName(name, this.qpqConfig);
   }
 
-  qpqResourceName(name: string) {
-    return awsNamingUtils.getQpqRuntimeResourceName(name, this.qpqConfig);
+  qpqResourceName(name: string, resourceType: string) {
+    return awsNamingUtils.getQpqRuntimeResourceName(name, this.qpqConfig, resourceType);
   }
 }