@gradientedge/cdk-utils 9.12.0 → 9.14.0

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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.waf),
         });
         (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.format(props.name, props.resourceNameOptions),
+            name: scope.resourceNameFormatter.format(props.name, scope.props.resourceNameOptions?.waf),
             tags: [{ key: 'service', value: scope.props.name }],
         });
         (0, utils_1.createCfnOutput)(`${id}-webAclId`, scope, webAcl.attrId);

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.12.0",
+  "version": "9.14.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -53,16 +53,16 @@
     "@aws-sdk/client-secrets-manager": "^3.637.0",
     "@aws-sdk/credential-providers": "^3.637.0",
     "@aws-sdk/types": "^3.609.0",
-    "@cdktf/provider-aws": "^19.32.0",
+    "@cdktf/provider-aws": "^19.33.0",
     "@cdktf/provider-azurerm": "^13.0.0",
     "@cdktf/provider-cloudflare": "^11.18.0",
     "@types/lodash": "^4.17.7",
-    "@types/node": "^22.5.0",
+    "@types/node": "^22.5.1",
     "@types/uuid": "^10.0.0",
     "app-root-path": "^3.1.0",
-    "aws-cdk-lib": "^2.154.1",
+    "aws-cdk-lib": "^2.155.0",
     "cdktf": "^0.20.8",
-    "cdktf-local-exec": "^0.5.34",
+    "cdktf-local-exec": "^0.5.35",
     "constructs": "^10.3.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
@@ -78,7 +78,7 @@
     "@types/jest": "^29.5.12",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
-    "aws-cdk": "^2.154.1",
+    "aws-cdk": "^2.155.0",
     "better-docs": "^2.7.3",
     "codecov": "^3.8.3",
     "commitizen": "^4.3.0",

package/src/lib/aws/common/resource-name-formatter.ts

@@ -17,9 +17,11 @@ export class ResourceNameFormatter extends Construct {
    */
   public format(resourceName: string, options?: ResourceNameFormatterProps) {
     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/src/lib/aws/common/stack.ts

@@ -58,6 +58,9 @@ export class CommonStack extends 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/src/lib/aws/common/types.ts

@@ -8,6 +8,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
@@ -16,9 +18,12 @@ 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/src/lib/aws/construct/api-to-any-target/main.ts

@@ -111,7 +111,7 @@ export class ApiToAnyTarget extends CommonConstruct {
 
   protected 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: RemovalPolicy.DESTROY,
     })
   }
@@ -156,7 +156,7 @@ export class ApiToAnyTarget extends CommonConstruct {
       ...this.props.api.restApi,
       restApiName: this.resourceNameFormatter.format(
         this.props.api.restApi?.restApiName,
-        this.props.api.restApi?.resourceNameOptions
+        this.props.resourceNameOptions?.apigateway
       ),
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiToAnyTargetRestApi.api.restApiId)

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

