@gradientedge/cdk-utils 9.13.0 → 9.14.0

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

@@ -115,17 +115,6 @@ export declare class IamManager {
      * @param resourceArns list of ARNs to allow access to
      */
     statementForWriteEfs(resourceArns?: string[]): PolicyStatement;
-    /**
-     * @summary Method to create iam policy to invalidate cloudfront cache
-     * @param resourceArns list of ARNs to allow access to
-     */
-    policyForCloudfrontInvalidation(resourceArns?: string[]): PolicyDocument;
-    /**
-     * @summary Method to create iam role to invalidate cloudfront cache
-     * @param id scoped id of the resource
-     * @param scope scope in which this resource is defined
-     */
-    roleForCloudfrontInvalidation(id: string, scope: CommonConstruct): Role;
     /**
      * @summary Method to create iam statement to assume iam role
      * @param scope scope in which this resource is defined
@@ -181,6 +170,26 @@ export declare class IamManager {
      * @param resourceArns list of ARNs to allow access to
      */
     statementFordynamoDbStream(resourceArns?: string[]): PolicyStatement;
+    /**
+     * @summary Method to create iam policy to invalidate cloudfront cache
+     * @param resourceArns list of ARNs to allow access to
+     */
+    createPolicyForCloudfrontInvalidation(resourceArns?: string[]): PolicyDocument;
+    /**
+     * @summary Method to create iam policy for sqs
+     * @param id scoped id of the resource
+     * @param scope scope in which this resource is defined
+     * @param sqsQueue
+     * @param eventBridgeRule
+     * @param servicePrincipals
+     */
+    createPolicyForSqsEvent(id: string, scope: CommonConstruct, sqsQueue: Queue, eventBridgeRule: IRule, servicePrincipals?: ServicePrincipal[]): PolicyDocument;
+    /**
+     * @summary Method to create iam role to invalidate cloudfront cache
+     * @param id scoped id of the resource
+     * @param scope scope in which this resource is defined
+     */
+    createRoleForCloudfrontInvalidation(id: string, scope: CommonConstruct): Role;
     /**
      * @summary Method to create iam statement for cloud trail
      * @param id scoped id of the resource
@@ -243,15 +252,6 @@ export declare class IamManager {
      * @param lambdaArn the arn of the lambda function
      */
     createRoleForSqsToLambdaPipe(id: string, scope: CommonConstruct, queueArn: string, lambdaArn: string): Role;
-    /**
-     * @summary Method to create iam policy for sqs
-     * @param id scoped id of the resource
-     * @param scope scope in which this resource is defined
-     * @param sqsQueue
-     * @param eventBridgeRule
-     * @param servicePrincipals
-     */
-    createPolicyForSqsEvent(id: string, scope: CommonConstruct, sqsQueue: Queue, eventBridgeRule: IRule, servicePrincipals?: ServicePrincipal[]): PolicyDocument;
     /**
      * @summary Method to create iam statement for dynamoDb to lambda function pipe
      * @param id scoped id of the resource

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

@@ -231,42 +231,6 @@ class IamManager {
             resources: resourceArns ?? ['*'],
         });
     }
-    /**
-     * @summary Method to create iam policy to invalidate cloudfront cache
-     * @param resourceArns list of ARNs to allow access to
-     */
-    policyForCloudfrontInvalidation(resourceArns) {
-        return new aws_iam_1.PolicyDocument({
-            statements: [
-                this.statementForCreateAnyLogStream(),
-                this.statementForPutAnyLogEvent(),
-                this.statementForCloudfrontInvalidation(),
-                new aws_iam_1.PolicyStatement({
-                    actions: [
-                        'ecr:GetDownloadUrlForLayer',
-                        'ecr:BatchGetImage',
-                        'ecr:BatchCheckLayerAvailability',
-                        'ecr:GetAuthorizationToken',
-                    ],
-                    effect: aws_iam_1.Effect.ALLOW,
-                    resources: resourceArns ?? ['*'],
-                }),
-            ],
-        });
-    }
-    /**
-     * @summary Method to create iam role to invalidate cloudfront cache
-     * @param id scoped id of the resource
-     * @param scope scope in which this resource is defined
-     */
-    roleForCloudfrontInvalidation(id, scope) {
-        return new aws_iam_1.Role(scope, `${id}-install-deps-project-role`, {
-            assumedBy: new aws_iam_1.ServicePrincipal('codebuild.amazonaws.com'),
-            inlinePolicies: {
-                codeBuildPolicy: this.policyForCloudfrontInvalidation(),
-            },
-        });
-    }
     /**
      * @summary Method to create iam statement to assume iam role
      * @param scope scope in which this resource is defined
@@ -399,6 +363,68 @@ class IamManager {
             resources: resourceArns ?? ['*'],
         });
     }
+    /**
+     * @summary Method to create iam policy to invalidate cloudfront cache
+     * @param resourceArns list of ARNs to allow access to
+     */
+    createPolicyForCloudfrontInvalidation(resourceArns) {
+        return new aws_iam_1.PolicyDocument({
+            statements: [
+                this.statementForCreateAnyLogStream(),
+                this.statementForPutAnyLogEvent(),
+                this.statementForCloudfrontInvalidation(),
+                new aws_iam_1.PolicyStatement({
+                    actions: [
+                        'ecr:GetDownloadUrlForLayer',
+                        'ecr:BatchGetImage',
+                        'ecr:BatchCheckLayerAvailability',
+                        'ecr:GetAuthorizationToken',
+                    ],
+                    effect: aws_iam_1.Effect.ALLOW,
+                    resources: resourceArns ?? ['*'],
+                }),
+            ],
+        });
+    }
+    /**
+     * @summary Method to create iam policy for sqs
+     * @param id scoped id of the resource
+     * @param scope scope in which this resource is defined
+     * @param sqsQueue
+     * @param eventBridgeRule
+     * @param servicePrincipals
+     */
+    createPolicyForSqsEvent(id, scope, sqsQueue, eventBridgeRule, servicePrincipals) {
+        return new aws_iam_1.PolicyDocument({
+            statements: [
+                new aws_iam_1.PolicyStatement({
+                    actions: ['sqs:*'],
+                    conditions: {
+                        ArnEquals: {
+                            'aws:SourceArn': eventBridgeRule,
+                        },
+                    },
+                    effect: aws_iam_1.Effect.ALLOW,
+                    principals: servicePrincipals ?? [new aws_iam_1.ServicePrincipal('events.amazonaws.com')],
+                    resources: [sqsQueue.queueArn],
+                }),
+            ],
+        });
+    }
+    /**
+     * @summary Method to create iam role to invalidate cloudfront cache
+     * @param id scoped id of the resource
+     * @param scope scope in which this resource is defined
+     */
+    createRoleForCloudfrontInvalidation(id, scope) {
+        return new aws_iam_1.Role(scope, `${id}-install-deps-project-role`, {
+            assumedBy: new aws_iam_1.ServicePrincipal('codebuild.amazonaws.com'),
+            inlinePolicies: {
+                codeBuildPolicy: this.createPolicyForCloudfrontInvalidation(),
+            },
+            roleName: scope.resourceNameFormatter.format(`${id}-cf-invalidation`, scope.props.resourceNameOptions?.iam),
+        });
+    }
     /**
      * @summary Method to create iam statement for cloud trail
      * @param id scoped id of the resource
@@ -419,7 +445,7 @@ class IamManager {
                     policyName: scope.resourceNameFormatter.format(`${id}-policy`),
                 },
             ],
-            roleName: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-trail`, scope.props.resourceNameOptions?.iam),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.attrArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -440,7 +466,7 @@ class IamManager {
             assumedBy: new aws_iam_1.ServicePrincipal('events.amazonaws.com'),
             description: `Role for ${id} ECS Task execution from EventBridge`,
             inlinePolicies: { policy },
-            roleName: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-ecs-event`, scope.props.resourceNameOptions?.iam),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -460,7 +486,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AmazonECSTaskExecutionRolePolicy`, 'arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy'),
             ],
-            roleName: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-ecs-exec`, scope.props.resourceNameOptions?.iam),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -481,7 +507,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AWSLambdaBasicExecutionRole`, 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'),
             ],
-            roleName: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-lambda`, scope.props.resourceNameOptions?.iam),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -499,7 +525,7 @@ class IamManager {
             assumedBy: servicePrincipal ?? new aws_iam_1.ServicePrincipal('appconfig.amazonaws.com'),
             description: `Role for ${id} AppConfig Secrets`,
             inlinePolicies: { policy },
-            roleName: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-app-secrets`, scope.props.resourceNameOptions?.iam),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -520,7 +546,7 @@ class IamManager {
             managedPolicies: [
                 aws_iam_1.ManagedPolicy.fromManagedPolicyArn(scope, `${id}-AWSLambdaBasicExecutionRole`, 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'),
             ],
-            roleName: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-sfn-exec`, scope.props.resourceNameOptions?.iam),
         });
         (0, utils_1.createCfnOutput)(`${id}Arn`, scope, role.roleArn);
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
@@ -537,7 +563,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: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-pipe`, scope.props.resourceNameOptions?.iam),
         });
         role.addToPolicy(this.statementForPollQueue([queueArn]));
         role.addToPolicy(this.statementForStartExecution([stepFunctionArn]));
@@ -556,7 +582,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: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-pipe`, scope.props.resourceNameOptions?.iam),
         });
         role.addToPolicy(this.statementForPollQueue([queueArn]));
         role.addToPolicy(this.statementForInvokeLambda([lambdaArn]));
@@ -564,31 +590,6 @@ class IamManager {
         (0, utils_1.createCfnOutput)(`${id}Name`, scope, role.roleName);
         return role;
     }
-    /**
-     * @summary Method to create iam policy for sqs
-     * @param id scoped id of the resource
-     * @param scope scope in which this resource is defined
-     * @param sqsQueue
-     * @param eventBridgeRule
-     * @param servicePrincipals
-     */
-    createPolicyForSqsEvent(id, scope, sqsQueue, eventBridgeRule, servicePrincipals) {
-        return new aws_iam_1.PolicyDocument({
-            statements: [
-                new aws_iam_1.PolicyStatement({
-                    actions: ['sqs:*'],
-                    conditions: {
-                        ArnEquals: {
-                            'aws:SourceArn': eventBridgeRule,
-                        },
-                    },
-                    effect: aws_iam_1.Effect.ALLOW,
-                    principals: servicePrincipals ?? [new aws_iam_1.ServicePrincipal('events.amazonaws.com')],
-                    resources: [sqsQueue.queueArn],
-                }),
-            ],
-        });
-    }
     /**
      * @summary Method to create iam statement for dynamoDb to lambda function pipe
      * @param id scoped id of the resource
@@ -600,7 +601,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: scope.resourceNameFormatter.format(id),
+            roleName: scope.resourceNameFormatter.format(`${id}-pipe`, scope.props.resourceNameOptions?.iam),
         });
         role.addToPolicy(this.statementFordynamoDbStream([dynamoDbStreamArn]));
         role.addToPolicy(this.statementForInvokeLambda([lambdaFunctionArn]));

package/dist/src/lib/aws/services/key-management-service/main.js

@@ -33,7 +33,7 @@ class KmsManager {
             throw `KMS Key alias undefined for ${id}`;
         const key = new aws_kms_1.Key(scope, `${id}`, {
             ...props,
-            alias: scope.resourceNameFormatter.format(props.alias, props.resourceNameOptions),
+            alias: scope.resourceNameFormatter.format(props.alias, scope.props.resourceNameOptions?.kms),
         });
         (0, utils_1.createCfnOutput)(`${id}-keyId`, scope, key.keyId);
         (0, utils_1.createCfnOutput)(`${id}-keyArn`, scope, key.keyArn);

package/dist/src/lib/aws/services/key-management-service/types.d.ts

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

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

@@ -8,7 +8,6 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_iam_1 = require("aws-cdk-lib/aws-iam");
 const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
 const aws_lambda_event_sources_1 = require("aws-cdk-lib/aws-lambda-event-sources");
-const aws_logs_1 = require("aws-cdk-lib/aws-logs");
 const lodash_1 = __importDefault(require("lodash"));
 const common_1 = require("../../common");
 const utils_1 = require("../../utils");
@@ -44,7 +43,7 @@ class LambdaManager {
             compatibleArchitectures: architectures ?? [aws_lambda_1.Architecture.ARM_64],
             compatibleRuntimes: [scope.props.nodejsRuntime ?? common_1.CommonStack.NODEJS_RUNTIME],
             description: `${id}`,
-            layerVersionName: `${id}-${scope.props.stage}`,
+            layerVersionName: scope.resourceNameFormatter.format(id, scope.props.resourceNameOptions?.lambdaLayer),
         });
         (0, utils_1.createCfnOutput)(`${id}-lambdaLayerArn`, scope, lambdaLayer.layerVersionArn);
         return lambdaLayer;
@@ -76,7 +75,7 @@ class LambdaManager {
             throw `Lambda props undefined for ${id}`;
         if (!props.functionName)
             throw `Lambda functionName undefined for ${id}`;
-        const functionName = scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions);
+        const functionName = scope.resourceNameFormatter.format(props.functionName, scope.props.resourceNameOptions?.lambdaFunction);
         let deadLetterQueue;
         if (props.deadLetterQueueEnabled) {
             const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);
@@ -102,8 +101,8 @@ class LambdaManager {
             functionName,
             handler: handler || 'index.lambda_handler',
             layers,
-            logGroup: new aws_logs_1.LogGroup(scope, `${id}-log-group`, {
-                logGroupName: `/aws/lambda/${functionName}`,
+            logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
+                logGroupName: props.functionName,
                 removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
                 retention: scope.props.logRetention ?? logRetention,
             }),
@@ -181,7 +180,7 @@ class LambdaManager {
             throw `Lambda props undefined for ${id}`;
         if (!props.functionName)
             throw `Lambda functionName undefined for ${id}`;
-        const functionName = scope.resourceNameFormatter.format(props.functionName, props.resourceNameOptions);
+        const functionName = scope.resourceNameFormatter.format(props.functionName, scope.props.resourceNameOptions?.lambdaFunction);
         let deadLetterQueue;
         if (props.deadLetterQueueEnabled) {
             const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);
@@ -205,8 +204,8 @@ class LambdaManager {
             },
             filesystem: accessPoint ? aws_lambda_1.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
             functionName,
-            logGroup: new aws_logs_1.LogGroup(scope, `${id}-log-group`, {
-                logGroupName: `/aws/lambda/${functionName}`,
+            logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
+                logGroupName: props.functionName,
                 removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
                 retention: scope.props.logRetention ?? logRetention,
             }),

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

@@ -1,7 +1,6 @@
 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 { QueueProps } from '../simple-queue-service';
 /**
@@ -21,7 +20,6 @@ export interface LambdaProps extends FunctionProps {
     redriveq?: QueueProps;
     tags?: TagProps[];
     timeoutInSecs?: number;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */
@@ -34,7 +32,6 @@ export interface LambdaAliasProps extends AliasProps {
 export interface LambdaEdgeProps extends EdgeFunctionProps {
     tags?: TagProps[];
     timeoutInSecs?: number;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */

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

@@ -35,7 +35,7 @@ class SecretsManager {
             throw `Secret name undefined for ${id}`;
         const secret = new aws_secretsmanager_1.Secret(scope, `${id}`, {
             ...props,
-            secretName: scope.resourceNameFormatter.format(props.secretName, props.resourceNameOptions),
+            secretName: scope.resourceNameFormatter.format(props.secretName, scope.props.resourceNameOptions?.secret),
         });
         (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

@@ -1,5 +1,3 @@
 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/simple-notification-service/main.js

@@ -39,8 +39,8 @@ class SnsManager {
             throw `Subscription topicName undefined for ${id}`;
         const topic = new aws_sns_1.Topic(scope, id, {
             ...props,
-            displayName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
-            topicName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
+            displayName: scope.resourceNameFormatter.format(props.topicName, scope.props.resourceNameOptions?.sns),
+            topicName: scope.resourceNameFormatter.format(props.topicName, scope.props.resourceNameOptions?.sns),
         });
         if (emails && !lodash_1.default.isEmpty(emails)) {
             lodash_1.default.forEach(emails, (email) => topic.addSubscription(new aws_sns_subscriptions_1.EmailSubscription(email)));
@@ -63,8 +63,8 @@ class SnsManager {
             throw `Subscription topicName undefined for ${id}`;
         const topic = new aws_sns_1.Topic(scope, id, {
             ...props,
-            displayName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
-            topicName: scope.resourceNameFormatter.format(props.topicName, props.resourceNameOptions),
+            displayName: scope.resourceNameFormatter.format(props.topicName, scope.props.resourceNameOptions?.sns),
+            topicName: scope.resourceNameFormatter.format(props.topicName, scope.props.resourceNameOptions?.sns),
         });
         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,7 +1,5 @@
 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

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

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

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

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

@@ -76,7 +76,7 @@ class S3Manager {
         if (!scope.props.excludeAccountNumberForBuckets) {
             return S3Manager.determineBucketNameByAccountAndRegion(scope, bucketName);
         }
-        return scope.resourceNameFormatter.format(bucketName, props.resourceNameOptions);
+        return scope.resourceNameFormatter.format(bucketName, scope.props.resourceNameOptions?.s3);
     }
     /**
      * @summary Method to create a s3 bucket

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

@@ -1,6 +1,5 @@
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as s3deploy from 'aws-cdk-lib/aws-s3-deployment';
-import { ResourceNameFormatterProps } from '../../common';
 import { TagProps } from '../../types';
 /**
  */
@@ -22,6 +21,5 @@ export interface S3BucketProps extends s3.BucketProps {
     existingBucket?: boolean;
     lifecycleRules?: LifecycleRule[];
     logBucketName?: string;
-    resourceNameOptions?: ResourceNameFormatterProps;
     tags?: TagProps[];
 }

package/dist/src/lib/aws/services/step-function/main.js

@@ -377,7 +377,7 @@ class SfnManager {
                 level: props.logs?.level ?? aws_stepfunctions_1.LogLevel.ALL,
             },
             role,
-            stateMachineName: scope.resourceNameFormatter.format(props.stateMachineName, props.resourceNameOptions),
+            stateMachineName: scope.resourceNameFormatter.format(props.stateMachineName, scope.props.resourceNameOptions?.stepFunction),
         });
         (0, utils_1.createCfnOutput)(`${id}-stateMachineName`, scope, stateMachine.stateMachineName);
         (0, utils_1.createCfnOutput)(`${id}-stateMachineArn`, scope, stateMachine.stateMachineArn);

package/dist/src/lib/aws/services/step-function/types.d.ts

@@ -1,6 +1,5 @@
 import { ChoiceProps, FailProps, MapProps, ParallelProps, PassProps, RetryProps, StateMachineProps, SucceedProps, WaitProps } from 'aws-cdk-lib/aws-stepfunctions';
 import { CallApiGatewayRestApiEndpointProps, DynamoDeleteItemProps, DynamoGetItemProps, DynamoPutItemProps, LambdaInvokeProps, SqsSendMessageProps, StepFunctionsStartExecutionProps } from 'aws-cdk-lib/aws-stepfunctions-tasks';
-import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface SfnSucceedProps extends SucceedProps {
@@ -77,7 +76,6 @@ export interface SfnCallApiGatewayRestApiEndpointProps extends CallApiGatewayRes
 /**
  */
 export interface SfnStateMachineProps extends StateMachineProps {
-    resourceNameOptions?: ResourceNameFormatterProps;
 }
 /**
  */

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

@@ -36,7 +36,7 @@ class SsmManager {
         const parameter = new aws_ssm_1.StringParameter(scope, `${id}`, {
             ...props,
             description: `${props.description} - ${scope.props.stage} stage`,
-            parameterName: scope.resourceNameFormatter.format(props.parameterName, props.resourceNameOptions),
+            parameterName: scope.resourceNameFormatter.format(props.parameterName, scope.props.resourceNameOptions?.ssm),
         });
         (0, utils_1.createCfnOutput)(`${id}-parameterArn`, scope, parameter.parameterArn);
         (0, utils_1.createCfnOutput)(`${id}-parameterName`, scope, parameter.parameterName);

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

@@ -1,5 +1,4 @@
 import { StringParameterProps } from 'aws-cdk-lib/aws-ssm';
-import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface SSMParameterReaderProps {
@@ -7,5 +6,4 @@ export interface SSMParameterReaderProps {
     region: string;
 }
 export interface SSMStringParameterProps extends StringParameterProps {
-    resourceNameOptions?: ResourceNameFormatterProps;
 }

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

@@ -40,7 +40,7 @@ class VpcManager {
             throw `Vpc props undefined for ${id}`;
         if (!props.vpcName)
             throw `Vpc vpcName undefined for ${id}`;
-        const vpcName = scope.resourceNameFormatter.format(props.vpcName, props.resourceNameOptions);
+        const vpcName = scope.resourceNameFormatter.format(props.vpcName, scope.props.resourceNameOptions?.vpc);
         let vpc;
         if (props.isIPV6) {
             vpc = new ipv6_1.Ipv6Vpc(scope, `${id}`, {
@@ -76,7 +76,7 @@ class VpcManager {
      */
     createCommonVpc(id, scope, props, vpcIdentifier) {
         const vpc = this.createVpc(id, scope, props);
-        aws_cdk_lib_1.Tags.of(vpc).add('Name', scope.resourceNameFormatter.format(vpcIdentifier ?? CommonVpcIdentifier, props.resourceNameOptions));
+        aws_cdk_lib_1.Tags.of(vpc).add('Name', scope.resourceNameFormatter.format(vpcIdentifier ?? CommonVpcIdentifier, scope.props.resourceNameOptions?.vpc));
         return vpc;
     }
     /**

package/dist/src/lib/aws/services/virtual-private-cloud/types.d.ts

@@ -1,6 +1,4 @@
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
-import { ResourceNameFormatterProps } from '../../common';
 export interface VpcProps extends ec2.VpcProps {
     isIPV6?: boolean;
-    resourceNameOptions?: ResourceNameFormatterProps;
 }

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.13.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/stack.ts

@@ -60,6 +60,7 @@ export class CommonStack extends Stack {
       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

@@ -18,6 +18,7 @@ export interface CommonStackProps extends BaseProps, StackProps {
   excludeDomainNameForBuckets?: boolean
   excludeAccountNumberForBuckets?: boolean
   nodejsRuntime?: Runtime
+  resourceNameOptions?: { [key: string]: ResourceNameFormatterProps }
 }
 
 export interface ResourceNameFormatterProps {