@gradientedge/cdk-utils 9.12.0 → 9.14.0

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

@@ -16,9 +16,11 @@ class ResourceNameFormatter extends constructs_1.Construct {
      */
     format(resourceName, options) {
         const resourceNameElements = [];
+        resourceNameElements.push(options?.globalPrefix ? this.props.globalPrefix : undefined);
         resourceNameElements.push(options?.prefix ?? this.props.resourcePrefix);
         resourceNameElements.push(resourceName);
         resourceNameElements.push(options?.suffix ?? this.props.resourceSuffix);
+        resourceNameElements.push(options?.globalSuffix ? this.props.globalSuffix : undefined);
         resourceNameElements.push(this.props.stage);
         return resourceNameElements.filter(resourceNameElement => resourceNameElement != undefined).join('-');
     }

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

@@ -33,6 +33,9 @@ export declare class CommonStack extends Stack {
         name: string;
         nodejsRuntime: any;
         region: any;
+        globalPrefix: any;
+        globalSuffix: any;
+        resourceNameOptions: any;
         resourcePrefix: any;
         resourceSuffix: any;
         skipStageForARecords: any;

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

@@ -53,6 +53,9 @@ class CommonStack extends aws_cdk_lib_1.Stack {
             name: props.stackName || 'cdk-utils',
             nodejsRuntime: this.node.tryGetContext('nodejsRuntime') ?? CommonStack.NODEJS_RUNTIME,
             region: this.node.tryGetContext('region'),
+            globalPrefix: this.node.tryGetContext('globalPrefix'),
+            globalSuffix: this.node.tryGetContext('globalSuffix'),
+            resourceNameOptions: this.node.tryGetContext('resourceNameOptions'),
             resourcePrefix: this.node.tryGetContext('resourcePrefix'),
             resourceSuffix: this.node.tryGetContext('resourceSuffix'),
             skipStageForARecords: this.node.tryGetContext('skipStageForARecords'),

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

@@ -7,6 +7,8 @@ import { BaseProps } from '../../common';
 export interface CommonStackProps extends BaseProps, StackProps {
     region: string;
     resourceProjectIdentifier?: string;
+    globalPrefix?: string;
+    globalSuffix?: string;
     resourcePrefix?: string;
     resourceSuffix?: string;
     logRetention?: RetentionDays;
@@ -15,8 +17,13 @@ export interface CommonStackProps extends BaseProps, StackProps {
     excludeDomainNameForBuckets?: boolean;
     excludeAccountNumberForBuckets?: boolean;
     nodejsRuntime?: Runtime;
+    resourceNameOptions?: {
+        [key: string]: ResourceNameFormatterProps;
+    };
 }
 export interface ResourceNameFormatterProps {
+    globalPrefix?: boolean;
+    globalSuffix?: boolean;
     prefix?: string;
     suffix?: string;
 }

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

@@ -75,7 +75,7 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
     }
     createApiToAnyTargetRestApiLogGroup() {
         this.apiToAnyTargetRestApi.accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-            logGroupName: `/custom/api/${this.id}-rest-api-access`,
+            logGroupName: `${this.id}-access`,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
     }
@@ -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.format(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
+            restApiName: this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway),
         });
         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

@@ -121,7 +121,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             return;
         this.apiEvent.logGroup = this.logManager.createLogGroup(`${this.id}-log`, this, {
             ...{
-                logGroupName: `/${this.resourceNameFormatter.format(this.id)}/events/api-to-eventbridge-target`,
+                logGroupName: `${this.id}-api-to-event-bridge-target`,
             },
             ...this.props.event.logGroup,
         });
@@ -290,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.resourceNameFormatter.format(this.id)}-rest-api-access`,
+            logGroupName: `${this.id}-access`,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
     }
@@ -333,7 +333,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
                 types: [aws_apigateway_1.EndpointType.REGIONAL],
             },
             ...this.props.api.restApi,
-            restApiName: this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
+            restApiName: this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway),
         });
         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

@@ -199,7 +199,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
         if (this.props.api.useExisting)
             return;
         this.apiEvent.logGroupSuccess = this.logManager.createLogGroup(`${this.id}-destination-success-log`, this, {
-            logGroupName: `/${this.id}/events/api-destination-success`,
+            logGroupName: `${this.id}-destination`,
             ...this.props.event.logGroupSuccess,
         });
     }
@@ -233,7 +233,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
         if (this.props.api.useExisting)
             return;
         this.apiEvent.logGroupFailure = this.logManager.createLogGroup(`${this.id}-destination-failure-log`, this, {
-            logGroupName: `/${this.id}/events/api-destination-failure`,
+            logGroupName: `${this.id}-destination-failure`,
             ...this.props.event.logGroupFailure,
         });
     }
@@ -410,7 +410,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
             return;
         }
         const accessLogGroup = this.logManager.createLogGroup(`${this.id}-sns-rest-api-access-log`, this, {
-            logGroupName: `/custom/api/${this.id}-destined-rest-api-access`,
+            logGroupName: `${this.id}-access`,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
         if (!this.props.api.restApi?.restApiName)
@@ -438,7 +438,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
                 types: [aws_apigateway_1.EndpointType.REGIONAL],
             },
             ...this.props.api,
-            restApiName: this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
+            restApiName: this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway),
         });
         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

@@ -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.resourceNameFormatter.format(this.id)}-rest-api-access`,
+            logGroupName: `${this.id}-access`,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
         this.props.api.restApi = {

package/dist/src/lib/aws/construct/rest-api-lambda-with-cache/main.js

@@ -55,7 +55,7 @@ class RestApiLambdaWithCache extends __1.RestApiLambda {
             this.restApivpc = this.vpcManager.retrieveCommonVpc(`${this.id}-vpc`, this, this.props.vpcName);
         }
         else {
-            this.restApivpc = this.vpcManager.createCommonVpc(this, this.props.restApiVpc, this.props.restApiVpc.vpcName);
+            this.restApivpc = this.vpcManager.createCommonVpc(`${this.id}-vpc`, this, this.props.restApiVpc, this.props.restApiVpc.vpcName);
         }
     }
     /**

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

@@ -149,10 +149,10 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
      */
     createVpc() {
         if (this.props.useExistingVpc) {
-            this.siteVpc = this.vpcManager.retrieveCommonVpc(`${this.id}`, this, this.props.siteVpc.vpcName);
+            this.siteVpc = this.vpcManager.retrieveCommonVpc(`${this.id}-vpc`, this, this.props.siteVpc.vpcName);
         }
         else {
-            this.siteVpc = this.vpcManager.createCommonVpc(this, this.props.siteVpc, this.props.siteVpc.vpcName);
+            this.siteVpc = this.vpcManager.createCommonVpc(`${this.id}-vpc`, this, this.props.siteVpc, this.props.siteVpc.vpcName);
         }
     }
     /**

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.format(props.restApiName, props.resourceNameOptions),
+            restApiName: scope.resourceNameFormatter.format(props.restApiName, scope.props.resourceNameOptions?.apigateway),
         });
         if (props.tags && !lodash_1.default.isEmpty(props.tags)) {
             lodash_1.default.forEach(props.tags, tag => {

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

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

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.format(props.application.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.application.name, scope.props.resourceNameOptions?.appconfig),
         });
         (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: scope.resourceNameFormatter.format(props.configurationProfile.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.configurationProfile.name, scope.props.resourceNameOptions?.appconfig),
         });
         (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/appconfig/types.d.ts

@@ -1,5 +1,4 @@
 import { CfnApplicationProps, CfnConfigurationProfileProps, CfnDeploymentProps, CfnDeploymentStrategyProps, CfnEnvironmentProps } from 'aws-cdk-lib/aws-appconfig';
-import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface AppConfigProps {
@@ -9,5 +8,4 @@ export interface AppConfigProps {
     deploymentStrategy: CfnDeploymentStrategyProps;
     environment: CfnEnvironmentProps;
     id: string;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }

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.format(props.functionName, props.resourceNameOptions),
+            functionName: scope.resourceNameFormatter.format(props.functionName, scope.props.resourceNameOptions?.cloudfront),
             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.format(props.functionName, props.resourceNameOptions),
+            functionName: scope.resourceNameFormatter.format(props.functionName, scope.props.resourceNameOptions?.cloudfront),
         });
         (0, utils_1.createCfnOutput)(`${id}-functionArn`, scope, cloudfrontFunction.functionArn);
         (0, utils_1.createCfnOutput)(`${id}-functionName`, scope, cloudfrontFunction.functionName);

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

@@ -1,5 +1,4 @@
 import { DistributionProps as CfDistributionProps, CloudFrontWebDistributionProps, FunctionProps } from 'aws-cdk-lib/aws-cloudfront';
-import { ResourceNameFormatterProps } from '../../common';
 import { TagProps } from '../../types';
 /**
  */