@@ -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.resourceNameFormatter.format(this.id)}/events/api-to-eventbridge-target`,
+        logGroupName: `${this.id}-api-to-event-bridge-target`,
       },
       ...this.props.event.logGroup,
     })
@@ -356,7 +356,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       `${this.id}-rest-api-access-log`,
       this,
       {
-        logGroupName: `/custom/api/${this.resourceNameFormatter.format(this.id)}-rest-api-access`,
+        logGroupName: `${this.id}-access`,
         removalPolicy: RemovalPolicy.DESTROY,
       }
     )
@@ -408,7 +408,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       ...this.props.api.restApi,
       restApiName: this.resourceNameFormatter.format(
         this.props.api.restApi?.restApiName,
-        this.props.api.restApi?.resourceNameOptions
+        this.props.resourceNameOptions?.apigateway
       ),
     })
 

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

@@ -274,7 +274,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinationLogGroupSuccess() {
     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,
     })
   }
@@ -314,7 +314,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinationLogGroupFailure() {
     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,
     })
   }
@@ -509,7 +509,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
     }
 
     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: RemovalPolicy.DESTROY,
     })
 
@@ -540,7 +540,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
       ...this.props.api,
       restApiName: this.resourceNameFormatter.format(
         this.props.api.restApi?.restApiName,
-        this.props.api.restApi?.resourceNameOptions
+        this.props.resourceNameOptions?.apigateway
       ),
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId)

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

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

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

@@ -57,7 +57,12 @@ export abstract class RestApiLambdaWithCache extends RestApiLambda {
     if (this.props.useExistingVpc) {
       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/src/lib/aws/construct/site-with-ecs-backend/main.ts

@@ -213,9 +213,14 @@ export class SiteWithEcsBackend extends CommonConstruct {
    */
   protected 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/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.format(props.restApiName, props.resourceNameOptions),
+      restApiName: scope.resourceNameFormatter.format(props.restApiName, scope.props.resourceNameOptions?.apigateway),
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {

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

@@ -7,9 +7,6 @@ import { TagProps } from '../../types'
 export interface LambdaRestApiProps extends LambdaRestApigProps {
   tags?: TagProps[]
   minCompressionSizeInBytes?: number
-  resourceNameOptions?: ResourceNameFormatterProps
 }
 
-export interface RestApigProps extends RestApiProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface RestApigProps extends RestApiProps {}

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.format(props.application.name, props.resourceNameOptions),
+      name: scope.resourceNameFormatter.format(props.application.name, scope.props.resourceNameOptions?.appconfig),
     })
 
     createCfnOutput(`${id}-ApplicationId`, scope, Fn.ref(application.logicalId))
@@ -109,7 +109,10 @@ export 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
+      ),
     })
 
     createCfnOutput(`${id}-configurationProfileId`, scope, Fn.ref(profile.logicalId))

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

@@ -16,5 +16,4 @@ export interface AppConfigProps {
   deploymentStrategy: CfnDeploymentStrategyProps
   environment: CfnEnvironmentProps
   id: string
-  resourceNameOptions?: ResourceNameFormatterProps
 }

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.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,
@@ -360,7 +360,7 @@ export 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),
     })
 
     createCfnOutput(`${id}-functionArn`, scope, cloudfrontFunction.functionArn)

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

@@ -23,5 +23,4 @@ export interface DistributionProps extends CfDistributionProps {
 export interface CloudfrontFunctionProps extends FunctionProps {
   eventType: string
   functionFilePath: string
-  resourceNameOptions?: ResourceNameFormatterProps
 }

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

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

@@ -3,6 +3,4 @@ import { ResourceNameFormatterProps } from '../../common'
 
 /**
  */
-export interface CloudTrailProps extends CfnTrailProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface CloudTrailProps extends CfnTrailProps {}

package/src/lib/aws/services/cloudwatch/logs.ts

@@ -60,10 +60,11 @@ export class LogManager {
    */
   public createCfnLogGroup(id: string, scope: CommonConstruct, props: LogProps) {
     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,
     })
 
@@ -86,10 +87,11 @@ export class LogManager {
    */
   public createLogGroup(id: string, scope: CommonConstruct, props: LogProps) {
     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/src/lib/aws/services/cloudwatch/main.ts

@@ -107,9 +107,14 @@ export class CloudWatchManager {
    */
   public createDashboard(id: string, scope: CommonConstruct, props: DashboardProps, widgets?: watch.IWidget[][]) {
     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/src/lib/aws/services/codebuild/main.ts

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

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

@@ -30,10 +30,11 @@ export class DynamodbManager {
    */
   public createTable(id: string, scope: CommonConstruct, props: TableProps) {
     if (!props) throw `Table props undefined for ${id}`
+    if (!props.tableName) throw `Table tableName undefined for ${id}`
 
     const table = new Table(scope, `${id}`, {
       ...props,
-      tableName: `${props.tableName}-${scope.props.stage}`,
+      tableName: scope.resourceNameFormatter.format(props.tableName, scope.props.resourceNameOptions?.table),
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {
@@ -60,9 +61,15 @@ export class DynamodbManager {
 
     const table = new 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 && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
+        Tags.of(table).add(tag.key, tag.value)
+      })
+    }
+
     createCfnOutput(`${id}-tableName`, scope, table.tableName)
     createCfnOutput(`${id}-tableArn`, scope, table.tableArn)
 

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

@@ -9,5 +9,5 @@ export interface TableProps extends dynamodb.TableProps {
 }
 
 export interface TablePropsV2 extends dynamodb.TablePropsV2 {
-  resourceNameOptions?: ResourceNameFormatterProps
+  tags?: TagProps[]
 }

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

@@ -159,12 +159,15 @@ export class EcsManager {
       cluster,
       enableECSManagedTags: true,
       healthCheckGracePeriod: props.healthCheckGracePeriod ?? 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 ?? CpuArchitecture.X86_64,
         operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? 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/src/lib/aws/services/elastic-container-service/types.ts

@@ -55,5 +55,4 @@ export interface EcsApplicationLoadBalancedFargateServiceProps extends Applicati
   logging?: AwsLogDriverProps
   mountPoints?: MountPoint[]
   siteScaling?: EcsScalingProps
-  resourceNameOptions?: ResourceNameFormatterProps
 }

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

@@ -10,7 +10,6 @@ export interface EfsFileSystemProps extends FileSystemProps {
   rootDirectory?: string
   transitEncryption?: string
   transitEncryptionPort?: number
-  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**

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.format(props.clusterName, props.resourceNameOptions),
+      clusterName: scope.resourceNameFormatter.format(props.clusterName, scope.props.resourceNameOptions?.eks),
       defaultCapacity: props.appCapacity,
       defaultCapacityInstance: InstanceType.of(InstanceClass.T3, InstanceSize.LARGE),
       version: KubernetesVersion.V1_27,

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

@@ -6,5 +6,4 @@ import { ResourceNameFormatterProps } from '../../common'
 export interface EksClusterProps extends ClusterProps {
   appCapacity: number
   appContainerPort: number
-  resourceNameOptions?: ResourceNameFormatterProps
 }

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

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

@@ -3,9 +3,7 @@ import { ResourceNameFormatterProps } from '../../common'
 
 /**
  */
-export interface ElastiCacheProps extends CfnCacheClusterProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface ElastiCacheProps extends CfnCacheClusterProps {}
 
 /**
  */

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

@@ -47,7 +47,10 @@ export class EventManager {
 
     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 EventBus(scope, `${id}`, {
       ...props,
@@ -81,7 +84,7 @@ export class EventManager {
     const rule = new 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 && !_.isEmpty(targets)) {
@@ -129,12 +132,12 @@ export 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,
         },
       ],
@@ -187,7 +190,7 @@ export 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,
@@ -199,7 +202,7 @@ export 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 Role ? role.roleArn : role.attrArn,
         },
       ],
@@ -238,7 +241,7 @@ export class EventManager {
 
     const pipe = new 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: {
@@ -298,7 +301,7 @@ export class EventManager {
 
     const pipe = new 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: {
@@ -355,7 +358,7 @@ export class EventManager {
 
     const pipe = new 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/src/lib/aws/services/eventbridge/types.ts

@@ -11,7 +11,6 @@ export interface SqsToSfnPipeProps extends CfnPipeProps {
   sfnInvocationType?: string
   sqsBatchSize?: number
   sqsMaximumBatchingWindowInSeconds?: number
-  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**
@@ -21,13 +20,11 @@ export interface SqsToLambdaPipeProps extends CfnPipeProps {
   sqsBatchSize?: number
   lambdaInputTemplate?: string
   sqsMaximumBatchingWindowInSeconds?: number
-  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**
  */
 export interface EventRuleProps extends EBRuleProps {
-  resourceNameOptions?: ResourceNameFormatterProps
   tags?: TagProps[]
 }
 
@@ -35,15 +32,12 @@ export interface EventRuleProps extends EBRuleProps {
  */
 export interface RuleProps extends CfnRuleProps {
   input?: string
-  resourceNameOptions?: ResourceNameFormatterProps
   tags?: TagProps[]
 }
 
 /**
  */
-export interface EventBusProps extends EBProps {
-  resourceNameOptions?: ResourceNameFormatterProps
-}
+export interface EventBusProps extends EBProps {}
 
 /**
  }
@@ -52,5 +46,4 @@ export interface DynamoDbToLambdaPipeProps extends CfnPipeProps {
   pipeFilterPattern?: any
   dynamoDbBatchSize?: number
   dynamoDbStartingPosition: string
-  resourceNameOptions?: ResourceNameFormatterProps
 }