@gradientedge/cdk-utils 9.8.0 → 9.10.0

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

@@ -1,7 +1,9 @@
 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

@@ -50,11 +50,13 @@ class ElastiCacheManager {
     createElastiCache(id, scope, props, subnetIds, securityGroupIds, logDeliveryConfigurations) {
         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 aws_elasticache_1.CfnCacheCluster(scope, `${id}`, {
             ...props,
             cacheSubnetGroupName: subnetGroup.cacheSubnetGroupName,
-            clusterName: `${id}-${scope.props.stage}`,
+            clusterName: scope.resourceNameFormatter(props.clusterName, props.resourceNameOptions),
             logDeliveryConfigurations,
             vpcSecurityGroupIds: securityGroupIds,
         });

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

@@ -1,7 +1,9 @@
 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

@@ -37,9 +37,11 @@ class EventManager {
     createEventBus(id, scope, props) {
         if (!props)
             throw `EventBus props undefined for ${id}`;
+        if (!props.eventBusName)
+            throw `EventBus eventBusName undefined for ${id}`;
         const eventBus = new aws_events_1.EventBus(scope, `${id}`, {
             ...props,
-            eventBusName: `${props.eventBusName}-${scope.props.stage}`,
+            eventBusName: scope.resourceNameFormatter(props.eventBusName, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-eventBusName`, scope, `${props.eventBusName}-${scope.props.stage}`);
         (0, utils_1.createCfnOutput)(`${id}-eventBusArn`, scope, eventBus.eventBusArn);
@@ -56,10 +58,12 @@ class EventManager {
     createRule(id, scope, props, eventBus, targets) {
         if (!props)
             throw `EventRule props undefined for ${id}`;
+        if (!props.ruleName)
+            throw `EventRule ruleName undefined for ${id}`;
         const rule = new aws_events_1.Rule(scope, `${id}`, {
             ...props,
             eventBus,
-            ruleName: `${props.ruleName}-${scope.props.stage}`,
+            ruleName: scope.resourceNameFormatter(props.ruleName, props.resourceNameOptions),
         });
         if (targets && !lodash_1.default.isEmpty(targets)) {
             lodash_1.default.forEach(targets, target => {
@@ -88,21 +92,28 @@ class EventManager {
     createLambdaRule(id, scope, props, lambdaFunction, eventBusName, eventPattern, scheduleExpression) {
         if (!props)
             throw `EventRule props undefined for ${id}`;
+        if (!props.name)
+            throw `EventRule name undefined for ${id}`;
         const eventRule = new aws_events_1.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 && !lodash_1.default.isEmpty(props.tags)) {
+            lodash_1.default.forEach(props.tags, tag => {
+                aws_cdk_lib_1.Tags.of(eventRule).add(tag.key, tag.value);
+            });
+        }
         new aws_lambda_1.CfnPermission(scope, `${id}LambdaPermission`, {
             action: 'lambda:InvokeFunction',
             functionName: lambdaFunction.functionName,
@@ -127,11 +138,13 @@ class EventManager {
     createFargateTaskRule(id, scope, props, cluster, task, subnetIds, role, eventPattern) {
         if (!props)
             throw `EventRule props undefined for ${id}`;
+        if (!props.name)
+            throw `EventRule name undefined for ${id}`;
         const eventRule = new aws_events_1.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,
@@ -143,7 +156,7 @@ class EventManager {
                         taskCount: 1,
                         taskDefinitionArn: task.taskDefinitionArn,
                     },
-                    id: `${id}-${scope.props.stage}`,
+                    id: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
                     roleArn: role instanceof aws_iam_1.Role ? role.roleArn : role.attrArn,
                 },
             ],
@@ -161,10 +174,14 @@ class EventManager {
      * @param targetStepFunction the target step function
      */
     createSqsToSfnCfnPipe(id, scope, props, sourceQueue, targetStepFunction) {
+        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, sourceQueue.queueArn, targetStepFunction.stateMachineArn);
         const pipe = new aws_pipes_1.CfnPipe(scope, `${id}`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
             roleArn: pipeRole.roleArn,
             source: sourceQueue.queueArn,
             sourceParameters: {
@@ -203,10 +220,14 @@ class EventManager {
      * @param targetLambdaFunction the target lambda function
      */
     createSqsToLambdaCfnPipe(id, scope, props, sourceQueue, targetLambdaFunction) {
+        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, sourceQueue.queueArn, targetLambdaFunction.functionArn);
         const pipe = new aws_pipes_1.CfnPipe(scope, `${id}`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
             roleArn: pipeRole.roleArn,
             source: sourceQueue.queueArn,
             sourceParameters: {
@@ -242,10 +263,14 @@ class EventManager {
      * @param targetLambdaFunction the target lambda function
      */
     createDynamoDbToLambdaCfnPipe(id, scope, props, sourceDynamoDbStreamArn, targetLambdaFunction) {
+        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, sourceDynamoDbStreamArn, targetLambdaFunction.functionArn);
         const pipe = new aws_pipes_1.CfnPipe(scope, `${id}`, {
             ...props,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
             roleArn: pipeRole.roleArn,
             source: sourceDynamoDbStreamArn,
             sourceParameters: {

package/dist/src/lib/aws/services/eventbridge/types.d.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';
 /**
  */
@@ -9,6 +10,7 @@ export interface SqsToSfnPipeProps extends CfnPipeProps {
     sfnInvocationType?: string;
     sqsBatchSize?: number;
     sqsMaximumBatchingWindowInSeconds?: number;
+    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
@@ -17,20 +19,25 @@ 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;
 }
 /**
  }
@@ -39,4 +46,5 @@ export interface DynamoDbToLambdaPipeProps extends CfnPipeProps {
     pipeFilterPattern?: any;
     dynamoDbBatchSize?: number;
     dynamoDbStartingPosition: string;
+    resourceNameOptions?: ResourceNameFormatterProps;
 }

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

@@ -27,10 +27,14 @@ class EvidentlyManager {
      * @param props the project properties
      */
     createProject(id, scope, props) {
+        if (!props)
+            throw `EvidentlyProject props undefined for ${id}`;
+        if (!props.name)
+            throw `EvidentlyProject name undefined for ${id}`;
         const project = new aws_evidently_1.CfnProject(scope, `${id}`, {
             ...props,
             description: `${props.description} ${scope.props.stage}`,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-projectArn`, scope, project.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-projectName`, scope, project.name);
@@ -43,6 +47,8 @@ class EvidentlyManager {
      * @param props the feature properties
      */
     createFeature(id, scope, props) {
+        if (!props)
+            throw `EvidentlyFeature props undefined for ${id}`;
         const feature = new aws_evidently_1.CfnFeature(scope, `${id}`, props);
         (0, utils_1.createCfnOutput)(`${id}-featureArn`, scope, feature.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-featureName`, scope, feature.name);
@@ -55,10 +61,14 @@ class EvidentlyManager {
      * @param props the launch properties
      */
     createLaunch(id, scope, props) {
+        if (!props)
+            throw `EvidentlyLaunch props undefined for ${id}`;
+        if (!props.name)
+            throw `EvidentlyLaunch name undefined for ${id}`;
         const launch = new aws_evidently_1.CfnLaunch(scope, `${id}`, {
             ...props,
             description: `${props.description} ${scope.props.stage}`,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-launchArn`, scope, launch.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-launchName`, scope, launch.name);
@@ -71,10 +81,14 @@ class EvidentlyManager {
      * @param props the experiment properties
      */
     createExperiment(id, scope, props) {
+        if (!props)
+            throw `EvidentlyExperiment props undefined for ${id}`;
+        if (!props.name)
+            throw `EvidentlyExperiment name undefined for ${id}`;
         const experiment = new aws_evidently_1.CfnExperiment(scope, `${id}`, {
             ...props,
             description: `${props.description} ${scope.props.stage}`,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-experimentArn`, scope, experiment.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-experimentName`, scope, experiment.name);
@@ -87,10 +101,14 @@ class EvidentlyManager {
      * @param props the segment properties
      */
     createSegment(id, scope, props) {
+        if (!props)
+            throw `EvidentlySegment props undefined for ${id}`;
+        if (!props.name)
+            throw `EvidentlySegment name undefined for ${id}`;
         const segment = new aws_evidently_1.CfnSegment(scope, `${id}`, {
             ...props,
             description: `${props.description} ${scope.props.stage}`,
-            name: `${props.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-segmentArn`, scope, segment.attrArn);
         (0, utils_1.createCfnOutput)(`${id}-segmentName`, scope, segment.name);

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

@@ -1,7 +1,9 @@
 import { CfnExperimentProps, CfnFeatureProps, CfnLaunchProps, CfnProjectProps, CfnSegmentProps } from 'aws-cdk-lib/aws-evidently';
+import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface EvidentlyProjectProps extends CfnProjectProps {
+    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
@@ -10,12 +12,15 @@ export interface EvidentlyFeatureProps extends CfnFeatureProps {
 /**
  */
 export interface EvidentlyLaunchProps extends CfnLaunchProps {
+    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
 export interface EvidentlyExperimentProps extends CfnExperimentProps {
+    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
 export interface EvidentlySegmentProps extends CfnSegmentProps {
+    resourceNameOptions?: ResourceNameFormatterProps;
 }

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

@@ -416,10 +416,10 @@ 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),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.attrArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -440,7 +440,7 @@ class IamManager {
             assumedBy: new aws_iam_1.ServicePrincipal('events.amazonaws.com'),
             description: `Role for ${id} ECS Task execution from EventBridge`,
             inlinePolicies: { policy },
-            roleName: `${id}-${scope.props.stage}`,
+            roleName: scope.resourceNameFormatter(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -460,7 +460,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AmazonECSTaskExecutionRolePolicy`, 'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'),
             ],
-            roleName: `${id}-${scope.props.stage}`,
+            roleName: scope.resourceNameFormatter(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -481,7 +481,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AWSLambdaBasicExecutionRole`, 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'),
             ],
-            roleName: `${id}-${scope.props.stage}`,
+            roleName: scope.resourceNameFormatter(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -499,7 +499,7 @@ class IamManager {
             assumedBy: servicePrincipal ?? new aws_iam_1.ServicePrincipal('appconfig.amazonaws.com'),
             description: `Role for ${id} AppConfig Secrets`,
             inlinePolicies: { policy },
-            roleName: `${id}-${scope.props.stage}`,
+            roleName: scope.resourceNameFormatter(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -520,7 +520,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AWSLambdaBasicExecutionRole`, 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'),
             ],
-            roleName: `${id}-${scope.props.stage}`,
+            roleName: scope.resourceNameFormatter(id),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -537,7 +537,7 @@ class IamManager {
         const role = new aws_iam_1.Role(scope, `${id}`, {
             assumedBy: new aws_iam_1.ServicePrincipal('pipes.amazonaws.com'),
             description: `Role for ${id} Pipe`,
-            roleName: `${id}-${scope.props.stage}`,
+            roleName: scope.resourceNameFormatter(id),
         });
         role.addToPolicy(this.statementForPollQueue([queueArn]));
         role.addToPolicy(this.statementForStartExecution([stepFunctionArn]));
@@ -556,7 +556,7 @@ class IamManager {
         const role = new aws_iam_1.Role(scope, `${id}`, {
             assumedBy: new aws_iam_1.ServicePrincipal('pipes.amazonaws.com'),
             description: `Role for ${id} Pipe`,
-            roleName: `${id}-${scope.props.stage}`,
+            roleName: scope.resourceNameFormatter(id),
         });
         role.addToPolicy(this.statementForPollQueue([queueArn]));
         role.addToPolicy(this.statementForInvokeLambda([lambdaArn]));
@@ -600,7 +600,7 @@ class IamManager {
         const role = new aws_iam_1.Role(scope, `${id}`, {
             assumedBy: new aws_iam_1.ServicePrincipal('pipes.amazonaws.com'),
             description: `Role for ${id} Pipe`,
-            roleName: `${id}-${scope.props.stage}`,
+            roleName: scope.resourceNameFormatter(id),
         });
         role.addToPolicy(this.statementFordynamoDbStream([dynamoDbStreamArn]));
         role.addToPolicy(this.statementForInvokeLambda([lambdaFunctionArn]));

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

@@ -74,7 +74,9 @@ class LambdaManager {
     createLambdaFunction(id, scope, props, role, layers, code, handler, environment, vpc, securityGroups, accessPoint, mountPath, vpcSubnets) {
         if (!props)
             throw `Lambda props undefined for ${id}`;
-        const functionName = `${props.functionName}-${scope.props.stage}`;
+        if (!props.functionName)
+            throw `Lambda functionName undefined for ${id}`;
+        const functionName = scope.resourceNameFormatter(props.functionName, props.resourceNameOptions);
         let deadLetterQueue;
         if (props.deadLetterQueueEnabled) {
             const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);
@@ -177,7 +179,9 @@ class LambdaManager {
     createLambdaDockerFunction(id, scope, props, role, code, environment, vpc, securityGroups, accessPoint, mountPath, vpcSubnets) {
         if (!props)
             throw `Lambda props undefined for ${id}`;
-        const functionName = `${props.functionName}-${scope.props.stage}`;
+        if (!props.functionName)
+            throw `Lambda functionName undefined for ${id}`;
+        const functionName = scope.resourceNameFormatter(props.functionName, props.resourceNameOptions);
         let deadLetterQueue;
         if (props.deadLetterQueueEnabled) {
             const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);

package/dist/src/lib/aws/services/lambda/types.d.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';
 /**
  */
 export interface ProvisionedConcurrencyProps {
@@ -20,6 +21,7 @@ export interface LambdaProps extends FunctionProps {
     redriveq?: QueueProps;
     tags?: TagProps[];
     timeoutInSecs?: number;
+    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
@@ -32,6 +34,7 @@ export interface LambdaAliasProps extends AliasProps {
 export interface LambdaEdgeProps extends EdgeFunctionProps {
     tags?: TagProps[];
     timeoutInSecs?: number;
+    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */

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

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

package/dist/src/lib/aws/services/secrets-manager/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./main"), exports);
+__exportStar(require("./types"), exports);

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

@@ -1,5 +1,6 @@
-import { Secret, SecretProps } from 'aws-cdk-lib/aws-secretsmanager';
+import { Secret } from 'aws-cdk-lib/aws-secretsmanager';
 import { CommonConstruct } from '../../common';
+import { SecretBaseProps } from './types';
 /**
  * @classdesc Provides operations on AWS Secrets Manager.
  * - A new instance of this class is injected into {@link CommonConstruct} constructor.
@@ -23,7 +24,7 @@ export declare class SecretsManager {
      * @param scope scope in which this resource is defined
      * @param props the secret properties
      */
-    createSecret(id: string, scope: CommonConstruct, props: SecretProps): Secret;
+    createSecret(id: string, scope: CommonConstruct, props: SecretBaseProps): Secret;
     /**
      * @summary Method to retrieve a secret from secrets manager with a cloudformation export
      * @param id

package/dist/src/lib/aws/services/secrets-manager/main.js

@@ -29,9 +29,13 @@ class SecretsManager {
      * @param props the secret properties
      */
     createSecret(id, scope, props) {
+        if (!props)
+            throw `Secret props undefined for ${id}`;
+        if (!props.secretName)
+            throw `Secret name undefined for ${id}`;
         const secret = new aws_secretsmanager_1.Secret(scope, `${id}`, {
             ...props,
-            secretName: `${props.secretName}-${scope.props.stage}`,
+            secretName: scope.resourceNameFormatter(props.secretName, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-secretName`, scope, secret.secretName);
         (0, utils_1.createCfnOutput)(`${id}-secretArn`, scope, secret.secretArn);

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

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

package/dist/src/lib/aws/services/secrets-manager/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -35,10 +35,12 @@ class SnsManager {
     createEmailNotificationService(id, scope, props, emails) {
         if (!props)
             throw `Subscription props undefined for ${id}`;
+        if (!props.topicName)
+            throw `Subscription topicName undefined for ${id}`;
         const topic = new aws_sns_1.Topic(scope, id, {
             ...props,
-            displayName: `${props.topicName}-${scope.props.stage}`,
-            topicName: `${props.topicName}-${scope.props.stage}`,
+            displayName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
+            topicName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
         });
         if (emails && !lodash_1.default.isEmpty(emails)) {
             lodash_1.default.forEach(emails, (email) => topic.addSubscription(new aws_sns_subscriptions_1.EmailSubscription(email)));
@@ -57,10 +59,12 @@ class SnsManager {
     createLambdaNotificationService(id, scope, props, lambdaFunction) {
         if (!props)
             throw `Subscription props undefined for ${id}`;
+        if (!props.topicName)
+            throw `Subscription topicName undefined for ${id}`;
         const topic = new aws_sns_1.Topic(scope, id, {
             ...props,
-            displayName: `${props.topicName}-${scope.props.stage}`,
-            topicName: `${props.topicName}-${scope.props.stage}`,
+            displayName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
+            topicName: scope.resourceNameFormatter(props.topicName, props.resourceNameOptions),
         });
         topic.addSubscription(new aws_sns_subscriptions_1.LambdaSubscription(lambdaFunction));
         (0, utils_1.createCfnOutput)(`${id}-subscriptionArn`, scope, topic.topicArn);

package/dist/src/lib/aws/services/simple-notification-service/types.d.ts

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

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

@@ -35,6 +35,11 @@ class SqsManager {
     createQueue(id, scope, props, deadLetterQueue) {
         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);
+        if (props.fifo)
+            queueName += '.fifo';
         const queue = new aws_sqs_1.Queue(scope, id, {
             ...props,
             dataKeyReuse: props.dataKeyReuseInSecs ? aws_cdk_lib_1.Duration.seconds(props.dataKeyReuseInSecs) : props.dataKeyReuse,
@@ -45,6 +50,7 @@ class SqsManager {
                     queue: deadLetterQueue,
                 },
             deliveryDelay: props.deliveryDelayInSecs ? aws_cdk_lib_1.Duration.seconds(props.deliveryDelayInSecs) : undefined,
+            queueName,
             receiveMessageWaitTime: props.receiveMessageWaitTimeInSecs
                 ? aws_cdk_lib_1.Duration.seconds(props.receiveMessageWaitTimeInSecs)
                 : props.receiveMessageWaitTime,
@@ -73,9 +79,7 @@ class SqsManager {
     createRedriveQueueForLambda(id, scope, props) {
         return this.createQueue(`${id}`, scope, {
             ...props.redriveq,
-            queueName: props.redriveq?.fifo
-                ? `${props.functionName}-redriveq-${scope.props.stage}.fifo`
-                : `${props.functionName}-redriveq-${scope.props.stage}`,
+            queueName: `${props.functionName}-redriveq`,
         });
     }
     /**
@@ -90,14 +94,12 @@ class SqsManager {
         if (props.dlq) {
             queueProps = {
                 ...props.dlq,
-                queueName: props.dlq.fifo
-                    ? `${props.functionName}-dlq-${scope.props.stage}.fifo`
-                    : `${props.functionName}-dlq-${scope.props.stage}`,
+                queueName: `${props.functionName}-dlq`,
             };
         }
         else {
             queueProps = {
-                queueName: `${props.functionName}-dlq-${scope.props.stage}`,
+                queueName: `${props.functionName}-dlq`,
             };
         }
         return this.createQueue(`${id}`, scope, queueProps, deadLetterQueue);

package/dist/src/lib/aws/services/simple-queue-service/types.d.ts

@@ -1,4 +1,5 @@
 import * as sqs from 'aws-cdk-lib/aws-sqs';
+import { ResourceNameFormatterProps } from '../../common';
 import { TagProps } from '../../types';
 /**
  */
@@ -12,4 +13,5 @@ export interface QueueProps extends sqs.QueueProps {
     retryBatchSize?: number;
     tags?: TagProps[];
     visibilityTimeoutInSecs?: number;
+    resourceNameOptions?: ResourceNameFormatterProps;
 }

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

@@ -42,7 +42,7 @@ export declare class S3Manager {
      * @param scope scope in which this resource is defined
      * @param bucketName the bucket name
      */
-    static determineBucketName(scope: CommonConstruct, bucketName: string): string;
+    static determineBucketName(scope: CommonConstruct, props: S3BucketProps, bucketName: string): string;
     /**
      * @summary Method to create a s3 bucket
      * @param id scoped id of the resource

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

@@ -69,10 +69,14 @@ class S3Manager {
      * @param scope scope in which this resource is defined
      * @param bucketName the bucket name
      */
-    static determineBucketName(scope, bucketName) {
-        return scope.props.excludeDomainNameForBuckets
-            ? S3Manager.determineBucketNameByAccountAndRegion(scope, bucketName)
-            : S3Manager.determineBucketNameByDomainName(scope, bucketName);
+    static determineBucketName(scope, props, bucketName) {
+        if (!scope.props.excludeDomainNameForBuckets) {
+            return S3Manager.determineBucketNameByDomainName(scope, bucketName);
+        }
+        if (!scope.props.excludeAccountNumberForBuckets) {
+            return S3Manager.determineBucketNameByAccountAndRegion(scope, bucketName);
+        }
+        return scope.resourceNameFormatter(bucketName, props.resourceNameOptions);
     }
     /**
      * @summary Method to create a s3 bucket
@@ -84,15 +88,15 @@ class S3Manager {
         if (!props)
             throw `S3 props undefined for ${id}`;
         let bucket;
-        const bucketName = S3Manager.determineBucketName(scope, props.bucketName);
+        const bucketName = S3Manager.determineBucketName(scope, props, props.bucketName);
         if (props.existingBucket && props.bucketName) {
-            bucket = aws_s3_1.Bucket.fromBucketName(scope, `${id}`, bucketName);
+            bucket = aws_s3_1.Bucket.fromBucketName(scope, `${id}`, S3Manager.determineBucketName(scope, props, props.bucketName));
         }
         else {
             let logBucket;
             if (props.logBucketName) {
-                const logBucketName = S3Manager.determineBucketName(scope, props.logBucketName);
-                logBucket = aws_s3_1.Bucket.fromBucketName(scope, `${id}-logs`, logBucketName);
+                const logBucketName = S3Manager.determineBucketName(scope, props, props.logBucketName);
+                logBucket = aws_s3_1.Bucket.fromBucketName(scope, `${id}-logs`, props.logBucketName);
             }
             bucket = new aws_s3_1.Bucket(scope, `${id}-bucket`, {
                 ...props,