@gradientedge/cdk-utils 4.11.1 → 4.11.2

package/dist/src/lib/common/stack.d.ts

@@ -34,6 +34,7 @@ export declare class CommonStack extends cdk.Stack {
         domainName: any;
         subDomain: any;
         extraContexts: any;
+        skipStageForARecords: any;
     };
     /**
      * @summary Method to determine extra cdk contexts apart from the main cdk.json

package/dist/src/lib/common/stack.js

@@ -72,6 +72,7 @@ class CommonStack extends cdk.Stack {
             domainName: this.node.tryGetContext('domainName'),
             subDomain: this.node.tryGetContext('subDomain'),
             extraContexts: this.node.tryGetContext('extraContexts'),
+            skipStageForARecords: this.node.tryGetContext('skipStageForARecords'),
         };
     }
     /**

package/dist/src/lib/construct/api-to-eventbridge-target/main.js

@@ -617,7 +617,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
     createApiRouteAssets() {
         if (this.props.api.useExisting)
             return;
-        this.route53Manager.createApiGatewayARecord(`${this.id}-custom-domain-a-record`, this, this.props.apiSubDomain, this.apiDestinedRestApi.domain, this.apiDestinedRestApi.hostedZone);
+        this.route53Manager.createApiGatewayARecord(`${this.id}-custom-domain-a-record`, this, this.props.apiSubDomain, this.apiDestinedRestApi.domain, this.apiDestinedRestApi.hostedZone, this.props.skipStageForARecords);
     }
 }
 exports.ApiToEventBridgeTarget = ApiToEventBridgeTarget;

package/dist/src/lib/construct/graphql-api-lambda/main.js

@@ -206,7 +206,7 @@ class GraphQLApiLambda extends common_1.CommonConstruct {
      * @protected
      */
     createApiRouteAssets() {
-        this.route53Manager.createApiGatewayARecord(`${this.id}-custom-domain-a-record`, this, this.props.apiSubDomain, this.graphQLApiDomain, this.graphQLApiHostedZone);
+        this.route53Manager.createApiGatewayARecord(`${this.id}-custom-domain-a-record`, this, this.props.apiSubDomain, this.graphQLApiDomain, this.graphQLApiHostedZone, this.props.skipStageForARecords);
     }
 }
 exports.GraphQLApiLambda = GraphQLApiLambda;

package/dist/src/lib/construct/site-with-ecs-backend/main.js

@@ -316,7 +316,7 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
      * @protected
      */
     createNetworkMappings() {
-        this.route53Manager.createCloudFrontTargetARecord(`${this.id}-a-record`, this, this.siteDistribution, this.siteHostedZone, this.props.siteRecordName);
+        this.route53Manager.createCloudFrontTargetARecord(`${this.id}-a-record`, this, this.siteDistribution, this.siteHostedZone, this.props.siteRecordName, this.props.skipStageForARecords);
     }
     /**
      * Method to invalidation the cloudfront distribution cache after a deployment

package/dist/src/lib/construct/static-site/main.js

@@ -156,10 +156,7 @@ class StaticSite extends common_1.CommonConstruct {
      * @protected
      */
     createSiteRouteAssets() {
-        this.siteARecord = this.route53Manager.createCloudFrontTargetARecord(`${this.id}-domain-a-record`, this, this.siteDistribution, this.siteHostedZone, this.props.siteRecordName);
-        if (!this.isProductionStage() && this.props.siteCreateAltARecord) {
-            this.siteARecordAlt = this.route53Manager.createCloudFrontTargetARecordV2(`${this.id}-domain-a-record-alt`, this, this.siteDistribution, this.siteHostedZone, this.props.siteRecordName);
-        }
+        this.siteARecord = this.route53Manager.createCloudFrontTargetARecord(`${this.id}-domain-a-record`, this, this.siteDistribution, this.siteHostedZone, this.props.siteRecordName, this.props.skipStageForARecords);
     }
     /**
      * @summary Method to deploy the static assets into s3 bucket for static site

package/dist/src/lib/manager/aws/route53-manager.d.ts

@@ -45,8 +45,9 @@ export declare class Route53Manager {
      * @param {cloudfront.IDistribution} distribution
      * @param {route53.IHostedZone} hostedZone
      * @param {string} recordName
+     * @param skipStageFromRecord
      */
