@gradientedge/cdk-utils 9.10.0 → 9.11.0

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

@@ -1,7 +1,8 @@
 import { CfnOutput } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import { AcmManager, ApiManager, AppConfigManager, CloudFrontManager, CloudTrailManager, CloudWatchManager, CodeBuildManager, DynamodbManager, EcrManager, EcsManager, EfsManager, EksManager, ElastiCacheManager, EventManager, EventTargetManager, EvidentlyManager, IamManager, KmsManager, LambdaManager, LogManager, Route53Manager, S3Manager, SecretsManager, SfnManager, SnsManager, SqsManager, SsmManager, VpcManager, WafManager } from '../services';
-import { CommonStackProps, ResourceNameFormatterProps } from './types';
+import { ResourceNameFormatter } from './resource-name-formatter';
+import { CommonStackProps } from './types';
 /**
  * @subcategory Construct
  * @classdesc Common construct to use as a base for all higher level constructs.
@@ -17,6 +18,7 @@ import { CommonStackProps, ResourceNameFormatterProps } from './types';
  */
 export declare class CommonConstruct extends Construct {
     props: CommonStackProps;
+    resourceNameFormatter: ResourceNameFormatter;
     acmManager: AcmManager;
     apiManager: ApiManager;
     appConfigManager: AppConfigManager;
@@ -48,13 +50,6 @@ export declare class CommonConstruct extends Construct {
     wafManager: WafManager;
     fullyQualifiedDomainName: string;
     constructor(parent: Construct, id: string, props: CommonStackProps);
-    /**
-     * @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
-     */
-    resourceNameFormatter(resourceName: string, options?: ResourceNameFormatterProps): string;
     /**
      * @summary Helper method to add CloudFormation outputs from the construct
      * @param id scoped id of the resource

package/dist/src/lib/aws/common/construct.js

@@ -5,6 +5,7 @@ const constructs_1 = require("constructs");
 const common_1 = require("../../common");
 const services_1 = require("../services");
 const utils_1 = require("../utils");
+const resource_name_formatter_1 = require("./resource-name-formatter");
 /**
  * @subcategory Construct
  * @classdesc Common construct to use as a base for all higher level constructs.
@@ -20,6 +21,7 @@ const utils_1 = require("../utils");
  */
 class CommonConstruct extends constructs_1.Construct {
     props;
+    resourceNameFormatter;
     acmManager;
     apiManager;
     appConfigManager;
@@ -53,6 +55,7 @@ class CommonConstruct extends constructs_1.Construct {
     constructor(parent, id, props) {
         super(parent, id);
         this.props = props;
+        this.resourceNameFormatter = new resource_name_formatter_1.ResourceNameFormatter(this, `${id}-rnf`, props);
         this.acmManager = new services_1.AcmManager();
         this.apiManager = new services_1.ApiManager();
         this.appConfigManager = new services_1.AppConfigManager();
@@ -84,20 +87,6 @@ class CommonConstruct extends constructs_1.Construct {
         this.wafManager = new services_1.WafManager();
         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
-     */
-    resourceNameFormatter(resourceName, options) {
-        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/dist/src/lib/aws/common/resource-name-formatter.d.ts

@@ -0,0 +1,13 @@
+import { Construct } from 'constructs';
+import { CommonStackProps, ResourceNameFormatterProps } from './types';
+export declare class ResourceNameFormatter extends Construct {
+    props: CommonStackProps;
+    constructor(parent: Construct, id: string, props: CommonStackProps);
+    /**
+     * @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
+     */
+    format(resourceName: string, options?: ResourceNameFormatterProps): string;
+}

package/dist/src/lib/aws/common/resource-name-formatter.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResourceNameFormatter = void 0;
+const constructs_1 = require("constructs");
+class ResourceNameFormatter extends constructs_1.Construct {
+    props;
+    constructor(parent, id, props) {
+        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
+     */
+    format(resourceName, options) {
+        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('-');
+    }
+}
+exports.ResourceNameFormatter = ResourceNameFormatter;

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

@@ -112,7 +112,7 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
                 types: [this.isProductionStage() ? aws_apigateway_1.EndpointType.EDGE : aws_apigateway_1.EndpointType.REGIONAL],
             },
             ...this.props.api.restApi,
-            restApiName: this.resourceNameFormatter(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
+            restApiName: this.resourceNameFormatter.format(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/dist/src/lib/aws/construct/api-to-eventbridge-target/main.js

@@ -106,11 +106,11 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
      */
     createApiToEventBridgeTargetEventBus() {
         if (this.props.api.useExisting) {
-            this.apiEvent.eventBus = aws_events_1.EventBus.fromEventBusName(this, `${this.id}-event-bus`, `${this.props.event.eventBusName}-${this.props.stage}`);
+            this.apiEvent.eventBus = aws_events_1.EventBus.fromEventBusName(this, `${this.id}-event-bus`, 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',
         });
     }
     /**
@@ -121,7 +121,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             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,
         });
@@ -132,11 +132,12 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
     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(`${this.id}-api-to-eventbridge-target-rule`, this, this.props.event.rule, this.apiEvent.eventBus, [new aws_events_targets_1.CloudWatchLogGroup(this.apiEvent.logGroup)]);
@@ -289,7 +290,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
     }
     createApiToEventBridgeTargetRestApiLogGroup() {
         this.apiToEventBridgeTargetRestApi.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: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
     }
@@ -332,7 +333,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
                 types: [aws_apigateway_1.EndpointType.REGIONAL],
             },
             ...this.props.api.restApi,
-            restApiName: this.resourceNameFormatter(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
+            restApiName: this.resourceNameFormatter.format(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/dist/src/lib/aws/construct/api-to-eventbridge-target-with-sns/main.js

@@ -271,7 +271,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
         if (!this.props.api.withResource)
             return;
         this.apiDestinedRestApi.topic = this.snsManager.createLambdaNotificationService(`${this.id}-destined-topic`, this, {
-            topicName: this.resourceNameFormatter(`${this.id}-destined-topic`),
+            topicName: this.resourceNameFormatter.format(`${this.id}-destined-topic`),
         }, this.apiDestinedLambda.function);
         if (this.apiDestinedRestApi.role) {
             this.apiDestinedRestApi.topic.grantPublish(this.apiDestinedRestApi.role);
@@ -438,7 +438,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
                 types: [aws_apigateway_1.EndpointType.REGIONAL],
             },
             ...this.props.api,
-            restApiName: this.resourceNameFormatter(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
+            restApiName: this.resourceNameFormatter.format(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/dist/src/lib/aws/construct/api-to-lambda-target/main.js

@@ -103,7 +103,7 @@ class ApiToLambdaTarget extends common_1.CommonConstruct {
         };
     }
     resolveApiToLambdaTargetFunction() {
-        this.apiToLambdaTargetRestApi.lambda = aws_lambda_1.Function.fromFunctionName(this, `${this.id}-lambda`, this.resourceNameFormatter(this.props.lambdaFunctionName));
+        this.apiToLambdaTargetRestApi.lambda = aws_lambda_1.Function.fromFunctionName(this, `${this.id}-lambda`, this.resourceNameFormatter.format(this.props.lambdaFunctionName));
     }
     /**
      * @summary Method to create rest restApi for Api
@@ -114,7 +114,7 @@ class ApiToLambdaTarget extends common_1.CommonConstruct {
             return;
         }
         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: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
         this.props.api.restApi = {

package/dist/src/lib/aws/construct/application-configuration/main.js

@@ -49,7 +49,7 @@ class ApplicationConfiguration extends common_1.CommonConstruct {
         this.appConfigDeploymentStrategy = new aws_appconfig_1.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/dist/src/lib/aws/construct/lambda-with-iam-access/main.js

@@ -143,10 +143,10 @@ class LambdaWithIamAccess extends common_1.CommonConstruct {
      */
     createIamUserForLambdaFunction() {
         this.lambdaIamUser = new aws_iam_1.User(this, `${this.id}-lambda-user`, {
-            userName: this.resourceNameFormatter(`${this.id}-user`),
+            userName: this.resourceNameFormatter.format(`${this.id}-user`),
         });
         new aws_iam_1.Policy(this, `${this.id}-lambda-user-policy`, {
-            policyName: this.resourceNameFormatter(`${this.id}-policy`),
+            policyName: this.resourceNameFormatter.format(`${this.id}-policy`),
             statements: [
                 new aws_iam_1.PolicyStatement({
                     actions: ['lambda:InvokeFunction'],
@@ -158,7 +158,7 @@ class LambdaWithIamAccess extends common_1.CommonConstruct {
         if (this.props.lambda.lambdaAliases && !lodash_1.default.isEmpty(this.props.lambda.lambdaAliases)) {
             lodash_1.default.forEach(this.props.lambda.lambdaAliases, (alias, index) => {
                 new aws_iam_1.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 aws_iam_1.PolicyStatement({
                             actions: ['lambda:InvokeFunction'],

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

@@ -220,11 +220,11 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
             enableECSManagedTags: true,
             healthCheckGracePeriod: aws_cdk_lib_1.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,
@@ -304,14 +304,14 @@ class SiteWithEcsBackend extends common_1.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 && !lodash_1.default.isEmpty(this.props.siteTask.mountPoints)) {
                 lodash_1.default.forEach(this.props.siteTask.mountPoints, mountPoint => {
                     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),
                     });
                 });
             }
@@ -331,7 +331,7 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
         if (!siteCachePolicy.cachePolicyName)
             throw `SiteCachePolicy cachePolicyName undefined for ${id}`;
         return new aws_cloudfront_1.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,
@@ -359,7 +359,7 @@ class SiteWithEcsBackend extends common_1.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,
         });
         lodash_1.default.assign(this.props.siteDistribution.defaultBehavior, {
@@ -374,7 +374,7 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
         return new aws_cloudfront_1.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/dist/src/lib/aws/construct/site-with-lambda-backend/main.js

@@ -139,7 +139,7 @@ class SiteWithLambdaBackend extends common_1.CommonConstruct {
         if (!siteCachePolicy.cachePolicyName)
             throw `SiteCachePolicy cachePolicyName undefined for ${id}`;
         return new aws_cloudfront_1.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,
@@ -167,7 +167,7 @@ class SiteWithLambdaBackend extends common_1.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,
         });
         lodash_1.default.assign(this.props.siteDistribution.defaultBehavior, {
@@ -182,7 +182,7 @@ class SiteWithLambdaBackend extends common_1.CommonConstruct {
         return new aws_cloudfront_1.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/dist/src/lib/aws/services/api-gateway/main.js

@@ -55,7 +55,7 @@ class ApiManager {
             handler: lambdaFunction,
             minCompressionSize: props.minCompressionSizeInBytes ? aws_cdk_lib_1.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 && !lodash_1.default.isEmpty(props.tags)) {
             lodash_1.default.forEach(props.tags, tag => {

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

@@ -50,7 +50,7 @@ class AppConfigManager {
             throw `AppConfig props undefined for ${id}`;
         const application = new aws_appconfig_1.CfnApplication(scope, `${id}`, {
             ...props.application,
-            name: scope.resourceNameFormatter(props.application.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.application.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-ApplicationId`, scope, aws_cdk_lib_1.Fn.ref(application.logicalId));
         (0, utils_1.createCfnOutput)(`${id}-ApplicationName`, scope, application.name);
@@ -92,7 +92,7 @@ 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),
         });
         (0, utils_1.createCfnOutput)(`${id}-configurationProfileId`, scope, aws_cdk_lib_1.Fn.ref(profile.logicalId));
         (0, utils_1.createCfnOutput)(`${id}-configurationProfileName`, scope, profile.name);

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

@@ -237,7 +237,7 @@ class CloudFrontManager {
                 ...environment,
             },
             filesystem: accessPoint ? aws_lambda_1.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,
@@ -297,7 +297,7 @@ class CloudFrontManager {
                 filePath: props.functionFilePath,
             }),
             comment: props.comment,
-            functionName: scope.resourceNameFormatter(props.functionName, props.resourceNameOptions),
+            functionName: scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-functionArn`, scope, cloudfrontFunction.functionArn);
         (0, utils_1.createCfnOutput)(`${id}-functionName`, scope, cloudfrontFunction.functionName);

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

@@ -62,7 +62,7 @@ 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);
         cloudTrail.addDependency(logGroup);

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

@@ -60,7 +60,7 @@ class DynamodbManager {
             throw `Table tableName undefined for ${id}`;
         const table = new aws_dynamodb_1.TableV2(scope, `${id}`, {
             ...props,
-            tableName: scope.resourceNameFormatter(props.tableName, props.resourceNameOptions),
+            tableName: scope.resourceNameFormatter.format(props.tableName, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-tableName`, scope, table.tableName);
         (0, utils_1.createCfnOutput)(`${id}-tableArn`, scope, table.tableArn);

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

@@ -125,12 +125,12 @@ class EcsManager {
             cluster,
             enableECSManagedTags: true,
             healthCheckGracePeriod: props.healthCheckGracePeriod ?? aws_cdk_lib_1.Duration.seconds(60),
-            loadBalancerName: scope.resourceNameFormatter(props.loadBalancerName, props.resourceNameOptions),
+            loadBalancerName: scope.resourceNameFormatter.format(props.loadBalancerName, props.resourceNameOptions),
             runtimePlatform: {
                 cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? aws_ecs_1.CpuArchitecture.X86_64,
                 operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? aws_ecs_1.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/dist/src/lib/aws/services/elastic-file-system/main.js

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

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

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

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

@@ -56,7 +56,7 @@ class ElastiCacheManager {
         const elasticacheCluster = new aws_elasticache_1.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,
         });

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

@@ -39,9 +39,13 @@ class EventManager {
             throw `EventBus props undefined for ${id}`;
         if (!props.eventBusName)
             throw `EventBus eventBusName undefined for ${id}`;
+        let eventBusName = props.eventBusName;
+        if (eventBusName && eventBusName != 'default') {
+            eventBusName = scope.resourceNameFormatter.format(props.eventBusName, props.resourceNameOptions);
+        }
         const eventBus = new aws_events_1.EventBus(scope, `${id}`, {
             ...props,
-            eventBusName: scope.resourceNameFormatter(props.eventBusName, props.resourceNameOptions),
+            eventBusName,
         });
         (0, utils_1.createCfnOutput)(`${id}-eventBusName`, scope, `${props.eventBusName}-${scope.props.stage}`);
         (0, utils_1.createCfnOutput)(`${id}-eventBusArn`, scope, eventBus.eventBusArn);
@@ -63,7 +67,7 @@ class EventManager {
         const rule = new aws_events_1.Rule(scope, `${id}`, {
             ...props,
             eventBus,
-            ruleName: scope.resourceNameFormatter(props.ruleName, props.resourceNameOptions),
+            ruleName: scope.resourceNameFormatter.format(props.ruleName, props.resourceNameOptions),
         });
         if (targets && !lodash_1.default.isEmpty(targets)) {
             lodash_1.default.forEach(targets, target => {
@@ -99,12 +103,12 @@ class EventManager {
             description: 'Rule to send notification to lambda function target',
             eventBusName,
             eventPattern,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
             scheduleExpression,
             targets: [
                 {
                     arn: lambdaFunction.functionArn,
-                    id: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+                    id: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
                     input: props.input ?? undefined,
                 },
             ],
@@ -144,7 +148,7 @@ class EventManager {
             ...props,
             description: 'Rule to send notification on new objects in data bucket to ecs task target',
             eventPattern,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
             targets: [
                 {
                     arn: cluster.clusterArn,
@@ -156,7 +160,7 @@ class EventManager {
                         taskCount: 1,
                         taskDefinitionArn: task.taskDefinitionArn,
                     },
-                    id: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+                    id: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
                     roleArn: role instanceof aws_iam_1.Role ? role.roleArn : role.attrArn,
                 },
             ],
@@ -181,7 +185,7 @@ class EventManager {
         const pipeRole = scope.iamManager.createRoleForSqsToSfnPipe(`${id}-role`, scope, sourceQueue.queueArn, targetStepFunction.stateMachineArn);
         const pipe = new aws_pipes_1.CfnPipe(scope, `${id}`, {
             ...props,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
             roleArn: pipeRole.roleArn,
             source: sourceQueue.queueArn,
             sourceParameters: {
@@ -227,7 +231,7 @@ class EventManager {
         const pipeRole = scope.iamManager.createRoleForSqsToLambdaPipe(`${id}-role`, scope, sourceQueue.queueArn, targetLambdaFunction.functionArn);
         const pipe = new aws_pipes_1.CfnPipe(scope, `${id}`, {
             ...props,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
             roleArn: pipeRole.roleArn,
             source: sourceQueue.queueArn,
             sourceParameters: {
@@ -270,7 +274,7 @@ class EventManager {
         const pipeRole = scope.iamManager.createRoleForDynamoDbToLambdaPipe(`${id}-role`, scope, sourceDynamoDbStreamArn, targetLambdaFunction.functionArn);
         const pipe = new aws_pipes_1.CfnPipe(scope, `${id}`, {
             ...props,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
             roleArn: pipeRole.roleArn,
             source: sourceDynamoDbStreamArn,
             sourceParameters: {

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

@@ -34,7 +34,7 @@ class EvidentlyManager {
         const project = new aws_evidently_1.CfnProject(scope, `${id}`, {
             ...props,
             description: `${props.description} ${scope.props.stage}`,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-projectArn`, scope, project.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-projectName`, scope, project.name);
@@ -68,7 +68,7 @@ class EvidentlyManager {
         const launch = new aws_evidently_1.CfnLaunch(scope, `${id}`, {
             ...props,
             description: `${props.description} ${scope.props.stage}`,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-launchArn`, scope, launch.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-launchName`, scope, launch.name);
@@ -88,7 +88,7 @@ class EvidentlyManager {
         const experiment = new aws_evidently_1.CfnExperiment(scope, `${id}`, {
             ...props,
             description: `${props.description} ${scope.props.stage}`,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-experimentArn`, scope, experiment.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-experimentName`, scope, experiment.name);
@@ -108,7 +108,7 @@ class EvidentlyManager {
         const segment = new aws_evidently_1.CfnSegment(scope, `${id}`, {
             ...props,
             description: `${props.description} ${scope.props.stage}`,
-            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-segmentArn`, scope, segment.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-segmentName`, scope, segment.name);