@gradientedge/cdk-utils 9.10.0 → 9.11.0

package/dist/src/lib/aws/services/identity-access-management/main.js

@@ -416,10 +416,10 @@ class IamManager {
             policies: [
                 {
                     policyDocument: policy,
-                    policyName: scope.resourceNameFormatter(`${id}-policy`),
+                    policyName: scope.resourceNameFormatter.format(`${id}-policy`),
                 },
             ],
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.attrArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -440,7 +440,7 @@ class IamManager {
             assumedBy: new aws_iam_1.ServicePrincipal('events.amazonaws.com'),
             description: `Role for ${id} ECS Task execution from EventBridge`,
             inlinePolicies: { policy },
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -460,7 +460,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AmazonECSTaskExecutionRolePolicy`, 'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'),
             ],
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -481,7 +481,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AWSLambdaBasicExecutionRole`, 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'),
             ],
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -499,7 +499,7 @@ class IamManager {
             assumedBy: servicePrincipal ?? new aws_iam_1.ServicePrincipal('appconfig.amazonaws.com'),
             description: `Role for ${id} AppConfig Secrets`,
             inlinePolicies: { policy },
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -520,7 +520,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AWSLambdaBasicExecutionRole`, 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'),
             ],
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -537,7 +537,7 @@ class IamManager {
         const role = new aws_iam_1.Role(scope, `${id}`, {
             assumedBy: new aws_iam_1.ServicePrincipal('pipes.amazonaws.com'),
             description: `Role for ${id} Pipe`,
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         role.addToPolicy(this.statementForPollQueue([queueArn]));
         role.addToPolicy(this.statementForStartExecution([stepFunctionArn]));
@@ -556,7 +556,7 @@ class IamManager {
         const role = new aws_iam_1.Role(scope, `${id}`, {
             assumedBy: new aws_iam_1.ServicePrincipal('pipes.amazonaws.com'),
             description: `Role for ${id} Pipe`,
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         role.addToPolicy(this.statementForPollQueue([queueArn]));
         role.addToPolicy(this.statementForInvokeLambda([lambdaArn]));
@@ -600,7 +600,7 @@ class IamManager {
         const role = new aws_iam_1.Role(scope, `${id}`, {
             assumedBy: new aws_iam_1.ServicePrincipal('pipes.amazonaws.com'),
             description: `Role for ${id} Pipe`,
-            roleName: scope.resourceNameFormatter(id),
+            roleName: scope.resourceNameFormatter.format(id),
         });
         role.addToPolicy(this.statementFordynamoDbStream([dynamoDbStreamArn]));
         role.addToPolicy(this.statementForInvokeLambda([lambdaFunctionArn]));

package/dist/src/lib/aws/services/lambda/main.js

@@ -76,7 +76,7 @@ class LambdaManager {
             throw `Lambda props undefined for ${id}`;
         if (!props.functionName)
             throw `Lambda functionName undefined for ${id}`;
-        const functionName = scope.resourceNameFormatter(props.functionName, props.resourceNameOptions);
+        const functionName = scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions);
         let deadLetterQueue;
         if (props.deadLetterQueueEnabled) {
             const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);
@@ -181,7 +181,7 @@ class LambdaManager {
             throw `Lambda props undefined for ${id}`;
         if (!props.functionName)
             throw `Lambda functionName undefined for ${id}`;
-        const functionName = scope.resourceNameFormatter(props.functionName, props.resourceNameOptions);
+        const functionName = scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions);
         let deadLetterQueue;
         if (props.deadLetterQueueEnabled) {
             const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);

package/dist/src/lib/aws/services/secrets-manager/main.js

@@ -35,7 +35,7 @@ class SecretsManager {
             throw `Secret name undefined for ${id}`;
         const secret = new aws_secretsmanager_1.Secret(scope, `${id}`, {
             ...props,
-            secretName: scope.resourceNameFormatter(props.secretName, props.resourceNameOptions),
+            secretName: scope.resourceNameFormatter.format(props.secretName, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-secretName`, scope, secret.secretName);
         (0, utils_1.createCfnOutput)(`${id}-secretArn`, scope, secret.secretArn);

package/dist/src/lib/aws/services/simple-notification-service/main.js

@@ -39,8 +39,8 @@ class SnsManager {
             throw `Subscription topicName undefined for ${id}`;
         const topic = new aws_sns_1.Topic(scope, id, {
             ...props,
-            displayName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
-            topicName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
+            displayName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
+            topicName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
         });
         if (emails && !lodash_1.default.isEmpty(emails)) {
             lodash_1.default.forEach(emails, (email) => topic.addSubscription(new aws_sns_subscriptions_1.EmailSubscription(email)));
@@ -63,8 +63,8 @@ class SnsManager {
             throw `Subscription topicName undefined for ${id}`;
         const topic = new aws_sns_1.Topic(scope, id, {
             ...props,
-            displayName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
-            topicName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
+            displayName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
+            topicName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
         });
         topic.addSubscription(new aws_sns_subscriptions_1.LambdaSubscription(lambdaFunction));
         (0, utils_1.createCfnOutput)(`${id}-subscriptionArn`, scope, topic.topicArn);

package/dist/src/lib/aws/services/simple-queue-service/main.js

@@ -37,7 +37,7 @@ class SqsManager {
             throw `Queue props undefined for ${id}`;
         if (!props.queueName)
             throw `Queue queueName undefined for ${id}`;
-        let queueName = scope.resourceNameFormatter(props.queueName, props.resourceNameOptions);
+        let queueName = scope.resourceNameFormatter.format(props.queueName, props.resourceNameOptions);
         if (props.fifo)
             queueName += '.fifo';
         const queue = new aws_sqs_1.Queue(scope, id, {

package/dist/src/lib/aws/services/simple-storage-service/main.js

@@ -76,7 +76,7 @@ class S3Manager {
         if (!scope.props.excludeAccountNumberForBuckets) {
             return S3Manager.determineBucketNameByAccountAndRegion(scope, bucketName);
         }
-        return scope.resourceNameFormatter(bucketName, props.resourceNameOptions);
+        return scope.resourceNameFormatter.format(bucketName, props.resourceNameOptions);
     }
     /**
      * @summary Method to create a s3 bucket

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

@@ -377,7 +377,7 @@ class SfnManager {
                 level: props.logs?.level ?? aws_stepfunctions_1.LogLevel.ALL,
             },
             role,
-            stateMachineName: scope.resourceNameFormatter(props.stateMachineName, props.resourceNameOptions),
+            stateMachineName: scope.resourceNameFormatter.format(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/virtual-private-cloud/main.js

@@ -40,7 +40,7 @@ class VpcManager {
             throw `Vpc props undefined for ${id}`;
         if (!props.vpcName)
             throw `Vpc vpcName undefined for ${id}`;
-        const vpcName = scope.resourceNameFormatter(props.vpcName, props.resourceNameOptions);
+        const vpcName = scope.resourceNameFormatter.format(props.vpcName, props.resourceNameOptions);
         let vpc;
         if (props.isIPV6) {
             vpc = new ipv6_1.Ipv6Vpc(scope, `${id}`, {
@@ -82,9 +82,9 @@ class VpcManager {
      * @param vpcIdentifier optional identifier for VPC
      */
     retrieveCommonVpc(id, scope, vpcIdentifier) {
-        const vpcName = scope.resourceNameFormatter(vpcIdentifier ?? CommonVpcIdentifier);
+        const vpcName = scope.resourceNameFormatter.format(vpcIdentifier ?? CommonVpcIdentifier);
         return aws_ec2_1.Vpc.fromLookup(scope, `${id}`, {
-            vpcName: scope.resourceNameFormatter(vpcIdentifier ?? CommonVpcIdentifier),
+            vpcName: scope.resourceNameFormatter.format(vpcIdentifier ?? CommonVpcIdentifier),
         });
     }
 }

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

@@ -34,7 +34,7 @@ class WafManager {
         const ipSet = new aws_wafv2_1.CfnIPSet(scope, `${id}`, {
             ...props,
             description: `IP Set for ${id} - ${scope.props.stage} stage`,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-ipSetId`, scope, ipSet.attrId);
         (0, utils_1.createCfnOutput)(`${id}-ipSetArn`, scope, ipSet.attrArn);
@@ -54,7 +54,7 @@ class WafManager {
         const webAcl = new aws_wafv2_1.CfnWebACL(scope, `${id}`, {
             ...props,
             description: `Web Acl for ${id} - ${scope.props.stage} stage`,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
             tags: [{ key: 'service', value: scope.props.name }],
         });
         (0, utils_1.createCfnOutput)(`${id}-webAclId`, scope, webAcl.attrId);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.10.0",
+  "version": "9.11.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
     "node": ">=16 <=20",
-    "pnpm": "=8"
+    "pnpm": "=9"
   },
   "packageManager": "pnpm@8.15.8",
   "repository": {

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

@@ -33,7 +33,8 @@ import {
   WafManager,
 } from '../services'
 import { createCfnOutput } from '../utils'
-import { CommonStackProps, ResourceNameFormatterProps } from './types'
+import { ResourceNameFormatter } from './resource-name-formatter'
+import { CommonStackProps } from './types'
 
 /**
  * @subcategory Construct
@@ -50,6 +51,7 @@ import { CommonStackProps, ResourceNameFormatterProps } from './types'
  */
 export class CommonConstruct extends Construct {
   props: CommonStackProps
+  resourceNameFormatter: ResourceNameFormatter
   acmManager: AcmManager
   apiManager: ApiManager
   appConfigManager: AppConfigManager
@@ -85,6 +87,7 @@ export class CommonConstruct extends Construct {
   constructor(parent: Construct, id: string, props: CommonStackProps) {
     super(parent, id)
     this.props = props
+    this.resourceNameFormatter = new ResourceNameFormatter(this, `${id}-rnf`, props)
     this.acmManager = new AcmManager()
     this.apiManager = new ApiManager()
     this.appConfigManager = new AppConfigManager()
@@ -118,21 +121,6 @@ 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/resource-name-formatter.ts

@@ -0,0 +1,26 @@
+import { Construct } from 'constructs'
+import { CommonStackProps, ResourceNameFormatterProps } from './types'
+
+export class ResourceNameFormatter extends Construct {
+  props: CommonStackProps
+
+  constructor(parent: Construct, id: string, props: CommonStackProps) {
+    super(parent, id)
+    this.props = props
+  }
+
+  /**
+   * @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 format(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('-')
+  }
+}

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

@@ -154,7 +154,7 @@ export class ApiToAnyTarget extends CommonConstruct {
         types: [this.isProductionStage() ? EndpointType.EDGE : EndpointType.REGIONAL],
       },
       ...this.props.api.restApi,
-      restApiName: this.resourceNameFormatter(
+      restApiName: this.resourceNameFormatter.format(
         this.props.api.restApi?.restApiName,
         this.props.api.restApi?.resourceNameOptions
       ),

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

@@ -159,12 +159,12 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       this.apiEvent.eventBus = EventBus.fromEventBusName(
         this,
         `${this.id}-event-bus`,
-        `${this.props.event.eventBusName}-${this.props.stage}`
+        this.resourceNameFormatter.format(this.props.event.eventBusName ?? 'default')
       )
       return
     }
     this.apiEvent.eventBus = this.eventManager.createEventBus(`${this.id}-event-bus`, this, {
-      eventBusName: `${this.props.event.eventBusName}`,
+      eventBusName: this.props.event.eventBusName ?? 'default',
     })
   }
 
@@ -175,7 +175,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     if (this.props.api.useExisting) return
     this.apiEvent.logGroup = this.logManager.createLogGroup(`${this.id}-log`, this, {
       ...{
-        logGroupName: `/${this.id}/events/api-to-eventbridge-target`,
+        logGroupName: `/${this.resourceNameFormatter.format(this.id)}/events/api-to-eventbridge-target`,
       },
       ...this.props.event.logGroup,
     })
@@ -186,11 +186,12 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
    */
   protected createApiToEventBridgeTargetRule() {
     if (this.props.api.useExisting) return
+    if (!this.props.event.rule.ruleName) throw `Event ruleName undefined for ${this.id}`
+
     this.props.event.rule = {
       eventPattern: {
         source: ['api-to-eventbridge-target'],
       },
-      ruleName: `${this.id}-api-to-eventbridge-target`,
       ...this.props.event.rule,
     }
     this.apiEvent.rule = this.eventManager.createRule(
@@ -355,7 +356,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       `${this.id}-rest-api-access-log`,
       this,
       {
-        logGroupName: `/custom/api/${this.id}-rest-api-access`,
+        logGroupName: `/custom/api/${this.resourceNameFormatter.format(this.id)}-rest-api-access`,
         removalPolicy: RemovalPolicy.DESTROY,
       }
     )
@@ -405,7 +406,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
         types: [EndpointType.REGIONAL],
       },
       ...this.props.api.restApi,
-      restApiName: this.resourceNameFormatter(
+      restApiName: this.resourceNameFormatter.format(
         this.props.api.restApi?.restApiName,
         this.props.api.restApi?.resourceNameOptions
       ),

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.resourceNameFormatter(`${this.id}-destined-topic`),
+        topicName: this.resourceNameFormatter.format(`${this.id}-destined-topic`),
       },
       this.apiDestinedLambda.function
     )
@@ -538,7 +538,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
         types: [EndpointType.REGIONAL],
       },
       ...this.props.api,
-      restApiName: this.resourceNameFormatter(
+      restApiName: this.resourceNameFormatter.format(
         this.props.api.restApi?.restApiName,
         this.props.api.restApi?.resourceNameOptions
       ),

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.resourceNameFormatter(this.props.lambdaFunctionName)
+      this.resourceNameFormatter.format(this.props.lambdaFunctionName)
     )
   }
 
@@ -156,7 +156,7 @@ export class ApiToLambdaTarget extends CommonConstruct {
     }
 
     const accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-      logGroupName: `/custom/api/${this.id}-rest-api-access`,
+      logGroupName: `/custom/api/${this.resourceNameFormatter.format(this.id)}-rest-api-access`,
       removalPolicy: RemovalPolicy.DESTROY,
     })
 

package/src/lib/aws/construct/application-configuration/main.ts

@@ -79,7 +79,7 @@ export class ApplicationConfiguration extends CommonConstruct {
     this.appConfigDeploymentStrategy = new CfnDeploymentStrategy(this, `${this.id}-ac-deployment-strategy`, {
       deploymentDurationInMinutes: this.props.appConfig.deploymentStrategy.deploymentDurationInMinutes,
       growthFactor: this.props.appConfig.deploymentStrategy.growthFactor,
-      name: this.props.appConfig.deploymentStrategy.name,
+      name: this.resourceNameFormatter.format(this.props.appConfig.deploymentStrategy.name),
       replicateTo: this.props.appConfig.deploymentStrategy.replicateTo,
     })
   }

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.resourceNameFormatter(`${this.id}-user`),
+      userName: this.resourceNameFormatter.format(`${this.id}-user`),
     })
 
     new Policy(this, `${this.id}-lambda-user-policy`, {
-      policyName: this.resourceNameFormatter(`${this.id}-policy`),
+      policyName: this.resourceNameFormatter.format(`${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.resourceNameFormatter(`${this.id}--alias-policy-${index}`),
+          policyName: this.resourceNameFormatter.format(`${this.id}--alias-policy-${index}`),
           statements: [
             new PolicyStatement({
               actions: ['lambda:InvokeFunction'],

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

@@ -296,11 +296,11 @@ export class SiteWithEcsBackend extends CommonConstruct {
       enableECSManagedTags: true,
       healthCheckGracePeriod: Duration.seconds(60),
       listenerPort: this.props.siteTask.listenerPort,
-      loadBalancerName: this.resourceNameFormatter(this.props.siteTask.loadBalancerName ?? this.id),
+      loadBalancerName: this.resourceNameFormatter.format(this.props.siteTask.loadBalancerName ?? this.id),
       maxHealthyPercent: this.props.siteTask.maxHealthyPercent,
       memoryLimitMiB: this.props.siteTask.memoryLimitMiB,
       minHealthyPercent: this.props.siteTask.minHealthyPercent,
-      serviceName: this.resourceNameFormatter(this.props.siteTask.serviceName ?? this.id),
+      serviceName: this.resourceNameFormatter.format(this.props.siteTask.serviceName ?? this.id),
       taskDefinition: this.props.siteTask.taskDefinition,
       taskImageOptions: {
         containerPort: this.props.siteTask.taskImageOptions?.containerPort,
@@ -400,7 +400,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
           transitEncryption: this.props.siteFileSystem.transitEncryption,
           transitEncryptionPort: this.props.siteFileSystem.transitEncryptionPort,
         },
-        name: this.resourceNameFormatter(this.props.siteFileSystem?.fileSystemName ?? this.id),
+        name: this.resourceNameFormatter.format(this.props.siteFileSystem?.fileSystemName ?? this.id),
       })
 
       if (this.props.siteTask.mountPoints && !_.isEmpty(this.props.siteTask.mountPoints)) {
@@ -408,7 +408,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
           this.siteEcsTaskDefinition.defaultContainer?.addMountPoints({
             containerPath: mountPoint.containerPath,
             readOnly: mountPoint.readOnly,
-            sourceVolume: this.resourceNameFormatter(this.props.siteFileSystem?.fileSystemName ?? this.id),
+            sourceVolume: this.resourceNameFormatter.format(this.props.siteFileSystem?.fileSystemName ?? this.id),
           })
         })
       }
@@ -431,7 +431,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
     if (!siteCachePolicy.cachePolicyName) throw `SiteCachePolicy cachePolicyName undefined for ${id}`
 
     return new CachePolicy(this, `${id}`, {
-      cachePolicyName: this.resourceNameFormatter(siteCachePolicy.cachePolicyName),
+      cachePolicyName: this.resourceNameFormatter.format(siteCachePolicy.cachePolicyName),
       comment: `Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: siteCachePolicy.cookieBehavior,
       enableAcceptEncodingBrotli: siteCachePolicy.enableAcceptEncodingBrotli,
@@ -460,7 +460,9 @@ export class SiteWithEcsBackend extends CommonConstruct {
       comment: `Request Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: this.props.siteOriginRequestPolicy.cookieBehavior,
       headerBehavior: this.props.siteOriginRequestPolicy.headerBehavior,
-      originRequestPolicyName: this.resourceNameFormatter(this.props.siteOriginRequestPolicy.originRequestPolicyName),
+      originRequestPolicyName: this.resourceNameFormatter.format(
+        this.props.siteOriginRequestPolicy.originRequestPolicyName
+      ),
       queryStringBehavior: this.props.siteOriginRequestPolicy.queryStringBehavior,
     })
 
@@ -477,7 +479,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
     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.resourceNameFormatter(props.responseHeadersPolicyName),
+      responseHeadersPolicyName: this.resourceNameFormatter.format(props.responseHeadersPolicyName),
       securityHeadersBehavior: {
         ...props.securityHeadersBehavior,
         strictTransportSecurity: {

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

@@ -193,7 +193,7 @@ export class SiteWithLambdaBackend extends CommonConstruct {
     if (!siteCachePolicy.cachePolicyName) throw `SiteCachePolicy cachePolicyName undefined for ${id}`
 
     return new CachePolicy(this, `${id}`, {
-      cachePolicyName: this.resourceNameFormatter(siteCachePolicy.cachePolicyName),
+      cachePolicyName: this.resourceNameFormatter.format(siteCachePolicy.cachePolicyName),
       comment: `Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: siteCachePolicy.cookieBehavior,
       enableAcceptEncodingBrotli: siteCachePolicy.enableAcceptEncodingBrotli,
@@ -222,7 +222,9 @@ export class SiteWithLambdaBackend extends CommonConstruct {
       comment: `Request Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: this.props.siteOriginRequestPolicy.cookieBehavior,
       headerBehavior: this.props.siteOriginRequestPolicy.headerBehavior,
-      originRequestPolicyName: this.resourceNameFormatter(this.props.siteOriginRequestPolicy.originRequestPolicyName),
+      originRequestPolicyName: this.resourceNameFormatter.format(
+        this.props.siteOriginRequestPolicy.originRequestPolicyName
+      ),
       queryStringBehavior: this.props.siteOriginRequestPolicy.queryStringBehavior,
     })
 
@@ -239,7 +241,7 @@ export class SiteWithLambdaBackend extends CommonConstruct {
     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.resourceNameFormatter(props.responseHeadersPolicyName),
+      responseHeadersPolicyName: this.resourceNameFormatter.format(props.responseHeadersPolicyName),
       securityHeadersBehavior: {
         ...props.securityHeadersBehavior,
         strictTransportSecurity: {

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

@@ -65,7 +65,7 @@ export class ApiManager {
       handler: lambdaFunction,
       minCompressionSize: props.minCompressionSizeInBytes ? Size.bytes(props.minCompressionSizeInBytes) : undefined,
       proxy: props.proxy ?? true,
-      restApiName: scope.resourceNameFormatter(props.restApiName, props.resourceNameOptions),
+      restApiName: scope.resourceNameFormatter.format(props.restApiName, props.resourceNameOptions),
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {

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

@@ -51,7 +51,7 @@ export class AppConfigManager {
 
     const application = new CfnApplication(scope, `${id}`, {
       ...props.application,
-      name: scope.resourceNameFormatter(props.application.name, props.resourceNameOptions),
+      name: scope.resourceNameFormatter.format(props.application.name, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-ApplicationId`, scope, Fn.ref(application.logicalId))
@@ -109,7 +109,7 @@ export class AppConfigManager {
       ...props.configurationProfile,
       applicationId,
       locationUri: props.configurationProfile.locationUri || 'hosted',
-      name: `${props.configurationProfile.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter.format(props.configurationProfile.name, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-configurationProfileId`, scope, Fn.ref(profile.logicalId))

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

@@ -284,7 +284,7 @@ export class CloudFrontManager {
         ...environment,
       },
       filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath ?? '/mnt/msg') : undefined,
-      functionName: scope.resourceNameFormatter(props.functionName, props.resourceNameOptions),
+      functionName: scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions),
       handler: props.handler ?? 'index.handler',
       layers: layers,
       logRetention: props.logRetention,
@@ -360,7 +360,7 @@ export class CloudFrontManager {
         filePath: props.functionFilePath,
       }),
       comment: props.comment,
-      functionName: scope.resourceNameFormatter(props.functionName, props.resourceNameOptions),
+      functionName: scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-functionArn`, scope, cloudfrontFunction.functionArn)

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

@@ -72,7 +72,7 @@ export class CloudTrailManager {
       s3BucketName: logBucket.bucketName,
       s3KeyPrefix: `logs-${props.trailName}`,
       tags: [{ key: 'service', value: scope.props.name }],
-      trailName: scope.resourceNameFormatter(props.trailName, props.resourceNameOptions),
+      trailName: scope.resourceNameFormatter.format(props.trailName, props.resourceNameOptions),
     })
 
     cloudTrail.addDependency(logBucketPolicy)

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

@@ -60,7 +60,7 @@ export class DynamodbManager {
 
     const table = new TableV2(scope, `${id}`, {
       ...props,
-      tableName: scope.resourceNameFormatter(props.tableName, props.resourceNameOptions),
+      tableName: scope.resourceNameFormatter.format(props.tableName, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-tableName`, scope, table.tableName)

package/src/lib/aws/services/elastic-container-service/main.ts

@@ -159,12 +159,12 @@ export class EcsManager {
       cluster,
       enableECSManagedTags: true,
       healthCheckGracePeriod: props.healthCheckGracePeriod ?? Duration.seconds(60),
-      loadBalancerName: scope.resourceNameFormatter(props.loadBalancerName, props.resourceNameOptions),
+      loadBalancerName: scope.resourceNameFormatter.format(props.loadBalancerName, props.resourceNameOptions),
       runtimePlatform: {
         cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? CpuArchitecture.X86_64,
         operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? OperatingSystemFamily.LINUX,
       },
-      serviceName: scope.resourceNameFormatter(props.serviceName, props.resourceNameOptions),
+      serviceName: scope.resourceNameFormatter.format(props.serviceName, props.resourceNameOptions),
       taskImageOptions: {
         ...props.taskImageOptions,
         enableLogging: props.taskImageOptions?.enableLogging ?? true,

package/src/lib/aws/services/elastic-file-system/main.ts

@@ -59,7 +59,7 @@ export class EfsManager {
     const fileSystemId = props.provisionNewOnDeployment ? `${id}-${new Date().getMilliseconds()}` : `${id}`
     const fileSystem = new FileSystem(scope, `${fileSystemId}`, {
       ...props,
-      fileSystemName: scope.resourceNameFormatter(props.fileSystemName, props.resourceNameOptions),
+      fileSystemName: scope.resourceNameFormatter.format(props.fileSystemName, props.resourceNameOptions),
       lifecyclePolicy: props.lifecyclePolicy ?? LifecyclePolicy.AFTER_7_DAYS,
       outOfInfrequentAccessPolicy: props.outOfInfrequentAccessPolicy ?? OutOfInfrequentAccessPolicy.AFTER_1_ACCESS,
       performanceMode: props.performanceMode ?? PerformanceMode.GENERAL_PURPOSE,

package/src/lib/aws/services/elastic-kubernetes-service/main.ts

@@ -82,7 +82,7 @@ export class EksManager {
     }
 
     const cluster = new Cluster(scope, `${id}Cluster`, {
-      clusterName: scope.resourceNameFormatter(props.clusterName, props.resourceNameOptions),
+      clusterName: scope.resourceNameFormatter.format(props.clusterName, props.resourceNameOptions),
       defaultCapacity: props.appCapacity,
       defaultCapacityInstance: InstanceType.of(InstanceClass.T3, InstanceSize.LARGE),
       version: KubernetesVersion.V1_27,

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

@@ -61,7 +61,7 @@ export class ElastiCacheManager {
     const elasticacheCluster = new CfnCacheCluster(scope, `${id}`, {
       ...props,
       cacheSubnetGroupName: subnetGroup.cacheSubnetGroupName,
-      clusterName: scope.resourceNameFormatter(props.clusterName, props.resourceNameOptions),
+      clusterName: scope.resourceNameFormatter.format(props.clusterName, props.resourceNameOptions),
       logDeliveryConfigurations,
       vpcSecurityGroupIds: securityGroupIds,
     })