@gradientedge/cdk-utils 9.10.0 → 9.11.0

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

@@ -45,9 +45,13 @@ export class EventManager {
     if (!props) 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 EventBus(scope, `${id}`, {
       ...props,
-      eventBusName: scope.resourceNameFormatter(props.eventBusName, props.resourceNameOptions),
+      eventBusName,
     })
 
     createCfnOutput(`${id}-eventBusName`, scope, `${props.eventBusName}-${scope.props.stage}`)
@@ -77,7 +81,7 @@ export class EventManager {
     const rule = new Rule(scope, `${id}`, {
       ...props,
       eventBus,
-      ruleName: scope.resourceNameFormatter(props.ruleName, props.resourceNameOptions),
+      ruleName: scope.resourceNameFormatter.format(props.ruleName, props.resourceNameOptions),
     })
 
     if (targets && !_.isEmpty(targets)) {
@@ -125,12 +129,12 @@ export 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,
         },
       ],
@@ -183,7 +187,7 @@ export 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,
@@ -195,7 +199,7 @@ export 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 Role ? role.roleArn : role.attrArn,
         },
       ],
@@ -234,7 +238,7 @@ export class EventManager {
 
     const pipe = new 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: {
@@ -294,7 +298,7 @@ export class EventManager {
 
     const pipe = new 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: {
@@ -351,7 +355,7 @@ export class EventManager {
 
     const pipe = new 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/src/lib/aws/services/evidently/main.ts

@@ -39,7 +39,7 @@ export class EvidentlyManager {
     const project = new 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),
     })
     createCfnOutput(`${id}-projectArn`, scope, project.attrArn)
     createCfnOutput(`${id}-projectName`, scope, project.name)
@@ -74,7 +74,7 @@ export class EvidentlyManager {
     const launch = new 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),
     })
     createCfnOutput(`${id}-launchArn`, scope, launch.attrArn)
     createCfnOutput(`${id}-launchName`, scope, launch.name)
@@ -94,7 +94,7 @@ export class EvidentlyManager {
     const experiment = new 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),
     })
     createCfnOutput(`${id}-experimentArn`, scope, experiment.attrArn)
     createCfnOutput(`${id}-experimentName`, scope, experiment.name)
@@ -114,7 +114,7 @@ export class EvidentlyManager {
     const segment = new 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),
     })
     createCfnOutput(`${id}-segmentArn`, scope, segment.attrArn)
     createCfnOutput(`${id}-segmentName`, scope, segment.name)

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