@@ -16,5 +15,4 @@ export interface DistributionProps extends CfDistributionProps {
 export interface CloudfrontFunctionProps extends FunctionProps {
     eventType: string;
     functionFilePath: string;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }

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.format(props.trailName, props.resourceNameOptions),
+            trailName: scope.resourceNameFormatter.format(props.trailName, scope.props.resourceNameOptions?.cloudtrail),
         });
         cloudTrail.addDependency(logBucketPolicy);
         cloudTrail.addDependency(logGroup);

package/dist/src/lib/aws/services/cloudtrail/types.d.ts

@@ -1,7 +1,5 @@
 import { CfnTrailProps } from 'aws-cdk-lib/aws-cloudtrail';
-import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface CloudTrailProps extends CfnTrailProps {
-    resourceNameOptions?: ResourceNameFormatterProps;
 }

package/dist/src/lib/aws/services/cloudwatch/logs.js

@@ -84,9 +84,11 @@ class LogManager {
     createCfnLogGroup(id, scope, props) {
         if (!props)
             throw `Logs props undefined for ${id}`;
+        if (!props.logGroupName)
+            throw `Logs logGroupName undefined for ${id}`;
         const logGroup = new logs.CfnLogGroup(scope, `${id}`, {
             ...props,
-            logGroupName: `${props.logGroupName}-${scope.props.stage}`,
+            logGroupName: `/${scope.resourceNameFormatter.format(props.logGroupName, scope.props.resourceNameOptions?.logs)}`,
             retentionInDays: props.retention,
         });
         if (props.tags && !lodash_1.default.isEmpty(props.tags)) {
@@ -106,9 +108,11 @@ class LogManager {
     createLogGroup(id, scope, props) {
         if (!props)
             throw `Logs props undefined for ${id}`;
+        if (!props.logGroupName)
+            throw `Logs logGroupName undefined for ${id}`;
         const logGroup = new logs.LogGroup(scope, `${id}`, {
             ...props,
-            logGroupName: `${props.logGroupName}-${scope.props.stage}`,
+            logGroupName: `/${scope.resourceNameFormatter.format(props.logGroupName, scope.props.resourceNameOptions?.logs)}`,
             removalPolicy: props.removalPolicy ?? cdk.RemovalPolicy.DESTROY,
             retention: props.retention,
         });

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

@@ -116,8 +116,11 @@ class CloudWatchManager {
     createDashboard(id, scope, props, widgets) {
         if (!props)
             throw `Dashboard props undefined for ${id}`;
+        if (!props.dashboardName)
+            throw `Dashboard dashboardName undefined for ${id}`;
         const dashboard = new watch.Dashboard(scope, `${id}`, {
             ...props,
+            dashboardName: scope.resourceNameFormatter.format(props.dashboardName, scope.props.resourceNameOptions?.cloudwatch),
             end: CloudWatchManager.determineTimeRange(props.end),
             start: CloudWatchManager.determineTimeRange(props.start),
             widgets,

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

@@ -63,7 +63,7 @@ class CodeBuildManager {
                     }),
                 },
             },
-            role: scope.iamManager.roleForCloudfrontInvalidation(id, scope),
+            role: scope.iamManager.createRoleForCloudfrontInvalidation(id, scope),
             timeout: aws_cdk_lib_1.Duration.minutes(5),
         });
     }

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

@@ -34,9 +34,11 @@ class DynamodbManager {
     createTable(id, scope, props) {
         if (!props)
             throw `Table props undefined for ${id}`;
+        if (!props.tableName)
+            throw `Table tableName undefined for ${id}`;
         const table = new aws_dynamodb_1.Table(scope, `${id}`, {
             ...props,
-            tableName: `${props.tableName}-${scope.props.stage}`,
+            tableName: scope.resourceNameFormatter.format(props.tableName, scope.props.resourceNameOptions?.table),
         });
         if (props.tags && !lodash_1.default.isEmpty(props.tags)) {
             lodash_1.default.forEach(props.tags, tag => {
@@ -60,8 +62,13 @@ class DynamodbManager {
             throw `Table tableName undefined for ${id}`;
         const table = new aws_dynamodb_1.TableV2(scope, `${id}`, {
             ...props,
-            tableName: scope.resourceNameFormatter.format(props.tableName, props.resourceNameOptions),
+            tableName: scope.resourceNameFormatter.format(props.tableName, scope.props.resourceNameOptions?.table),
         });
+        if (props.tags && !lodash_1.default.isEmpty(props.tags)) {
+            lodash_1.default.forEach(props.tags, tag => {
+                aws_cdk_lib_1.Tags.of(table).add(tag.key, tag.value);
+            });
+        }
         (0, utils_1.createCfnOutput)(`${id}-tableName`, scope, table.tableName);
         (0, utils_1.createCfnOutput)(`${id}-tableArn`, scope, table.tableArn);
         return table;

package/dist/src/lib/aws/services/dynamodb/types.d.ts

@@ -1,5 +1,4 @@
 import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
-import { ResourceNameFormatterProps } from '../../common';
 import { TagProps } from '../../types';
 /**
  */
@@ -7,5 +6,5 @@ export interface TableProps extends dynamodb.TableProps {
     tags?: TagProps[];
 }
 export interface TablePropsV2 extends dynamodb.TablePropsV2 {
-    resourceNameOptions?: ResourceNameFormatterProps;
+    tags?: TagProps[];
 }

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.format(props.loadBalancerName, props.resourceNameOptions),
+            loadBalancerName: scope.resourceNameFormatter.format(props.loadBalancerName, scope.props.resourceNameOptions?.ecs),
             runtimePlatform: {
                 cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? aws_ecs_1.CpuArchitecture.X86_64,
                 operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? aws_ecs_1.OperatingSystemFamily.LINUX,
             },
-            serviceName: scope.resourceNameFormatter.format(props.serviceName, props.resourceNameOptions),
+            serviceName: scope.resourceNameFormatter.format(props.serviceName, scope.props.resourceNameOptions?.ecs),
             taskImageOptions: {
                 ...props.taskImageOptions,
                 enableLogging: props.taskImageOptions?.enableLogging ?? true,

package/dist/src/lib/aws/services/elastic-container-service/types.d.ts

@@ -2,7 +2,6 @@ import { ScalingSchedule } from 'aws-cdk-lib/aws-applicationautoscaling';
 import { AwsLogDriverProps, ClusterProps, HealthCheck as FargateHealthCheck, MountPoint, TaskDefinitionProps } from 'aws-cdk-lib/aws-ecs';
 import { ApplicationLoadBalancedFargateServiceProps } from 'aws-cdk-lib/aws-ecs-patterns';
 import { HealthCheck as ElbHealthCheck } from 'aws-cdk-lib/aws-elasticloadbalancingv2';
-import { ResourceNameFormatterProps } from '../../common';
 import { TagProps } from '../../types';
 /**
  */
@@ -43,5 +42,4 @@ export interface EcsApplicationLoadBalancedFargateServiceProps extends Applicati
     logging?: AwsLogDriverProps;
     mountPoints?: MountPoint[];
     siteScaling?: EcsScalingProps;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }

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.format(props.fileSystemName, props.resourceNameOptions),
+            fileSystemName: scope.resourceNameFormatter.format(props.fileSystemName, scope.props.resourceNameOptions?.efs),
             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-file-system/types.d.ts

@@ -1,6 +1,5 @@
 import { AuthorizationConfig } from 'aws-cdk-lib/aws-ecs';
 import { AccessPointOptions, FileSystemProps } from 'aws-cdk-lib/aws-efs';
-import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface EfsFileSystemProps extends FileSystemProps {
@@ -9,7 +8,6 @@ export interface EfsFileSystemProps extends FileSystemProps {
     rootDirectory?: string;
     transitEncryption?: string;
     transitEncryptionPort?: number;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */

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.format(props.clusterName, props.resourceNameOptions),
+            clusterName: scope.resourceNameFormatter.format(props.clusterName, scope.props.resourceNameOptions?.eks),
             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/elastic-kubernetes-service/types.d.ts

@@ -1,9 +1,7 @@
 import { ClusterProps } from 'aws-cdk-lib/aws-eks';
-import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface EksClusterProps extends ClusterProps {
     appCapacity: number;
     appContainerPort: number;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }

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.format(props.clusterName, props.resourceNameOptions),
+            clusterName: scope.resourceNameFormatter.format(props.clusterName, scope.props.resourceNameOptions?.elasticache),
             logDeliveryConfigurations,
             vpcSecurityGroupIds: securityGroupIds,
         });

package/dist/src/lib/aws/services/elasticache/types.d.ts

@@ -1,9 +1,7 @@
 import { CfnCacheClusterProps, CfnReplicationGroupProps } from 'aws-cdk-lib/aws-elasticache';
-import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface ElastiCacheProps extends CfnCacheClusterProps {
-    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */

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

@@ -41,7 +41,7 @@ class EventManager {
             throw `EventBus eventBusName undefined for ${id}`;
         let eventBusName = props.eventBusName;
         if (eventBusName && eventBusName != 'default') {
-            eventBusName = scope.resourceNameFormatter.format(props.eventBusName, props.resourceNameOptions);
+            eventBusName = scope.resourceNameFormatter.format(props.eventBusName, scope.props.resourceNameOptions?.eventbridgeBus);
         }
         const eventBus = new aws_events_1.EventBus(scope, `${id}`, {
             ...props,
@@ -67,7 +67,7 @@ class EventManager {
         const rule = new aws_events_1.Rule(scope, `${id}`, {
             ...props,
             eventBus,
-            ruleName: scope.resourceNameFormatter.format(props.ruleName, props.resourceNameOptions),
+            ruleName: scope.resourceNameFormatter.format(props.ruleName, scope.props.resourceNameOptions?.eventbridgeRule),
         });
         if (targets && !lodash_1.default.isEmpty(targets)) {
             lodash_1.default.forEach(targets, target => {
@@ -103,12 +103,12 @@ class EventManager {
             description: 'Rule to send notification to lambda function target',
             eventBusName,
             eventPattern,
-            name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventbridgeRule),
             scheduleExpression,
             targets: [
                 {
                     arn: lambdaFunction.functionArn,
-                    id: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
+                    id: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventbridgeRule),
                     input: props.input ?? undefined,
                 },
             ],
@@ -148,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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventbridgeRule),
             targets: [
                 {
                     arn: cluster.clusterArn,
@@ -160,7 +160,7 @@ class EventManager {
                         taskCount: 1,
                         taskDefinitionArn: task.taskDefinitionArn,
                     },
-                    id: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
+                    id: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventbridgeRule),
                     roleArn: role instanceof aws_iam_1.Role ? role.roleArn : role.attrArn,
                 },
             ],
@@ -185,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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventbridgePipe),
             roleArn: pipeRole.roleArn,
             source: sourceQueue.queueArn,
             sourceParameters: {
@@ -231,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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventbridgePipe),
             roleArn: pipeRole.roleArn,
             source: sourceQueue.queueArn,
             sourceParameters: {
@@ -274,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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.eventbridgePipe),
             roleArn: pipeRole.roleArn,
             source: sourceDynamoDbStreamArn,
             sourceParameters: {

package/dist/src/lib/aws/services/eventbridge/types.d.ts

@@ -1,6 +1,5 @@
 import { CfnRuleProps, EventBusProps as EBProps, RuleProps as EBRuleProps } from 'aws-cdk-lib/aws-events';
 import { CfnPipeProps } from 'aws-cdk-lib/aws-pipes';
-import { ResourceNameFormatterProps } from '../../common';
 import { TagProps } from '../../types';
 /**
  */
@@ -10,7 +9,6 @@ export interface SqsToSfnPipeProps extends CfnPipeProps {
     sfnInvocationType?: string;
     sqsBatchSize?: number;
     sqsMaximumBatchingWindowInSeconds?: number;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
@@ -19,25 +17,21 @@ export interface SqsToLambdaPipeProps extends CfnPipeProps {
     sqsBatchSize?: number;
     lambdaInputTemplate?: string;
     sqsMaximumBatchingWindowInSeconds?: number;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
 export interface EventRuleProps extends EBRuleProps {
-    resourceNameOptions?: ResourceNameFormatterProps;
     tags?: TagProps[];
 }
 /**
  */
 export interface RuleProps extends CfnRuleProps {
     input?: string;
-    resourceNameOptions?: ResourceNameFormatterProps;
     tags?: TagProps[];
 }
 /**
  */
 export interface EventBusProps extends EBProps {
-    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  }
@@ -46,5 +40,4 @@ export interface DynamoDbToLambdaPipeProps extends CfnPipeProps {
     pipeFilterPattern?: any;
     dynamoDbBatchSize?: number;
     dynamoDbStartingPosition: string;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }

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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.evidentlyProject),
         });
         (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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.evidentlyLaunch),
         });
         (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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.evidentlyExperiment),
         });
         (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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.evidentlySegment),
         });
         (0, utils_1.createCfnOutput)(`${id}-segmentArn`, scope, segment.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-segmentName`, scope, segment.name);