-    createCloudFrontTargetARecord(id: string, scope: common.CommonConstruct, distribution?: cloudfront.IDistribution, hostedZone?: route53.IHostedZone, recordName?: string): route53.ARecord;
+    createCloudFrontTargetARecord(id: string, scope: common.CommonConstruct, distribution?: cloudfront.IDistribution, hostedZone?: route53.IHostedZone, recordName?: string, skipStageFromRecord?: boolean): route53.ARecord;
     /**
      * @summary Method to create a-record for cloudfront target
      * @param {string} id scoped id of the resource
@@ -63,6 +64,7 @@ export declare class Route53Manager {
      * @param recordName
      * @param apiDomain
      * @param hostedZone
+     * @param skipStageFromRecord
      */
-    createApiGatewayARecord(id: string, scope: common.CommonConstruct, recordName: string, apiDomain: apig.DomainName, hostedZone: route53.IHostedZone): route53.ARecord;
+    createApiGatewayARecord(id: string, scope: common.CommonConstruct, recordName: string, apiDomain: apig.DomainName, hostedZone: route53.IHostedZone, skipStageFromRecord?: boolean): route53.ARecord;
 }

package/dist/src/lib/manager/aws/route53-manager.js

@@ -103,14 +103,17 @@ class Route53Manager {
      * @param {cloudfront.IDistribution} distribution
      * @param {route53.IHostedZone} hostedZone
      * @param {string} recordName
+     * @param skipStageFromRecord
      */
-    createCloudFrontTargetARecord(id, scope, distribution, hostedZone, recordName) {
+    createCloudFrontTargetARecord(id, scope, distribution, hostedZone, recordName, skipStageFromRecord) {
         if (!distribution)
             throw `Distribution undefined`;
         if (!hostedZone)
             throw `HostedZone undefined`;
         const aRecord = new route53.ARecord(scope, `${id}`, {
-            recordName: recordName && scope.isProductionStage() ? `${recordName}` : `${recordName}-${scope.props.stage}`,
+            recordName: (recordName && scope.isProductionStage()) || skipStageFromRecord
+                ? `${recordName}`
+                : `${recordName}-${scope.props.stage}`,
             target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(distribution)),
             zone: hostedZone,
         });
@@ -145,11 +148,13 @@ class Route53Manager {
      * @param recordName
      * @param apiDomain
      * @param hostedZone
+     * @param skipStageFromRecord
      */
-    createApiGatewayARecord(id, scope, recordName, apiDomain, hostedZone) {
+    createApiGatewayARecord(id, scope, recordName, apiDomain, hostedZone, skipStageFromRecord) {
         let apiRecordName = '';
         if (recordName && recordName !== '')
-            apiRecordName = scope.isProductionStage() ? `${recordName}` : `${recordName}-${scope.props.stage}`;
+            apiRecordName =
+                scope.isProductionStage() || skipStageFromRecord ? `${recordName}` : `${recordName}-${scope.props.stage}`;
         const apiARecord = new route53.ARecord(scope, `${id}`, {
             recordName: apiRecordName,
             target: route53.RecordTarget.fromAlias(new route53Targets.ApiGatewayDomain(apiDomain)),

package/dist/src/lib/types/aws/index.d.ts

@@ -49,6 +49,7 @@ export interface CommonStackProps extends cdk.StackProps {
     subDomain?: string;
     extraContexts?: string[];
     stageContextPath?: string;
+    skipStageForARecords: boolean;
 }
 /**
  * @category cdk-utils.site-with-ecs-backend

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

package/src/lib/common/stack.ts

@@ -55,6 +55,7 @@ export class CommonStack extends cdk.Stack {
       domainName: this.node.tryGetContext('domainName'),
       subDomain: this.node.tryGetContext('subDomain'),
       extraContexts: this.node.tryGetContext('extraContexts'),
+      skipStageForARecords: this.node.tryGetContext('skipStageForARecords'),
     }
   }
 

package/src/lib/construct/api-to-eventbridge-target/main.ts

@@ -687,7 +687,8 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       this,
       this.props.apiSubDomain,
       this.apiDestinedRestApi.domain,
-      this.apiDestinedRestApi.hostedZone
+      this.apiDestinedRestApi.hostedZone,
+      this.props.skipStageForARecords
     )
   }
 }

package/src/lib/construct/graphql-api-lambda/main.ts

@@ -252,7 +252,8 @@ export class GraphQLApiLambda extends CommonConstruct {
       this,
       this.props.apiSubDomain,
       this.graphQLApiDomain,
-      this.graphQLApiHostedZone
+      this.graphQLApiHostedZone,
+      this.props.skipStageForARecords
     )
   }
 }

package/src/lib/construct/site-with-ecs-backend/main.ts

@@ -365,7 +365,8 @@ export class SiteWithEcsBackend extends CommonConstruct {
       this,
       this.siteDistribution,
       this.siteHostedZone,
-      this.props.siteRecordName
+      this.props.siteRecordName,
+      this.props.skipStageForARecords
     )
   }
 

package/src/lib/construct/static-site/main.ts

@@ -184,18 +184,9 @@ export class StaticSite extends CommonConstruct {
       this,
       this.siteDistribution,
       this.siteHostedZone,
-      this.props.siteRecordName
+      this.props.siteRecordName,
+      this.props.skipStageForARecords
     )
-
-    if (!this.isProductionStage() && this.props.siteCreateAltARecord) {
-      this.siteARecordAlt = this.route53Manager.createCloudFrontTargetARecordV2(
-        `${this.id}-domain-a-record-alt`,
-        this,
-        this.siteDistribution,
-        this.siteHostedZone,
-        this.props.siteRecordName
-      )
-    }
   }
 
   /**

package/src/lib/manager/aws/route53-manager.ts

@@ -92,19 +92,24 @@ export class Route53Manager {
    * @param {cloudfront.IDistribution} distribution
    * @param {route53.IHostedZone} hostedZone
    * @param {string} recordName
+   * @param skipStageFromRecord
    */
   public createCloudFrontTargetARecord(
     id: string,
     scope: common.CommonConstruct,
     distribution?: cloudfront.IDistribution,
     hostedZone?: route53.IHostedZone,
-    recordName?: string
+    recordName?: string,
+    skipStageFromRecord?: boolean
   ) {
     if (!distribution) throw `Distribution undefined`
     if (!hostedZone) throw `HostedZone undefined`
 
     const aRecord = new route53.ARecord(scope, `${id}`, {
-      recordName: recordName && scope.isProductionStage() ? `${recordName}` : `${recordName}-${scope.props.stage}`,
+      recordName:
+        (recordName && scope.isProductionStage()) || skipStageFromRecord
+          ? `${recordName}`
+          : `${recordName}-${scope.props.stage}`,
       target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(distribution)),
       zone: hostedZone,
     })
@@ -150,17 +155,20 @@ export class Route53Manager {
    * @param recordName
    * @param apiDomain
    * @param hostedZone
+   * @param skipStageFromRecord
    */
   public createApiGatewayARecord(
     id: string,
     scope: common.CommonConstruct,
     recordName: string,
     apiDomain: apig.DomainName,
-    hostedZone: route53.IHostedZone
+    hostedZone: route53.IHostedZone,
+    skipStageFromRecord?: boolean
   ) {
     let apiRecordName = ''
     if (recordName && recordName !== '')
-      apiRecordName = scope.isProductionStage() ? `${recordName}` : `${recordName}-${scope.props.stage}`
+      apiRecordName =
+        scope.isProductionStage() || skipStageFromRecord ? `${recordName}` : `${recordName}-${scope.props.stage}`
 
     const apiARecord = new route53.ARecord(scope, `${id}`, {
       recordName: apiRecordName,

package/src/lib/types/aws/index.ts

@@ -51,6 +51,7 @@ export interface CommonStackProps extends cdk.StackProps {
   subDomain?: string
   extraContexts?: string[]
   stageContextPath?: string
+  skipStageForARecords: boolean
 }
 
 /**