@gradientedge/cdk-utils 9.9.0 → 9.10.0

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

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

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

@@ -56,10 +56,11 @@ export class DynamodbManager {
    */
   public createTableV2(id: string, scope: CommonConstruct, props: TablePropsV2) {
     if (!props) throw `Table props undefined for ${id}`
+    if (!props.tableName) throw `Table tableName undefined for ${id}`
 
     const table = new TableV2(scope, `${id}`, {
       ...props,
-      tableName: `${props.tableName}-${scope.props.stage}`,
+      tableName: scope.resourceNameFormatter(props.tableName, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-tableName`, scope, table.tableName)

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

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

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

@@ -148,6 +148,8 @@ export class EcsManager {
     logGroup: ILogGroup
   ) {
     if (!props) throw `Ecs Load balanced Fargate Service props undefined for ${id}`
+    if (!props.loadBalancerName) throw `Ecs loadBalancerName undefined for ${id}`
+    if (!props.serviceName) throw `Ecs serviceName undefined for ${id}`
     if (!props.taskImageOptions)
       throw `TaskImageOptions for Ecs Load balanced Fargate Service props undefined for ${id}`
 
@@ -157,12 +159,12 @@ export class EcsManager {
       cluster,
       enableECSManagedTags: true,
       healthCheckGracePeriod: props.healthCheckGracePeriod ?? Duration.seconds(60),
-      loadBalancerName: `${id}-${scope.props.stage}`,
+      loadBalancerName: scope.resourceNameFormatter(props.loadBalancerName, props.resourceNameOptions),
       runtimePlatform: {
         cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? CpuArchitecture.X86_64,
         operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? OperatingSystemFamily.LINUX,
       },
-      serviceName: `${id}-${scope.props.stage}`,
+      serviceName: scope.resourceNameFormatter(props.serviceName, props.resourceNameOptions),
       taskImageOptions: {
         ...props.taskImageOptions,
         enableLogging: props.taskImageOptions?.enableLogging ?? true,

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

@@ -8,6 +8,7 @@ import {
 } 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'
 
 /**
@@ -54,4 +55,5 @@ export interface EcsApplicationLoadBalancedFargateServiceProps extends Applicati
   logging?: AwsLogDriverProps
   mountPoints?: MountPoint[]
   siteScaling?: EcsScalingProps
+  resourceNameOptions?: ResourceNameFormatterProps
 }

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

@@ -54,11 +54,12 @@ export class EfsManager {
     vpcSubnets?: SubnetSelection
   ) {
     if (!props) throw `EFS props undefined for ${id}`
+    if (!props.fileSystemName) throw `EFS fileSystemName undefined for ${id}`
 
     const fileSystemId = props.provisionNewOnDeployment ? `${id}-${new Date().getMilliseconds()}` : `${id}`
     const fileSystem = new FileSystem(scope, `${fileSystemId}`, {
       ...props,
-      fileSystemName: props.fileSystemName ? `${props.fileSystemName}-${scope.props.stage}` : undefined,
+      fileSystemName: scope.resourceNameFormatter(props.fileSystemName, props.resourceNameOptions),
       lifecyclePolicy: props.lifecyclePolicy ?? LifecyclePolicy.AFTER_7_DAYS,
       outOfInfrequentAccessPolicy: props.outOfInfrequentAccessPolicy ?? OutOfInfrequentAccessPolicy.AFTER_1_ACCESS,
       performanceMode: props.performanceMode ?? PerformanceMode.GENERAL_PURPOSE,

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

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

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

@@ -38,6 +38,7 @@ export class EksManager {
     vpc: IVpc
   ) {
     if (!props) throw `EksCluster props undefined for ${id}`
+    if (!props.clusterName) throw `EksCluster clusterName undefined for ${id}`
 
     const appLabel = { app: `${id}`.toLowerCase() }
 
@@ -81,7 +82,7 @@ export class EksManager {
     }
 
     const cluster = new Cluster(scope, `${id}Cluster`, {
-      clusterName: `${id.toLowerCase()}-${scope.props.stage}`,
+      clusterName: scope.resourceNameFormatter(props.clusterName, props.resourceNameOptions),
       defaultCapacity: props.appCapacity,
       defaultCapacityInstance: InstanceType.of(InstanceClass.T3, InstanceSize.LARGE),
       version: KubernetesVersion.V1_27,

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

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

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

@@ -54,13 +54,14 @@ export class ElastiCacheManager {
     logDeliveryConfigurations?: any
   ) {
     if (!props) throw `ElastiCache props undefined for ${id}`
+    if (!props.clusterName) throw `ElastiCache clusterName undefined for ${id}`
 
     const subnetGroup = this.createElastiCacheSubnetGroup(`${id}-subnetGroup`, scope, subnetIds)
 
     const elasticacheCluster = new CfnCacheCluster(scope, `${id}`, {
       ...props,
       cacheSubnetGroupName: subnetGroup.cacheSubnetGroupName,
-      clusterName: `${id}-${scope.props.stage}`,
+      clusterName: scope.resourceNameFormatter(props.clusterName, props.resourceNameOptions),
       logDeliveryConfigurations,
       vpcSecurityGroupIds: securityGroupIds,
     })

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

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

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

@@ -43,10 +43,11 @@ export class EventManager {
    */
   public createEventBus(id: string, scope: CommonConstruct, props: EventBusProps) {
     if (!props) throw `EventBus props undefined for ${id}`
+    if (!props.eventBusName) throw `EventBus eventBusName undefined for ${id}`
 
     const eventBus = new EventBus(scope, `${id}`, {
       ...props,
-      eventBusName: `${props.eventBusName}-${scope.props.stage}`,
+      eventBusName: scope.resourceNameFormatter(props.eventBusName, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-eventBusName`, scope, `${props.eventBusName}-${scope.props.stage}`)
@@ -71,11 +72,12 @@ export class EventManager {
     targets?: IRuleTarget[]
   ) {
     if (!props) throw `EventRule props undefined for ${id}`
+    if (!props.ruleName) throw `EventRule ruleName undefined for ${id}`
 
     const rule = new Rule(scope, `${id}`, {
       ...props,
       eventBus,
-      ruleName: `${props.ruleName}-${scope.props.stage}`,
+      ruleName: scope.resourceNameFormatter(props.ruleName, props.resourceNameOptions),
     })
 
     if (targets && !_.isEmpty(targets)) {
@@ -116,23 +118,30 @@ export class EventManager {
     scheduleExpression?: string
   ) {
     if (!props) throw `EventRule props undefined for ${id}`
+    if (!props.name) throw `EventRule name undefined for ${id}`
 
     const eventRule = new CfnRule(scope, `${id}`, {
       ...props,
       description: 'Rule to send notification to lambda function target',
       eventBusName,
       eventPattern,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
       scheduleExpression,
       targets: [
         {
           arn: lambdaFunction.functionArn,
-          id: `${id}-${scope.props.stage}`,
+          id: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
           input: props.input ?? undefined,
         },
       ],
     })
 
+    if (props.tags && !_.isEmpty(props.tags)) {
+      _.forEach(props.tags, tag => {
+        Tags.of(eventRule).add(tag.key, tag.value)
+      })
+    }
+
     new CfnPermission(scope, `${id}LambdaPermission`, {
       action: 'lambda:InvokeFunction',
       functionName: lambdaFunction.functionName,
@@ -168,12 +177,13 @@ export class EventManager {
     eventPattern?: any
   ) {
     if (!props) throw `EventRule props undefined for ${id}`
+    if (!props.name) throw `EventRule name undefined for ${id}`
 
     const eventRule = new CfnRule(scope, `${id}`, {
       ...props,
       description: 'Rule to send notification on new objects in data bucket to ecs task target',
       eventPattern,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
       targets: [
         {
           arn: cluster.clusterArn,
@@ -185,7 +195,7 @@ export class EventManager {
             taskCount: 1,
             taskDefinitionArn: task.taskDefinitionArn,
           },
-          id: `${id}-${scope.props.stage}`,
+          id: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
           roleArn: role instanceof Role ? role.roleArn : role.attrArn,
         },
       ],
@@ -212,6 +222,9 @@ export class EventManager {
     sourceQueue: IQueue,
     targetStepFunction: IStateMachine
   ) {
+    if (!props) throw `Pipe props undefined for ${id}`
+    if (!props.name) throw `Pipe name undefined for ${id}`
+
     const pipeRole = scope.iamManager.createRoleForSqsToSfnPipe(
       `${id}-role`,
       scope,
@@ -221,7 +234,7 @@ export class EventManager {
 
     const pipe = new CfnPipe(scope, `${id}`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
       roleArn: pipeRole.roleArn,
       source: sourceQueue.queueArn,
       sourceParameters: {
@@ -269,6 +282,9 @@ export class EventManager {
     sourceQueue: IQueue,
     targetLambdaFunction: IFunction
   ) {
+    if (!props) throw `Pipe props undefined for ${id}`
+    if (!props.name) throw `Pipe name undefined for ${id}`
+
     const pipeRole = scope.iamManager.createRoleForSqsToLambdaPipe(
       `${id}-role`,
       scope,
@@ -278,7 +294,7 @@ export class EventManager {
 
     const pipe = new CfnPipe(scope, `${id}`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
       roleArn: pipeRole.roleArn,
       source: sourceQueue.queueArn,
       sourceParameters: {
@@ -323,6 +339,9 @@ export class EventManager {
     sourceDynamoDbStreamArn: string,
     targetLambdaFunction: IFunction
   ) {
+    if (!props) throw `Pipe props undefined for ${id}`
+    if (!props.name) throw `Pipe name undefined for ${id}`
+
     const pipeRole = scope.iamManager.createRoleForDynamoDbToLambdaPipe(
       `${id}-role`,
       scope,
@@ -332,7 +351,7 @@ export class EventManager {
 
     const pipe = new CfnPipe(scope, `${id}`, {
       ...props,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
       roleArn: pipeRole.roleArn,
       source: sourceDynamoDbStreamArn,
       sourceParameters: {

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

@@ -1,5 +1,6 @@
-import { CfnPipeProps } from 'aws-cdk-lib/aws-pipes'
 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,6 +11,7 @@ export interface SqsToSfnPipeProps extends CfnPipeProps {
   sfnInvocationType?: string
   sqsBatchSize?: number
   sqsMaximumBatchingWindowInSeconds?: number
+  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**
@@ -19,11 +21,13 @@ export interface SqsToLambdaPipeProps extends CfnPipeProps {
   sqsBatchSize?: number
   lambdaInputTemplate?: string
   sqsMaximumBatchingWindowInSeconds?: number
+  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**
  */
 export interface EventRuleProps extends EBRuleProps {
+  resourceNameOptions?: ResourceNameFormatterProps
   tags?: TagProps[]
 }
 
@@ -31,11 +35,15 @@ export interface EventRuleProps extends EBRuleProps {
  */
 export interface RuleProps extends CfnRuleProps {
   input?: string
+  resourceNameOptions?: ResourceNameFormatterProps
+  tags?: TagProps[]
 }
 
 /**
  */
-export interface EventBusProps extends EBProps {}
+export interface EventBusProps extends EBProps {
+  resourceNameOptions?: ResourceNameFormatterProps
+}
 
 /**
  }
@@ -44,4 +52,5 @@ export interface DynamoDbToLambdaPipeProps extends CfnPipeProps {
   pipeFilterPattern?: any
   dynamoDbBatchSize?: number
   dynamoDbStartingPosition: string
+  resourceNameOptions?: ResourceNameFormatterProps
 }

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

@@ -33,10 +33,13 @@ export class EvidentlyManager {
    * @param props the project properties
    */
   public createProject(id: string, scope: CommonConstruct, props: EvidentlyProjectProps) {
+    if (!props) throw `EvidentlyProject props undefined for ${id}`
+    if (!props.name) throw `EvidentlyProject name undefined for ${id}`
+
     const project = new CfnProject(scope, `${id}`, {
       ...props,
       description: `${props.description} ${scope.props.stage}`,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
     })
     createCfnOutput(`${id}-projectArn`, scope, project.attrArn)
     createCfnOutput(`${id}-projectName`, scope, project.name)
@@ -50,6 +53,8 @@ export class EvidentlyManager {
    * @param props the feature properties
    */
   public createFeature(id: string, scope: CommonConstruct, props: EvidentlyFeatureProps) {
+    if (!props) throw `EvidentlyFeature props undefined for ${id}`
+
     const feature = new CfnFeature(scope, `${id}`, props)
     createCfnOutput(`${id}-featureArn`, scope, feature.attrArn)
     createCfnOutput(`${id}-featureName`, scope, feature.name)
@@ -63,10 +68,13 @@ export class EvidentlyManager {
    * @param props the launch properties
    */
   public createLaunch(id: string, scope: CommonConstruct, props: EvidentlyLaunchProps) {
+    if (!props) throw `EvidentlyLaunch props undefined for ${id}`
+    if (!props.name) throw `EvidentlyLaunch name undefined for ${id}`
+
     const launch = new CfnLaunch(scope, `${id}`, {
       ...props,
       description: `${props.description} ${scope.props.stage}`,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
     })
     createCfnOutput(`${id}-launchArn`, scope, launch.attrArn)
     createCfnOutput(`${id}-launchName`, scope, launch.name)
@@ -80,10 +88,13 @@ export class EvidentlyManager {
    * @param props the experiment properties
    */
   public createExperiment(id: string, scope: CommonConstruct, props: EvidentlyExperimentProps) {
+    if (!props) throw `EvidentlyExperiment props undefined for ${id}`
+    if (!props.name) throw `EvidentlyExperiment name undefined for ${id}`
+
     const experiment = new CfnExperiment(scope, `${id}`, {
       ...props,
       description: `${props.description} ${scope.props.stage}`,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
     })
     createCfnOutput(`${id}-experimentArn`, scope, experiment.attrArn)
     createCfnOutput(`${id}-experimentName`, scope, experiment.name)
@@ -97,10 +108,13 @@ export class EvidentlyManager {
    * @param props the segment properties
    */
   public createSegment(id: string, scope: CommonConstruct, props: EvidentlySegmentProps) {
+    if (!props) throw `EvidentlySegment props undefined for ${id}`
+    if (!props.name) throw `EvidentlySegment name undefined for ${id}`
+
     const segment = new CfnSegment(scope, `${id}`, {
       ...props,
       description: `${props.description} ${scope.props.stage}`,
-      name: `${props.name}-${scope.props.stage}`,
+      name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
     })
     createCfnOutput(`${id}-segmentArn`, scope, segment.attrArn)
     createCfnOutput(`${id}-segmentName`, scope, segment.name)

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

@@ -5,10 +5,13 @@ import {
   CfnProjectProps,
   CfnSegmentProps,
 } from 'aws-cdk-lib/aws-evidently'
+import { ResourceNameFormatterProps } from '../../common'
 
 /**
  */
-export interface EvidentlyProjectProps extends CfnProjectProps {}
+export interface EvidentlyProjectProps extends CfnProjectProps {
+  resourceNameOptions?: ResourceNameFormatterProps
+}
 
 /**
  */
@@ -16,12 +19,18 @@ export interface EvidentlyFeatureProps extends CfnFeatureProps {}
 
 /**
  */
-export interface EvidentlyLaunchProps extends CfnLaunchProps {}
+export interface EvidentlyLaunchProps extends CfnLaunchProps {
+  resourceNameOptions?: ResourceNameFormatterProps
+}
 
 /**
  */
-export interface EvidentlyExperimentProps extends CfnExperimentProps {}
+export interface EvidentlyExperimentProps extends CfnExperimentProps {
+  resourceNameOptions?: ResourceNameFormatterProps
+}
 
 /**
  */
-export interface EvidentlySegmentProps extends CfnSegmentProps {}
+export interface EvidentlySegmentProps extends CfnSegmentProps {
+  resourceNameOptions?: ResourceNameFormatterProps
+}

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

@@ -461,10 +461,10 @@ export class IamManager {
       policies: [
         {
           policyDocument: policy,
-          policyName: `${id}-policy-${scope.props.stage}`,
+          policyName: scope.resourceNameFormatter(`${id}-policy`),
         },
       ],
-      roleName: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(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: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -516,7 +516,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'
         ),
       ],
-      roleName: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -549,7 +549,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
         ),
       ],
-      roleName: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(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: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(id),
     })
 
     createCfnOutput(`${id}Arn`, scope, role.roleArn)
@@ -608,7 +608,7 @@ export class IamManager {
           'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
         ),
       ],
-      roleName: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(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: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(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: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(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: `${id}-${scope.props.stage}`,
+      roleName: scope.resourceNameFormatter(id),
     })
 
     role.addToPolicy(this.statementFordynamoDbStream([dynamoDbStreamArn]))

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

@@ -108,8 +108,9 @@ export class LambdaManager {
     vpcSubnets?: SubnetSelection
   ) {
     if (!props) throw `Lambda props undefined for ${id}`
+    if (!props.functionName) throw `Lambda functionName undefined for ${id}`
 
-    const functionName = `${props.functionName}-${scope.props.stage}`
+    const functionName = scope.resourceNameFormatter(props.functionName, props.resourceNameOptions)
 
     let deadLetterQueue
     if (props.deadLetterQueueEnabled) {
@@ -265,8 +266,9 @@ export class LambdaManager {
     vpcSubnets?: SubnetSelection
   ) {
     if (!props) throw `Lambda props undefined for ${id}`
+    if (!props.functionName) throw `Lambda functionName undefined for ${id}`
 
-    const functionName = `${props.functionName}-${scope.props.stage}`
+    const functionName = scope.resourceNameFormatter(props.functionName, props.resourceNameOptions)
 
     let deadLetterQueue
     if (props.deadLetterQueueEnabled) {

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

@@ -1,8 +1,9 @@
+import { EdgeFunctionProps } from 'aws-cdk-lib/aws-cloudfront/lib/experimental'
 import { AliasProps, FunctionProps } from 'aws-cdk-lib/aws-lambda'
+import { SqsEventSourceProps } from 'aws-cdk-lib/aws-lambda-event-sources'
+import { ResourceNameFormatterProps } from '../../common'
 import { TagProps } from '../../types'
-import { EdgeFunctionProps } from 'aws-cdk-lib/aws-cloudfront/lib/experimental'
 import { QueueProps } from '../simple-queue-service'
-import { SqsEventSourceProps } from 'aws-cdk-lib/aws-lambda-event-sources'
 
 /**
  */
@@ -22,6 +23,7 @@ export interface LambdaProps extends FunctionProps {
   redriveq?: QueueProps
   tags?: TagProps[]
   timeoutInSecs?: number
+  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**
@@ -36,6 +38,7 @@ export interface LambdaAliasProps extends AliasProps {
 export interface LambdaEdgeProps extends EdgeFunctionProps {
   tags?: TagProps[]
   timeoutInSecs?: number
+  resourceNameOptions?: ResourceNameFormatterProps
 }
 
 /**

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

@@ -1 +1,2 @@
 export * from './main'
+export * from './types'

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

@@ -1,8 +1,9 @@
 import { GetSecretValueCommand, SecretsManagerClient } from '@aws-sdk/client-secrets-manager'
 import { Fn } from 'aws-cdk-lib'
-import { Secret, SecretProps } from 'aws-cdk-lib/aws-secretsmanager'
+import { Secret } from 'aws-cdk-lib/aws-secretsmanager'
 import { CommonConstruct } from '../../common'
 import { createCfnOutput, determineCredentials } from '../../utils'
+import { SecretBaseProps } from './types'
 
 /**
  * @classdesc Provides operations on AWS Secrets Manager.
@@ -27,10 +28,13 @@ export class SecretsManager {
    * @param scope scope in which this resource is defined
    * @param props the secret properties
    */
-  public createSecret(id: string, scope: CommonConstruct, props: SecretProps) {
+  public createSecret(id: string, scope: CommonConstruct, props: SecretBaseProps) {
+    if (!props) throw `Secret props undefined for ${id}`
+    if (!props.secretName) throw `Secret name undefined for ${id}`
+
     const secret = new Secret(scope, `${id}`, {
       ...props,
-      secretName: `${props.secretName}-${scope.props.stage}`,
+      secretName: scope.resourceNameFormatter(props.secretName, props.resourceNameOptions),
     })
 
     createCfnOutput(`${id}-secretName`, scope, secret.secretName)

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

@@ -0,0 +1,6 @@
+import { SecretProps } from 'aws-cdk-lib/aws-secretsmanager'
+import { ResourceNameFormatterProps } from '../../common'
+
+export interface SecretBaseProps extends SecretProps {
+  resourceNameOptions?: ResourceNameFormatterProps
+}