@@ -461,10 +461,10 @@ export class IamManager {
       policies: [
         {
           policyDocument: policy,
-          policyName: scope.resourceNameFormatter(`${id}-policy`),
+          policyName: scope.resourceNameFormatter.format(`${id}-policy`),
         },
       ],
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.attrArn)
@@ -489,7 +489,7 @@ export class IamManager {
       assumedBy: new ServicePrincipal('events.amazonaws.com'),
       description: `Role for ${id} ECS Task execution from EventBridge`,
       inlinePolicies: { policy },
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -516,7 +516,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'
         ),
       ],
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -549,7 +549,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
         ),
       ],
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -575,7 +575,7 @@ export class IamManager {
       assumedBy: servicePrincipal ?? new ServicePrincipal('appconfig.amazonaws.com'),
       description: `Role for ${id} AppConfig Secrets`,
       inlinePolicies: { policy },
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -608,7 +608,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
         ),
       ],
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -628,7 +628,7 @@ export class IamManager {
     const role = new Role(scope, `${id}`, {
       assumedBy: new ServicePrincipal('pipes.amazonaws.com'),
       description: `Role for ${id} Pipe`,
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     role.addToPolicy(this.statementForPollQueue([queueArn]))
@@ -651,7 +651,7 @@ export class IamManager {
     const role = new Role(scope, `${id}`, {
       assumedBy: new ServicePrincipal('pipes.amazonaws.com'),
       description: `Role for ${id} Pipe`,
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     role.addToPolicy(this.statementForPollQueue([queueArn]))
@@ -711,7 +711,7 @@ export class IamManager {
     const role = new Role(scope, `${id}`, {
       assumedBy: new ServicePrincipal('pipes.amazonaws.com'),
       description: `Role for ${id} Pipe`,
-      roleName: scope.resourceNameFormatter(id),
+      roleName: scope.resourceNameFormatter.format(id),
     })
 
     role.addToPolicy(this.statementFordynamoDbStream([dynamoDbStreamArn]))

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

@@ -110,7 +110,7 @@ export class LambdaManager {
     if (!props) throw `Lambda props undefined for ${id}`
     if (!props.functionName) throw `Lambda functionName undefined for ${id}`
 
-    const functionName = scope.resourceNameFormatter(props.functionName, props.resourceNameOptions)
+    const functionName = scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions)
 
     let deadLetterQueue
     if (props.deadLetterQueueEnabled) {
@@ -268,7 +268,7 @@ export class LambdaManager {
     if (!props) throw `Lambda props undefined for ${id}`
     if (!props.functionName) throw `Lambda functionName undefined for ${id}`
 
-    const functionName = scope.resourceNameFormatter(props.functionName, props.resourceNameOptions)
+    const functionName = scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions)
 
     let deadLetterQueue
     if (props.deadLetterQueueEnabled) {

package/src/lib/aws/services/secrets-manager/main.ts

@@ -34,7 +34,7 @@ export class SecretsManager {
 
     const secret = new Secret(scope, `${id}`, {
       ...props,
-      secretName: scope.resourceNameFormatter(props.secretName, props.resourceNameOptions),
+      secretName: scope.resourceNameFormatter.format(props.secretName, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-secretName`, scope, secret.secretName)

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

@@ -41,8 +41,8 @@ export class SnsManager {
 
     const topic = new Topic(scope, id, {
       ...props,
-      displayName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
-      topicName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
+      displayName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
+      topicName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
     })
 
     if (emails && !_.isEmpty(emails)) {
@@ -73,8 +73,8 @@ export class SnsManager {
 
     const topic = new Topic(scope, id, {
       ...props,
-      displayName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
-      topicName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
+      displayName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
+      topicName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
     })
 
     topic.addSubscription(new LambdaSubscription(lambdaFunction))

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

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

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

@@ -78,7 +78,7 @@ export class S3Manager {
     if (!scope.props.excludeAccountNumberForBuckets) {
       return S3Manager.determineBucketNameByAccountAndRegion(scope, bucketName)
     }
-    return scope.resourceNameFormatter(bucketName, props.resourceNameOptions)
+    return scope.resourceNameFormatter.format(bucketName, props.resourceNameOptions)
   }
 
   /**

package/src/lib/aws/services/step-function/main.ts

@@ -485,7 +485,7 @@ export class SfnManager {
         level: props.logs?.level ?? LogLevel.ALL,
       },
       role,
-      stateMachineName: scope.resourceNameFormatter(props.stateMachineName, props.resourceNameOptions),
+      stateMachineName: scope.resourceNameFormatter.format(props.stateMachineName, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-stateMachineName`, scope, stateMachine.stateMachineName)

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

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

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

@@ -33,7 +33,7 @@ export class WafManager {
     const ipSet = new CfnIPSet(scope, `${id}`, {
       ...props,
       description: `IP Set for ${id} - ${scope.props.stage} stage`,
-      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+      name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-ipSetId`, scope, ipSet.attrId)
@@ -55,7 +55,7 @@ export class WafManager {
     const webAcl = new CfnWebACL(scope, `${id}`, {
       ...props,
       description: `Web Acl for ${id} - ${scope.props.stage} stage`,
-      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
+      name: scope.resourceNameFormatter.format(props.name, props.resourceNameOptions),
       tags: [{ key: 'service', value: scope.props.name }],
     })