@gradientedge/cdk-utils 9.9.0 → 9.10.0

package/dist/src/lib/aws/services/simple-storage-service/types.d.ts

@@ -1,6 +1,7 @@
-import { TagProps } from '../../types';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as s3deploy from 'aws-cdk-lib/aws-s3-deployment';
+import { ResourceNameFormatterProps } from '../../common';
+import { TagProps } from '../../types';
 /**
  */
 export interface LifecycleRule extends s3.LifecycleRule {
@@ -21,5 +22,6 @@ export interface S3BucketProps extends s3.BucketProps {
     existingBucket?: boolean;
     lifecycleRules?: LifecycleRule[];
     logBucketName?: string;
+    resourceNameOptions?: ResourceNameFormatterProps;
     tags?: TagProps[];
 }

package/dist/src/lib/aws/services/step-function/main.js

@@ -366,6 +366,8 @@ class SfnManager {
     createStateMachine(id, scope, props, definition, logGroup, role) {
         if (!props)
             throw `State Machine props undefined for ${id}`;
+        if (!props.stateMachineName)
+            throw `State Machine stateMachineName undefined for ${id}`;
         const stateMachine = new aws_stepfunctions_1.StateMachine(scope, `${id}`, {
             ...props,
             definitionBody: aws_stepfunctions_1.DefinitionBody.fromChainable(definition),
@@ -375,7 +377,7 @@ class SfnManager {
                 level: props.logs?.level ?? aws_stepfunctions_1.LogLevel.ALL,
             },
             role,
-            stateMachineName: `${props.stateMachineName}-${scope.props.stage}`,
+            stateMachineName: scope.resourceNameFormatter(props.stateMachineName, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-stateMachineName`, scope, stateMachine.stateMachineName);
         (0, utils_1.createCfnOutput)(`${id}-stateMachineArn`, scope, stateMachine.stateMachineArn);

package/dist/src/lib/aws/services/step-function/types.d.ts

@@ -1,5 +1,6 @@
 import { ChoiceProps, FailProps, MapProps, ParallelProps, PassProps, RetryProps, StateMachineProps, SucceedProps, WaitProps } from 'aws-cdk-lib/aws-stepfunctions';
 import { CallApiGatewayRestApiEndpointProps, DynamoDeleteItemProps, DynamoGetItemProps, DynamoPutItemProps, LambdaInvokeProps, SqsSendMessageProps, StepFunctionsStartExecutionProps } from 'aws-cdk-lib/aws-stepfunctions-tasks';
+import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface SfnSucceedProps extends SucceedProps {
@@ -76,6 +77,7 @@ export interface SfnCallApiGatewayRestApiEndpointProps extends CallApiGatewayRes
 /**
  */
 export interface SfnStateMachineProps extends StateMachineProps {
+    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */

package/dist/src/lib/aws/services/virtual-private-cloud/main.js

@@ -38,14 +38,18 @@ class VpcManager {
     createVpc(id, scope, props) {
         if (!props)
             throw `Vpc props undefined for ${id}`;
+        if (!props.vpcName)
+            throw `Vpc vpcName undefined for ${id}`;
+        const vpcName = scope.resourceNameFormatter(props.vpcName, props.resourceNameOptions);
         let vpc;
         if (props.isIPV6) {
             vpc = new ipv6_1.Ipv6Vpc(scope, `${id}`, {
                 ...props,
                 subnetConfiguration: [
-                    { name: `${id}-public`, subnetType: aws_ec2_1.SubnetType.PUBLIC },
-                    { name: `${id}-private`, subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS },
+                    { name: `${vpcName}-public`, subnetType: aws_ec2_1.SubnetType.PUBLIC },
+                    { name: `${vpcName}-private`, subnetType: aws_ec2_1.SubnetType.PRIVATE_WITH_EGRESS },
                 ],
+                vpcName,
             });
         }
         else {
@@ -78,7 +82,10 @@ class VpcManager {
      * @param vpcIdentifier optional identifier for VPC
      */
     retrieveCommonVpc(id, scope, vpcIdentifier) {
-        return aws_ec2_1.Vpc.fromLookup(scope, `${id}`, { vpcName: vpcIdentifier ?? CommonVpcIdentifier });
+        const vpcName = scope.resourceNameFormatter(vpcIdentifier ?? CommonVpcIdentifier);
+        return aws_ec2_1.Vpc.fromLookup(scope, `${id}`, {
+            vpcName: scope.resourceNameFormatter(vpcIdentifier ?? CommonVpcIdentifier),
+        });
     }
 }
 exports.VpcManager = VpcManager;

package/dist/src/lib/aws/services/virtual-private-cloud/types.d.ts

@@ -1,4 +1,6 @@
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
+import { ResourceNameFormatterProps } from '../../common';
 export interface VpcProps extends ec2.VpcProps {
     isIPV6?: boolean;
+    resourceNameOptions?: ResourceNameFormatterProps;
 }

package/dist/src/lib/aws/services/web-application-firewall/main.js

@@ -29,10 +29,12 @@ class WafManager {
     createIpSet(id, scope, props) {
         if (!props)
             throw `WAF Ip Set props undefined for ${id}`;
+        if (!props.name)
+            throw `WAF Ip Set name undefined for ${id}`;
         const ipSet = new aws_wafv2_1.CfnIPSet(scope, `${id}`, {
             ...props,
             description: `IP Set for ${id} - ${scope.props.stage} stage`,
-            name: scope.isProductionStage() ? props.name : `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-ipSetId`, scope, ipSet.attrId);
         (0, utils_1.createCfnOutput)(`${id}-ipSetArn`, scope, ipSet.attrArn);
@@ -47,10 +49,12 @@ class WafManager {
     createWebAcl(id, scope, props) {
         if (!props)
             throw `WAF WebACL props undefined for ${id}`;
+        if (!props.name)
+            throw `WAF WebACL name undefined for ${id}`;
         const webAcl = new aws_wafv2_1.CfnWebACL(scope, `${id}`, {
             ...props,
             description: `Web Acl for ${id} - ${scope.props.stage} stage`,
-            name: scope.isProductionStage() ? props.name : `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
             tags: [{ key: 'service', value: scope.props.name }],
         });
         (0, utils_1.createCfnOutput)(`${id}-webAclId`, scope, webAcl.attrId);

package/dist/src/lib/aws/services/web-application-firewall/types.d.ts

@@ -1,9 +1,12 @@
 import { CfnIPSetProps, CfnWebACLProps } from 'aws-cdk-lib/aws-wafv2';
+import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface WafIPSetProps extends CfnIPSetProps {
+    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
 export interface WafWebACLProps extends CfnWebACLProps {
+    resourceNameOptions?: ResourceNameFormatterProps;
 }

package/package.json

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

package/src/lib/aws/common/construct.ts

@@ -33,7 +33,7 @@ import {
   WafManager,
 } from '../services'
 import { createCfnOutput } from '../utils'
-import { CommonStackProps } from './types'
+import { CommonStackProps, ResourceNameFormatterProps } from './types'
 
 /**
  * @subcategory Construct
@@ -118,6 +118,21 @@ export class CommonConstruct extends Construct {
     this.determineFullyQualifiedDomain()
   }
 
+  /**
+   * @summary Helper method to format a resource name based on the provided options
+   * @param resourceName the resource name to format
+   * @param options options to control the formatting of the resource name
+   * @returns The formatted resource name
+   */
+  public resourceNameFormatter(resourceName: string, options?: ResourceNameFormatterProps) {
+    const resourceNameElements = []
+    resourceNameElements.push(options?.prefix ?? this.props.resourcePrefix)
+    resourceNameElements.push(resourceName)
+    resourceNameElements.push(options?.suffix ?? this.props.resourceSuffix)
+    resourceNameElements.push(this.props.stage)
+    return resourceNameElements.filter(resourceNameElement => resourceNameElement != undefined).join('-')
+  }
+
   /**
    * @summary Helper method to add CloudFormation outputs from the construct
    * @param id scoped id of the resource

package/src/lib/aws/common/stack.ts

@@ -52,11 +52,14 @@ export class CommonStack extends Stack {
     return {
       domainName: this.node.tryGetContext('domainName'),
       excludeDomainNameForBuckets: this.node.tryGetContext('excludeDomainNameForBuckets'),
+      excludeAccountNumberForBuckets: this.node.tryGetContext('excludeAccountNumberForBuckets'),
       extraContexts: this.node.tryGetContext('extraContexts'),
       logRetention: this.node.tryGetContext('logRetention'),
       name: props.stackName || 'cdk-utils',
       nodejsRuntime: this.node.tryGetContext('nodejsRuntime') ?? CommonStack.NODEJS_RUNTIME,
       region: this.node.tryGetContext('region'),
+      resourcePrefix: this.node.tryGetContext('resourcePrefix'),
+      resourceSuffix: this.node.tryGetContext('resourceSuffix'),
       skipStageForARecords: this.node.tryGetContext('skipStageForARecords'),
       stackName: props.stackName,
       stage: this.node.tryGetContext('stage'),

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

@@ -7,9 +7,18 @@ import { BaseProps } from '../../common'
  */
 export interface CommonStackProps extends BaseProps, StackProps {
   region: string
+  resourceProjectIdentifier?: string
+  resourcePrefix?: string
+  resourceSuffix?: string
   logRetention?: RetentionDays
   defaultReservedLambdaConcurrentExecutions?: number
   defaultTracing?: Tracing
   excludeDomainNameForBuckets?: boolean
+  excludeAccountNumberForBuckets?: boolean
   nodejsRuntime?: Runtime
 }
+
+export interface ResourceNameFormatterProps {
+  prefix?: string
+  suffix?: string
+}

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

@@ -126,6 +126,8 @@ export class ApiToAnyTarget extends CommonConstruct {
       return
     }
 
+    if (!this.props.api.restApi?.restApiName) throw `RestApi name undefined for ${this.id}`
+
     this.apiToAnyTargetRestApi.api = new RestApi(this, `${this.id}-rest-api`, {
       cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
       defaultCorsPreflightOptions: {
@@ -151,8 +153,11 @@ export class ApiToAnyTarget extends CommonConstruct {
       endpointConfiguration: {
         types: [this.isProductionStage() ? EndpointType.EDGE : EndpointType.REGIONAL],
       },
-      restApiName: `${this.id}-rest-api-${this.props.stage}`,
       ...this.props.api.restApi,
+      restApiName: this.resourceNameFormatter(
+        this.props.api.restApi?.restApiName,
+        this.props.api.restApi?.resourceNameOptions
+      ),
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiToAnyTargetRestApi.api.restApiId)
     this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiToAnyTargetRestApi.api.root.resourceId)

package/src/lib/aws/construct/api-to-any-target/types.ts

@@ -9,13 +9,12 @@ import {
   MethodResponse,
   MockIntegration,
   Resource,
-  RestApiProps,
 } from 'aws-cdk-lib/aws-apigateway'
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
 import { LogGroup } from 'aws-cdk-lib/aws-logs'
 import { IHostedZone } from 'aws-cdk-lib/aws-route53'
 import { CommonStackProps } from '../../common'
-import { AcmProps } from '../../services'
+import { AcmProps, RestApigProps } from '../../services'
 
 export interface ApiToAnyTargetRestApiType {
   accessLogGroup: LogGroup
@@ -54,7 +53,7 @@ export interface ApiToAnyTargetRestApiProps {
   importedRestApiRootResourceRef?: string
   methodErrorResponse: MethodResponse
   methodResponse: MethodResponse
-  restApi: RestApiProps
+  restApi: RestApigProps
   useExisting: boolean
   withResource?: boolean
 }

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

@@ -374,6 +374,8 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       return
     }
 
+    if (!this.props.api.restApi?.restApiName) throw `RestApi name undefined for ${this.id}`
+
     this.apiToEventBridgeTargetRestApi.api = new RestApi(this, `${this.id}-rest-api`, {
       cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
       defaultCorsPreflightOptions: {
@@ -402,9 +404,13 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       endpointConfiguration: {
         types: [EndpointType.REGIONAL],
       },
-      restApiName: `${this.id}-rest-api-${this.props.stage}`,
       ...this.props.api.restApi,
+      restApiName: this.resourceNameFormatter(
+        this.props.api.restApi?.restApiName,
+        this.props.api.restApi?.resourceNameOptions
+      ),
     })
+
     this.addCfnOutput(`${this.id}-restApiId`, this.apiToEventBridgeTargetRestApi.api.restApiId)
     this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiToEventBridgeTargetRestApi.api.root.resourceId)
   }

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

@@ -1,5 +1,3 @@
-import { IEventBus, Rule } from 'aws-cdk-lib/aws-events'
-import { LogGroup } from 'aws-cdk-lib/aws-logs'
 import {
   DomainName,
   IAuthorizer,
@@ -12,15 +10,16 @@ import {
   Model,
   ModelOptions,
   Resource,
-  RestApiProps,
 } from 'aws-cdk-lib/aws-apigateway'
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
+import { IEventBus, Rule } from 'aws-cdk-lib/aws-events'
+import { PolicyDocument, Role } from 'aws-cdk-lib/aws-iam'
+import { AssetCode } from 'aws-cdk-lib/aws-lambda'
+import { LogGroup } from 'aws-cdk-lib/aws-logs'
 import { IHostedZone } from 'aws-cdk-lib/aws-route53'
 import { ITopic } from 'aws-cdk-lib/aws-sns'
-import { PolicyDocument, Role } from 'aws-cdk-lib/aws-iam'
 import { CommonStackProps } from '../../common'
-import { AcmProps, EventRuleProps, LambdaProps, LogProps } from '../../services'
-import { AssetCode } from 'aws-cdk-lib/aws-lambda'
+import { AcmProps, EventRuleProps, LambdaProps, LogProps, RestApigProps } from '../../services'
 
 /**
  */
@@ -73,7 +72,7 @@ export interface ApiToEventBridgeTargetRestApiProps {
   methodResponse?: MethodResponse
   resource: string
   responseModel?: ModelOptions
-  restApi?: RestApiProps
+  restApi?: RestApigProps
   useExisting: boolean
   withResource?: boolean
 }

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

@@ -362,7 +362,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
       `${this.id}-destined-topic`,
       this,
       {
-        topicName: `${this.id}-destined-topic`,
+        topicName: this.resourceNameFormatter(`${this.id}-destined-topic`),
       },
       this.apiDestinedLambda.function
     )
@@ -513,6 +513,8 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
       removalPolicy: RemovalPolicy.DESTROY,
     })
 
+    if (!this.props.api.restApi?.restApiName) throw `RestApi name undefined for ${this.id}`
+
     this.apiDestinedRestApi.api = new RestApi(this, `${this.id}-sns-rest-api`, {
       defaultCorsPreflightOptions: {
         allowHeaders: Cors.DEFAULT_HEADERS,
@@ -535,8 +537,11 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
       endpointConfiguration: {
         types: [EndpointType.REGIONAL],
       },
-      restApiName: `${this.id}-destined-rest-api-${this.props.stage}`,
       ...this.props.api,
+      restApiName: this.resourceNameFormatter(
+        this.props.api.restApi?.restApiName,
+        this.props.api.restApi?.resourceNameOptions
+      ),
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId)
     this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiDestinedRestApi.api.root.resourceId)

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

@@ -138,7 +138,7 @@ export class ApiToLambdaTarget extends CommonConstruct {
     this.apiToLambdaTargetRestApi.lambda = Function.fromFunctionName(
       this,
       `${this.id}-lambda`,
-      this.props.lambdaFunctionName
+      this.resourceNameFormatter(this.props.lambdaFunctionName)
     )
   }
 

package/src/lib/aws/construct/lambda-with-iam-access/main.ts

@@ -187,11 +187,11 @@ export class LambdaWithIamAccess extends CommonConstruct {
    */
   protected createIamUserForLambdaFunction() {
     this.lambdaIamUser = new User(this, `${this.id}-lambda-user`, {
-      userName: `${this.id}-user-${this.props.stage}`,
+      userName: this.resourceNameFormatter(`${this.id}-user`),
     })
 
     new Policy(this, `${this.id}-lambda-user-policy`, {
-      policyName: `${this.id}-policy-${this.props.stage}`,
+      policyName: this.resourceNameFormatter(`${this.id}-policy`),
       statements: [
         new PolicyStatement({
           actions: ['lambda:InvokeFunction'],
@@ -204,7 +204,7 @@ export class LambdaWithIamAccess extends CommonConstruct {
     if (this.props.lambda.lambdaAliases && !_.isEmpty(this.props.lambda.lambdaAliases)) {
       _.forEach(this.props.lambda.lambdaAliases, (alias, index) => {
         new Policy(this, `${this.id}-alias-user-policy`, {
-          policyName: `${this.id}-alias-policy-${index}-${this.props.stage}`,
+          policyName: this.resourceNameFormatter(`${this.id}--alias-policy-${index}`),
           statements: [
             new PolicyStatement({
               actions: ['lambda:InvokeFunction'],
@@ -230,9 +230,9 @@ export class LambdaWithIamAccess extends CommonConstruct {
    * @summary Method to create iam secret for the lambda function
    */
   protected createIamSecretForLambdaFunction() {
-    this.lambdaUserAccessSecret = new Secret(
-      this,
+    this.lambdaUserAccessSecret = this.secretsManager.createSecret(
       `${this.id}-lambda-user-secret-${this.props.stage}`,
+      this,
       this.props.lambdaSecret
     )
 

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

@@ -296,13 +296,11 @@ export class SiteWithEcsBackend extends CommonConstruct {
       enableECSManagedTags: true,
       healthCheckGracePeriod: Duration.seconds(60),
       listenerPort: this.props.siteTask.listenerPort,
-      loadBalancerName: this.props.siteTask.loadBalancerName
-        ? `${this.props.siteTask.loadBalancerName}-${this.props.stage}`
-        : `${this.id}-${this.props.stage}`,
+      loadBalancerName: this.resourceNameFormatter(this.props.siteTask.loadBalancerName ?? this.id),
       maxHealthyPercent: this.props.siteTask.maxHealthyPercent,
       memoryLimitMiB: this.props.siteTask.memoryLimitMiB,
       minHealthyPercent: this.props.siteTask.minHealthyPercent,
-      serviceName: `${this.id}-${this.props.stage}`,
+      serviceName: this.resourceNameFormatter(this.props.siteTask.serviceName ?? this.id),
       taskDefinition: this.props.siteTask.taskDefinition,
       taskImageOptions: {
         containerPort: this.props.siteTask.taskImageOptions?.containerPort,
@@ -402,7 +400,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
           transitEncryption: this.props.siteFileSystem.transitEncryption,
           transitEncryptionPort: this.props.siteFileSystem.transitEncryptionPort,
         },
-        name: `${this.id}-fs`,
+        name: this.resourceNameFormatter(this.props.siteFileSystem?.fileSystemName ?? this.id),
       })
 
       if (this.props.siteTask.mountPoints && !_.isEmpty(this.props.siteTask.mountPoints)) {
@@ -410,7 +408,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
           this.siteEcsTaskDefinition.defaultContainer?.addMountPoints({
             containerPath: mountPoint.containerPath,
             readOnly: mountPoint.readOnly,
-            sourceVolume: `${this.id}-fs`,
+            sourceVolume: this.resourceNameFormatter(this.props.siteFileSystem?.fileSystemName ?? this.id),
           })
         })
       }
@@ -430,8 +428,10 @@ export class SiteWithEcsBackend extends CommonConstruct {
   }
 
   protected createSiteCachePolicy(id: string, siteCachePolicy: SiteCachePolicyProps) {
+    if (!siteCachePolicy.cachePolicyName) throw `SiteCachePolicy cachePolicyName undefined for ${id}`
+
     return new CachePolicy(this, `${id}`, {
-      cachePolicyName: `${this.id}-${siteCachePolicy.cachePolicyName}`,
+      cachePolicyName: this.resourceNameFormatter(siteCachePolicy.cachePolicyName),
       comment: `Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: siteCachePolicy.cookieBehavior,
       enableAcceptEncodingBrotli: siteCachePolicy.enableAcceptEncodingBrotli,
@@ -453,11 +453,14 @@ export class SiteWithEcsBackend extends CommonConstruct {
 
   protected createSiteOriginRequestPolicy() {
     if (!this.props.siteOriginRequestPolicy) return
+    if (!this.props.siteOriginRequestPolicy.originRequestPolicyName)
+      throw `SiteOriginRequestPolicy originRequestPolicyName undefined for ${this.id}`
+
     this.siteOriginRequestPolicy = new OriginRequestPolicy(this, `${this.id}-sorp`, {
       comment: `Request Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: this.props.siteOriginRequestPolicy.cookieBehavior,
       headerBehavior: this.props.siteOriginRequestPolicy.headerBehavior,
-      originRequestPolicyName: `${this.id}-origin-request`,
+      originRequestPolicyName: this.resourceNameFormatter(this.props.siteOriginRequestPolicy.originRequestPolicyName),
       queryStringBehavior: this.props.siteOriginRequestPolicy.queryStringBehavior,
     })
 
@@ -468,10 +471,13 @@ export class SiteWithEcsBackend extends CommonConstruct {
 
   protected createResponseHeaderPolicy(props: SiteResponseHeadersPolicyProps) {
     if (!props) return undefined
+    if (!props.responseHeadersPolicyName)
+      throw `SiteResponseHeadersPolicy responseHeadersPolicyName undefined for ${this.id}`
+
     return new ResponseHeadersPolicy(this, `${this.id}-${props.type}-srhp`, {
       ...props,
       comment: `Response Header Policy for ${props.type} for ${this.id}-distribution - ${this.props.stage} stage`,
-      responseHeadersPolicyName: `${this.id}-${props.type}-response`,
+      responseHeadersPolicyName: this.resourceNameFormatter(props.responseHeadersPolicyName),
       securityHeadersBehavior: {
         ...props.securityHeadersBehavior,
         strictTransportSecurity: {

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

@@ -190,8 +190,10 @@ export class SiteWithLambdaBackend extends CommonConstruct {
   }
 
   protected createSiteCachePolicy(id: string, siteCachePolicy: SiteWithLambdaBackendCachePolicyProps) {
+    if (!siteCachePolicy.cachePolicyName) throw `SiteCachePolicy cachePolicyName undefined for ${id}`
+
     return new CachePolicy(this, `${id}`, {
-      cachePolicyName: `${this.id}-${siteCachePolicy.cachePolicyName}`,
+      cachePolicyName: this.resourceNameFormatter(siteCachePolicy.cachePolicyName),
       comment: `Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: siteCachePolicy.cookieBehavior,
       enableAcceptEncodingBrotli: siteCachePolicy.enableAcceptEncodingBrotli,
@@ -213,11 +215,14 @@ export class SiteWithLambdaBackend extends CommonConstruct {
 
   protected createSiteOriginRequestPolicy() {
     if (!this.props.siteOriginRequestPolicy) return
+    if (!this.props.siteOriginRequestPolicy.originRequestPolicyName)
+      throw `SiteOriginRequestPolicy originRequestPolicyName undefined for ${this.id}`
+
     this.siteOriginRequestPolicy = new OriginRequestPolicy(this, `${this.id}-sorp`, {
       comment: `Request Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: this.props.siteOriginRequestPolicy.cookieBehavior,
       headerBehavior: this.props.siteOriginRequestPolicy.headerBehavior,
-      originRequestPolicyName: `${this.id}-origin-request`,
+      originRequestPolicyName: this.resourceNameFormatter(this.props.siteOriginRequestPolicy.originRequestPolicyName),
       queryStringBehavior: this.props.siteOriginRequestPolicy.queryStringBehavior,
     })
 
@@ -228,10 +233,13 @@ export class SiteWithLambdaBackend extends CommonConstruct {
 
   protected createResponseHeaderPolicy(props: SiteWithLambdaBackendResponseHeadersPolicyProps) {
     if (!props) return undefined
+    if (!props.responseHeadersPolicyName)
+      throw `SiteResponseHeadersPolicy responseHeadersPolicyName undefined for ${this.id}`
+
     return new ResponseHeadersPolicy(this, `${this.id}-${props.type}-srhp`, {
       ...props,
       comment: `Response Header Policy for ${props.type} for ${this.id}-distribution - ${this.props.stage} stage`,
-      responseHeadersPolicyName: `${this.id}-${props.type}-response`,
+      responseHeadersPolicyName: this.resourceNameFormatter(props.responseHeadersPolicyName),
       securityHeadersBehavior: {
         ...props.securityHeadersBehavior,
         strictTransportSecurity: {

package/src/lib/aws/services/api-gateway/main.ts

@@ -46,6 +46,8 @@ export class ApiManager {
    */
   public createLambdaRestApi(id: string, scope: CommonConstruct, props: LambdaRestApiProps, lambdaFunction: IFunction) {
     if (!props) throw `Api props undefined for ${id}`
+    if (!props.restApiName) throw `Api restApiName undefined for ${id}`
+
     const api = new LambdaRestApi(scope, `${id}`, {
       ...props,
       cloudWatchRole: props.cloudWatchRole || false,
@@ -63,7 +65,7 @@ export class ApiManager {
       handler: lambdaFunction,
       minCompressionSize: props.minCompressionSizeInBytes ? Size.bytes(props.minCompressionSizeInBytes) : undefined,
       proxy: props.proxy ?? true,
-      restApiName: `${props.restApiName}-${scope.props.stage}`,
+      restApiName: scope.resourceNameFormatter(props.restApiName, props.resourceNameOptions),
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {

package/src/lib/aws/services/api-gateway/types.ts

@@ -1,4 +1,5 @@
-import { LambdaRestApiProps as LambdaRestApigProps } from 'aws-cdk-lib/aws-apigateway'
+import { LambdaRestApiProps as LambdaRestApigProps, RestApiProps } from 'aws-cdk-lib/aws-apigateway'
+import { ResourceNameFormatterProps } from '../../common'
 import { TagProps } from '../../types'
 
 /**
@@ -6,4 +7,9 @@ import { TagProps } from '../../types'
 export interface LambdaRestApiProps extends LambdaRestApigProps {
   tags?: TagProps[]
   minCompressionSizeInBytes?: number
+  resourceNameOptions?: ResourceNameFormatterProps
+}
+
+export interface RestApigProps extends RestApiProps {
+  resourceNameOptions?: ResourceNameFormatterProps
 }

package/src/lib/aws/services/appconfig/main.ts

@@ -51,7 +51,7 @@ export class AppConfigManager {
 
     const application = new CfnApplication(scope, `${id}`, {
       ...props.application,
-      name: `${props.application.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.application.name, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-ApplicationId`, scope, Fn.ref(application.logicalId))

package/src/lib/aws/services/appconfig/types.ts

@@ -5,6 +5,7 @@ import {
   CfnDeploymentStrategyProps,
   CfnEnvironmentProps,
 } from 'aws-cdk-lib/aws-appconfig'
+import { ResourceNameFormatterProps } from '../../common'
 
 /**
  */
@@ -15,4 +16,5 @@ export interface AppConfigProps {
   deploymentStrategy: CfnDeploymentStrategyProps
   environment: CfnEnvironmentProps
   id: string
+  resourceNameOptions?: ResourceNameFormatterProps
 }

package/src/lib/aws/services/cloudfront/main.ts

@@ -275,6 +275,7 @@ export class CloudFrontManager {
     mountPath?: string
   ) {
     if (!props) throw `EdgeFunction props undefined for ${id}`
+    if (!props.functionName) throw `EdgeFunction functionName undefined for ${id}`
 
     const edgeFunction = new cf.experimental.EdgeFunction(scope, `${id}`, {
       code: code,
@@ -283,7 +284,7 @@ export class CloudFrontManager {
         ...environment,
       },
       filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath ?? '/mnt/msg') : undefined,
-      functionName: `${props.functionName}-${scope.props.stage}`,
+      functionName: scope.resourceNameFormatter(props.functionName, props.resourceNameOptions),
       handler: props.handler ?? 'index.handler',
       layers: layers,
       logRetention: props.logRetention,
@@ -351,12 +352,15 @@ export class CloudFrontManager {
    * @param props
    */
   public createCloudfrontFunction(id: string, scope: CommonConstruct, props: CloudfrontFunctionProps) {
+    if (!props) throw `CloudFront Function props undefined for ${id}`
+    if (!props.functionName) throw `CloudFront Function functionName undefined for ${id}`
+
     const cloudfrontFunction = new Function(scope, `${id}`, {
       code: FunctionCode.fromFile({
         filePath: props.functionFilePath,
       }),
       comment: props.comment,
-      functionName: `${props.functionName}-${scope.props.stage}`,
+      functionName: scope.resourceNameFormatter(props.functionName, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-functionArn`, scope, cloudfrontFunction.functionArn)

package/src/lib/aws/services/cloudfront/types.ts

@@ -3,6 +3,7 @@ import {
   CloudFrontWebDistributionProps,
   FunctionProps,
 } from 'aws-cdk-lib/aws-cloudfront'
+import { ResourceNameFormatterProps } from '../../common'
 import { TagProps } from '../../types'
 
 /**
@@ -22,4 +23,5 @@ export interface DistributionProps extends CfDistributionProps {
 export interface CloudfrontFunctionProps extends FunctionProps {
   eventType: string
   functionFilePath: string
+  resourceNameOptions?: ResourceNameFormatterProps
 }

package/src/lib/aws/services/cloudtrail/main.ts

@@ -49,6 +49,7 @@ export class CloudTrailManager {
     logBucketPolicy: CfnBucketPolicy
   ) {
     if (!props) throw `CloudTrail props undefined for ${id}`
+    if (!props.trailName) throw `CloudTrail trailName undefined for ${id}`
 
     const role = scope.iamManager.createRoleForCloudTrail(`${id}Role`, scope, logGroup)
 
@@ -71,7 +72,7 @@ export class CloudTrailManager {
       s3BucketName: logBucket.bucketName,
       s3KeyPrefix: `logs-${props.trailName}`,
       tags: [{ key: 'service', value: scope.props.name }],
-      trailName: `${props.trailName}-${scope.props.stage}`,
+      trailName: scope.resourceNameFormatter(props.trailName, props.resourceNameOptions),
     })
 
     cloudTrail.addDependency(logBucketPolicy)