@gradientedge/cdk-utils 9.9.0 → 9.10.1

package/dist/src/lib/aws/common/construct.d.ts

@@ -1,7 +1,7 @@
 import { CfnOutput } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import { AcmManager, ApiManager, AppConfigManager, CloudFrontManager, CloudTrailManager, CloudWatchManager, CodeBuildManager, DynamodbManager, EcrManager, EcsManager, EfsManager, EksManager, ElastiCacheManager, EventManager, EventTargetManager, EvidentlyManager, IamManager, KmsManager, LambdaManager, LogManager, Route53Manager, S3Manager, SecretsManager, SfnManager, SnsManager, SqsManager, SsmManager, VpcManager, WafManager } from '../services';
-import { CommonStackProps } from './types';
+import { CommonStackProps, ResourceNameFormatterProps } from './types';
 /**
  * @subcategory Construct
  * @classdesc Common construct to use as a base for all higher level constructs.
@@ -48,6 +48,13 @@ export declare class CommonConstruct extends Construct {
     wafManager: WafManager;
     fullyQualifiedDomainName: string;
     constructor(parent: Construct, id: string, props: CommonStackProps);
+    /**
+     * @summary Helper method to format a resource name based on the provided options
+     * @param resourceName the resource name to format
+     * @param options options to control the formatting of the resource name
+     * @returns The formatted resource name
+     */
+    resourceNameFormatter(resourceName: string, options?: ResourceNameFormatterProps): string;
     /**
      * @summary Helper method to add CloudFormation outputs from the construct
      * @param id scoped id of the resource

package/dist/src/lib/aws/common/construct.js

@@ -84,6 +84,20 @@ class CommonConstruct extends constructs_1.Construct {
         this.wafManager = new services_1.WafManager();
         this.determineFullyQualifiedDomain();
     }
+    /**
+     * @summary Helper method to format a resource name based on the provided options
+     * @param resourceName the resource name to format
+     * @param options options to control the formatting of the resource name
+     * @returns The formatted resource name
+     */
+    resourceNameFormatter(resourceName, options) {
+        const resourceNameElements = [];
+        resourceNameElements.push(options?.prefix ?? this.props.resourcePrefix);
+        resourceNameElements.push(resourceName);
+        resourceNameElements.push(options?.suffix ?? this.props.resourceSuffix);
+        resourceNameElements.push(this.props.stage);
+        return resourceNameElements.filter(resourceNameElement => resourceNameElement != undefined).join('-');
+    }
     /**
      * @summary Helper method to add CloudFormation outputs from the construct
      * @param id scoped id of the resource

package/dist/src/lib/aws/common/stack.d.ts

@@ -27,11 +27,14 @@ export declare class CommonStack extends Stack {
     protected determineConstructProps(props: StackProps): {
         domainName: any;
         excludeDomainNameForBuckets: any;
+        excludeAccountNumberForBuckets: any;
         extraContexts: any;
         logRetention: any;
         name: string;
         nodejsRuntime: any;
         region: any;
+        resourcePrefix: any;
+        resourceSuffix: any;
         skipStageForARecords: any;
         stackName: string | undefined;
         stage: any;

package/dist/src/lib/aws/common/stack.js

@@ -47,11 +47,14 @@ class CommonStack extends aws_cdk_lib_1.Stack {
         return {
             domainName: this.node.tryGetContext('domainName'),
             excludeDomainNameForBuckets: this.node.tryGetContext('excludeDomainNameForBuckets'),
+            excludeAccountNumberForBuckets: this.node.tryGetContext('excludeAccountNumberForBuckets'),
             extraContexts: this.node.tryGetContext('extraContexts'),
             logRetention: this.node.tryGetContext('logRetention'),
             name: props.stackName || 'cdk-utils',
             nodejsRuntime: this.node.tryGetContext('nodejsRuntime') ?? CommonStack.NODEJS_RUNTIME,
             region: this.node.tryGetContext('region'),
+            resourcePrefix: this.node.tryGetContext('resourcePrefix'),
+            resourceSuffix: this.node.tryGetContext('resourceSuffix'),
             skipStageForARecords: this.node.tryGetContext('skipStageForARecords'),
             stackName: props.stackName,
             stage: this.node.tryGetContext('stage'),

package/dist/src/lib/aws/common/types.d.ts

@@ -6,9 +6,17 @@ import { BaseProps } from '../../common';
  */
 export interface CommonStackProps extends BaseProps, StackProps {
     region: string;
+    resourceProjectIdentifier?: string;
+    resourcePrefix?: string;
+    resourceSuffix?: string;
     logRetention?: RetentionDays;
     defaultReservedLambdaConcurrentExecutions?: number;
     defaultTracing?: Tracing;
     excludeDomainNameForBuckets?: boolean;
+    excludeAccountNumberForBuckets?: boolean;
     nodejsRuntime?: Runtime;
 }
+export interface ResourceNameFormatterProps {
+    prefix?: string;
+    suffix?: string;
+}

package/dist/src/lib/aws/construct/api-to-any-target/main.js

@@ -84,6 +84,8 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
             this.apiToAnyTargetRestApi.api = aws_apigateway_1.RestApi.fromRestApiId(this, `${this.id}-rest-api`, aws_cdk_lib_1.Fn.importValue(this.props.api.importedRestApiRef));
             return;
         }
+        if (!this.props.api.restApi?.restApiName)
+            throw `RestApi name undefined for ${this.id}`;
         this.apiToAnyTargetRestApi.api = new aws_apigateway_1.RestApi(this, `${this.id}-rest-api`, {
             cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
             defaultCorsPreflightOptions: {
@@ -109,8 +111,8 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
             endpointConfiguration: {
                 types: [this.isProductionStage() ? aws_apigateway_1.EndpointType.EDGE : aws_apigateway_1.EndpointType.REGIONAL],
             },
-            restApiName: `${this.id}-rest-api-${this.props.stage}`,
             ...this.props.api.restApi,
+            restApiName: this.resourceNameFormatter(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
         });
         this.addCfnOutput(`${this.id}-restApiId`, this.apiToAnyTargetRestApi.api.restApiId);
         this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiToAnyTargetRestApi.api.root.resourceId);

package/dist/src/lib/aws/construct/api-to-any-target/types.d.ts

@@ -1,9 +1,9 @@
-import { BasePathMapping, DomainName, IAuthorizer, IResource, IRestApi, Integration, Method, MethodResponse, MockIntegration, Resource, RestApiProps } from 'aws-cdk-lib/aws-apigateway';
+import { BasePathMapping, DomainName, IAuthorizer, IResource, IRestApi, Integration, Method, MethodResponse, MockIntegration, Resource } from 'aws-cdk-lib/aws-apigateway';
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
 import { LogGroup } from 'aws-cdk-lib/aws-logs';
 import { IHostedZone } from 'aws-cdk-lib/aws-route53';
 import { CommonStackProps } from '../../common';
-import { AcmProps } from '../../services';
+import { AcmProps, RestApigProps } from '../../services';
 export interface ApiToAnyTargetRestApiType {
     accessLogGroup: LogGroup;
     api: IRestApi;
@@ -45,7 +45,7 @@ export interface ApiToAnyTargetRestApiProps {
     importedRestApiRootResourceRef?: string;
     methodErrorResponse: MethodResponse;
     methodResponse: MethodResponse;
-    restApi: RestApiProps;
+    restApi: RestApigProps;
     useExisting: boolean;
     withResource?: boolean;
 }

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

@@ -106,11 +106,11 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
      */
     createApiToEventBridgeTargetEventBus() {
         if (this.props.api.useExisting) {
-            this.apiEvent.eventBus = aws_events_1.EventBus.fromEventBusName(this, `${this.id}-event-bus`, `${this.props.event.eventBusName}-${this.props.stage}`);
+            this.apiEvent.eventBus = aws_events_1.EventBus.fromEventBusName(this, `${this.id}-event-bus`, this.resourceNameFormatter(this.props.event.eventBusName ?? 'default'));
             return;
         }
         this.apiEvent.eventBus = this.eventManager.createEventBus(`${this.id}-event-bus`, this, {
-            eventBusName: `${this.props.event.eventBusName}`,
+            eventBusName: this.props.event.eventBusName ?? 'default',
         });
     }
     /**
@@ -121,7 +121,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             return;
         this.apiEvent.logGroup = this.logManager.createLogGroup(`${this.id}-log`, this, {
             ...{
-                logGroupName: `/${this.id}/events/api-to-eventbridge-target`,
+                logGroupName: `/${this.resourceNameFormatter(this.id)}/events/api-to-eventbridge-target`,
             },
             ...this.props.event.logGroup,
         });
@@ -132,11 +132,12 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
     createApiToEventBridgeTargetRule() {
         if (this.props.api.useExisting)
             return;
+        if (!this.props.event.rule.ruleName)
+            throw `Event ruleName undefined for ${this.id}`;
         this.props.event.rule = {
             eventPattern: {
                 source: ['api-to-eventbridge-target'],
             },
-            ruleName: `${this.id}-api-to-eventbridge-target`,
             ...this.props.event.rule,
         };
         this.apiEvent.rule = this.eventManager.createRule(`${this.id}-api-to-eventbridge-target-rule`, this, this.props.event.rule, this.apiEvent.eventBus, [new aws_events_targets_1.CloudWatchLogGroup(this.apiEvent.logGroup)]);
@@ -289,7 +290,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
     }
     createApiToEventBridgeTargetRestApiLogGroup() {
         this.apiToEventBridgeTargetRestApi.accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-            logGroupName: `/custom/api/${this.id}-rest-api-access`,
+            logGroupName: `/custom/api/${this.resourceNameFormatter(this.id)}-rest-api-access`,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
     }
@@ -301,6 +302,8 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             this.apiToEventBridgeTargetRestApi.api = aws_apigateway_1.RestApi.fromRestApiId(this, `${this.id}-rest-api`, aws_cdk_lib_1.Fn.importValue(this.props.api.importedRestApiRef));
             return;
         }
+        if (!this.props.api.restApi?.restApiName)
+            throw `RestApi name undefined for ${this.id}`;
         this.apiToEventBridgeTargetRestApi.api = new aws_apigateway_1.RestApi(this, `${this.id}-rest-api`, {
             cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
             defaultCorsPreflightOptions: {
@@ -329,8 +332,8 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             endpointConfiguration: {
                 types: [aws_apigateway_1.EndpointType.REGIONAL],
             },
-            restApiName: `${this.id}-rest-api-${this.props.stage}`,
             ...this.props.api.restApi,
+            restApiName: this.resourceNameFormatter(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
         });
         this.addCfnOutput(`${this.id}-restApiId`, this.apiToEventBridgeTargetRestApi.api.restApiId);
         this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiToEventBridgeTargetRestApi.api.root.resourceId);

package/dist/src/lib/aws/construct/api-to-eventbridge-target/types.d.ts

@@ -1,13 +1,13 @@
+import { DomainName, IAuthorizer, Integration, IntegrationOptions, IntegrationResponse, IRestApi, Method, MethodResponse, Model, ModelOptions, Resource } from 'aws-cdk-lib/aws-apigateway';
+import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
 import { IEventBus, Rule } from 'aws-cdk-lib/aws-events';
+import { PolicyDocument, Role } from 'aws-cdk-lib/aws-iam';
+import { AssetCode } from 'aws-cdk-lib/aws-lambda';
 import { LogGroup } from 'aws-cdk-lib/aws-logs';
-import { DomainName, IAuthorizer, Integration, IntegrationOptions, IntegrationResponse, IRestApi, Method, MethodResponse, Model, ModelOptions, Resource, RestApiProps } from 'aws-cdk-lib/aws-apigateway';
-import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
 import { IHostedZone } from 'aws-cdk-lib/aws-route53';
 import { ITopic } from 'aws-cdk-lib/aws-sns';
-import { PolicyDocument, Role } from 'aws-cdk-lib/aws-iam';
 import { CommonStackProps } from '../../common';
-import { AcmProps, EventRuleProps, LambdaProps, LogProps } from '../../services';
-import { AssetCode } from 'aws-cdk-lib/aws-lambda';
+import { AcmProps, EventRuleProps, LambdaProps, LogProps, RestApigProps } from '../../services';
 /**
  */
 export interface ApiToEventBridgeTargetEventType {
@@ -61,7 +61,7 @@ export interface ApiToEventBridgeTargetRestApiProps {
     methodResponse?: MethodResponse;
     resource: string;
     responseModel?: ModelOptions;
-    restApi?: RestApiProps;
+    restApi?: RestApigProps;
     useExisting: boolean;
     withResource?: boolean;
 }

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

@@ -271,7 +271,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
         if (!this.props.api.withResource)
             return;
         this.apiDestinedRestApi.topic = this.snsManager.createLambdaNotificationService(`${this.id}-destined-topic`, this, {
-            topicName: `${this.id}-destined-topic`,
+            topicName: this.resourceNameFormatter(`${this.id}-destined-topic`),
         }, this.apiDestinedLambda.function);
         if (this.apiDestinedRestApi.role) {
             this.apiDestinedRestApi.topic.grantPublish(this.apiDestinedRestApi.role);
@@ -413,6 +413,8 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
             logGroupName: `/custom/api/${this.id}-destined-rest-api-access`,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
+        if (!this.props.api.restApi?.restApiName)
+            throw `RestApi name undefined for ${this.id}`;
         this.apiDestinedRestApi.api = new aws_apigateway_1.RestApi(this, `${this.id}-sns-rest-api`, {
             defaultCorsPreflightOptions: {
                 allowHeaders: aws_apigateway_1.Cors.DEFAULT_HEADERS,
@@ -435,8 +437,8 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
             endpointConfiguration: {
                 types: [aws_apigateway_1.EndpointType.REGIONAL],
             },
-            restApiName: `${this.id}-destined-rest-api-${this.props.stage}`,
             ...this.props.api,
+            restApiName: this.resourceNameFormatter(this.props.api.restApi?.restApiName, this.props.api.restApi?.resourceNameOptions),
         });
         this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId);
         this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiDestinedRestApi.api.root.resourceId);

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

@@ -103,7 +103,7 @@ class ApiToLambdaTarget extends common_1.CommonConstruct {
         };
     }
     resolveApiToLambdaTargetFunction() {
-        this.apiToLambdaTargetRestApi.lambda = aws_lambda_1.Function.fromFunctionName(this, `${this.id}-lambda`, this.props.lambdaFunctionName);
+        this.apiToLambdaTargetRestApi.lambda = aws_lambda_1.Function.fromFunctionName(this, `${this.id}-lambda`, this.resourceNameFormatter(this.props.lambdaFunctionName));
     }
     /**
      * @summary Method to create rest restApi for Api
@@ -114,7 +114,7 @@ class ApiToLambdaTarget extends common_1.CommonConstruct {
             return;
         }
         const accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-            logGroupName: `/custom/api/${this.id}-rest-api-access`,
+            logGroupName: `/custom/api/${this.resourceNameFormatter(this.id)}-rest-api-access`,
             removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
         });
         this.props.api.restApi = {

package/dist/src/lib/aws/construct/application-configuration/main.js

@@ -49,7 +49,7 @@ class ApplicationConfiguration extends common_1.CommonConstruct {
         this.appConfigDeploymentStrategy = new aws_appconfig_1.CfnDeploymentStrategy(this, `${this.id}-ac-deployment-strategy`, {
             deploymentDurationInMinutes: this.props.appConfig.deploymentStrategy.deploymentDurationInMinutes,
             growthFactor: this.props.appConfig.deploymentStrategy.growthFactor,
-            name: this.props.appConfig.deploymentStrategy.name,
+            name: this.resourceNameFormatter(this.props.appConfig.deploymentStrategy.name),
             replicateTo: this.props.appConfig.deploymentStrategy.replicateTo,
         });
     }

package/dist/src/lib/aws/construct/lambda-with-iam-access/main.js

@@ -8,7 +8,6 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
 const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
 const aws_iam_1 = require("aws-cdk-lib/aws-iam");
 const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
-const aws_secretsmanager_1 = require("aws-cdk-lib/aws-secretsmanager");
 const lodash_1 = __importDefault(require("lodash"));
 const common_1 = require("../../common");
 const services_1 = require("../../services");
@@ -144,10 +143,10 @@ class LambdaWithIamAccess extends common_1.CommonConstruct {
      */
     createIamUserForLambdaFunction() {
         this.lambdaIamUser = new aws_iam_1.User(this, `${this.id}-lambda-user`, {
-            userName: `${this.id}-user-${this.props.stage}`,
+            userName: this.resourceNameFormatter(`${this.id}-user`),
         });
         new aws_iam_1.Policy(this, `${this.id}-lambda-user-policy`, {
-            policyName: `${this.id}-policy-${this.props.stage}`,
+            policyName: this.resourceNameFormatter(`${this.id}-policy`),
             statements: [
                 new aws_iam_1.PolicyStatement({
                     actions: ['lambda:InvokeFunction'],
@@ -159,7 +158,7 @@ class LambdaWithIamAccess extends common_1.CommonConstruct {
         if (this.props.lambda.lambdaAliases && !lodash_1.default.isEmpty(this.props.lambda.lambdaAliases)) {
             lodash_1.default.forEach(this.props.lambda.lambdaAliases, (alias, index) => {
                 new aws_iam_1.Policy(this, `${this.id}-alias-user-policy`, {
-                    policyName: `${this.id}-alias-policy-${index}-${this.props.stage}`,
+                    policyName: this.resourceNameFormatter(`${this.id}--alias-policy-${index}`),
                     statements: [
                         new aws_iam_1.PolicyStatement({
                             actions: ['lambda:InvokeFunction'],
@@ -181,7 +180,7 @@ class LambdaWithIamAccess extends common_1.CommonConstruct {
      * @summary Method to create iam secret for the lambda function
      */
     createIamSecretForLambdaFunction() {
-        this.lambdaUserAccessSecret = new aws_secretsmanager_1.Secret(this, `${this.id}-lambda-user-secret-${this.props.stage}`, this.props.lambdaSecret);
+        this.lambdaUserAccessSecret = this.secretsManager.createSecret(`${this.id}-lambda-user-secret-${this.props.stage}`, this, this.props.lambdaSecret);
         const cfnSecret = this.lambdaUserAccessSecret.node.defaultChild;
         cfnSecret.generateSecretString = undefined;
         cfnSecret.secretString = `{ "ACCESS_KEY_ID": "${this.lambdaUserAccessKey.ref}", "ACCESS_KEY_SECRET": "${this.lambdaUserAccessKey.attrSecretAccessKey}" }`;

package/dist/src/lib/aws/construct/site-with-ecs-backend/main.js

@@ -220,13 +220,11 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
             enableECSManagedTags: true,
             healthCheckGracePeriod: aws_cdk_lib_1.Duration.seconds(60),
             listenerPort: this.props.siteTask.listenerPort,
-            loadBalancerName: this.props.siteTask.loadBalancerName
-                ? `${this.props.siteTask.loadBalancerName}-${this.props.stage}`
-                : `${this.id}-${this.props.stage}`,
+            loadBalancerName: this.resourceNameFormatter(this.props.siteTask.loadBalancerName ?? this.id),
             maxHealthyPercent: this.props.siteTask.maxHealthyPercent,
             memoryLimitMiB: this.props.siteTask.memoryLimitMiB,
             minHealthyPercent: this.props.siteTask.minHealthyPercent,
-            serviceName: `${this.id}-${this.props.stage}`,
+            serviceName: this.resourceNameFormatter(this.props.siteTask.serviceName ?? this.id),
             taskDefinition: this.props.siteTask.taskDefinition,
             taskImageOptions: {
                 containerPort: this.props.siteTask.taskImageOptions?.containerPort,
@@ -306,14 +304,14 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
                     transitEncryption: this.props.siteFileSystem.transitEncryption,
                     transitEncryptionPort: this.props.siteFileSystem.transitEncryptionPort,
                 },
-                name: `${this.id}-fs`,
+                name: this.resourceNameFormatter(this.props.siteFileSystem?.fileSystemName ?? this.id),
             });
             if (this.props.siteTask.mountPoints && !lodash_1.default.isEmpty(this.props.siteTask.mountPoints)) {
                 lodash_1.default.forEach(this.props.siteTask.mountPoints, mountPoint => {
                     this.siteEcsTaskDefinition.defaultContainer?.addMountPoints({
                         containerPath: mountPoint.containerPath,
                         readOnly: mountPoint.readOnly,
-                        sourceVolume: `${this.id}-fs`,
+                        sourceVolume: this.resourceNameFormatter(this.props.siteFileSystem?.fileSystemName ?? this.id),
                     });
                 });
             }
@@ -330,8 +328,10 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
         this.siteLogBucket = this.s3Manager.createS3Bucket(`${this.id}-site-logs`, this, this.props.siteLogBucket);
     }
     createSiteCachePolicy(id, siteCachePolicy) {
+        if (!siteCachePolicy.cachePolicyName)
+            throw `SiteCachePolicy cachePolicyName undefined for ${id}`;
         return new aws_cloudfront_1.CachePolicy(this, `${id}`, {
-            cachePolicyName: `${this.id}-${siteCachePolicy.cachePolicyName}`,
+            cachePolicyName: this.resourceNameFormatter(siteCachePolicy.cachePolicyName),
             comment: `Policy for ${this.id}-distribution - ${this.props.stage} stage`,
             cookieBehavior: siteCachePolicy.cookieBehavior,
             enableAcceptEncodingBrotli: siteCachePolicy.enableAcceptEncodingBrotli,
@@ -353,11 +353,13 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
     createSiteOriginRequestPolicy() {
         if (!this.props.siteOriginRequestPolicy)
             return;
+        if (!this.props.siteOriginRequestPolicy.originRequestPolicyName)
+            throw `SiteOriginRequestPolicy originRequestPolicyName undefined for ${this.id}`;
         this.siteOriginRequestPolicy = new aws_cloudfront_1.OriginRequestPolicy(this, `${this.id}-sorp`, {
             comment: `Request Policy for ${this.id}-distribution - ${this.props.stage} stage`,
             cookieBehavior: this.props.siteOriginRequestPolicy.cookieBehavior,
             headerBehavior: this.props.siteOriginRequestPolicy.headerBehavior,
-            originRequestPolicyName: `${this.id}-origin-request`,
+            originRequestPolicyName: this.resourceNameFormatter(this.props.siteOriginRequestPolicy.originRequestPolicyName),
             queryStringBehavior: this.props.siteOriginRequestPolicy.queryStringBehavior,
         });
         lodash_1.default.assign(this.props.siteDistribution.defaultBehavior, {
@@ -367,10 +369,12 @@ class SiteWithEcsBackend extends common_1.CommonConstruct {
     createResponseHeaderPolicy(props) {
         if (!props)
             return undefined;
+        if (!props.responseHeadersPolicyName)
+            throw `SiteResponseHeadersPolicy responseHeadersPolicyName undefined for ${this.id}`;
         return new aws_cloudfront_1.ResponseHeadersPolicy(this, `${this.id}-${props.type}-srhp`, {
             ...props,
             comment: `Response Header Policy for ${props.type} for ${this.id}-distribution - ${this.props.stage} stage`,
-            responseHeadersPolicyName: `${this.id}-${props.type}-response`,
+            responseHeadersPolicyName: this.resourceNameFormatter(props.responseHeadersPolicyName),
             securityHeadersBehavior: {
                 ...props.securityHeadersBehavior,
                 strictTransportSecurity: {

package/dist/src/lib/aws/construct/site-with-lambda-backend/main.js

@@ -136,8 +136,10 @@ class SiteWithLambdaBackend extends common_1.CommonConstruct {
         this.siteLogBucket = this.s3Manager.createS3Bucket(`${this.id}-site-logs`, this, this.props.siteLogBucket);
     }
     createSiteCachePolicy(id, siteCachePolicy) {
+        if (!siteCachePolicy.cachePolicyName)
+            throw `SiteCachePolicy cachePolicyName undefined for ${id}`;
         return new aws_cloudfront_1.CachePolicy(this, `${id}`, {
-            cachePolicyName: `${this.id}-${siteCachePolicy.cachePolicyName}`,
+            cachePolicyName: this.resourceNameFormatter(siteCachePolicy.cachePolicyName),
             comment: `Policy for ${this.id}-distribution - ${this.props.stage} stage`,
             cookieBehavior: siteCachePolicy.cookieBehavior,
             enableAcceptEncodingBrotli: siteCachePolicy.enableAcceptEncodingBrotli,
@@ -159,11 +161,13 @@ class SiteWithLambdaBackend extends common_1.CommonConstruct {
     createSiteOriginRequestPolicy() {
         if (!this.props.siteOriginRequestPolicy)
             return;
+        if (!this.props.siteOriginRequestPolicy.originRequestPolicyName)
+            throw `SiteOriginRequestPolicy originRequestPolicyName undefined for ${this.id}`;
         this.siteOriginRequestPolicy = new aws_cloudfront_1.OriginRequestPolicy(this, `${this.id}-sorp`, {
             comment: `Request Policy for ${this.id}-distribution - ${this.props.stage} stage`,
             cookieBehavior: this.props.siteOriginRequestPolicy.cookieBehavior,
             headerBehavior: this.props.siteOriginRequestPolicy.headerBehavior,
-            originRequestPolicyName: `${this.id}-origin-request`,
+            originRequestPolicyName: this.resourceNameFormatter(this.props.siteOriginRequestPolicy.originRequestPolicyName),
             queryStringBehavior: this.props.siteOriginRequestPolicy.queryStringBehavior,
         });
         lodash_1.default.assign(this.props.siteDistribution.defaultBehavior, {
@@ -173,10 +177,12 @@ class SiteWithLambdaBackend extends common_1.CommonConstruct {
     createResponseHeaderPolicy(props) {
         if (!props)
             return undefined;
+        if (!props.responseHeadersPolicyName)
+            throw `SiteResponseHeadersPolicy responseHeadersPolicyName undefined for ${this.id}`;
         return new aws_cloudfront_1.ResponseHeadersPolicy(this, `${this.id}-${props.type}-srhp`, {
             ...props,
             comment: `Response Header Policy for ${props.type} for ${this.id}-distribution - ${this.props.stage} stage`,
-            responseHeadersPolicyName: `${this.id}-${props.type}-response`,
+            responseHeadersPolicyName: this.resourceNameFormatter(props.responseHeadersPolicyName),
             securityHeadersBehavior: {
                 ...props.securityHeadersBehavior,
                 strictTransportSecurity: {

package/dist/src/lib/aws/services/api-gateway/main.js

@@ -36,6 +36,8 @@ class ApiManager {
     createLambdaRestApi(id, scope, props, lambdaFunction) {
         if (!props)
             throw `Api props undefined for ${id}`;
+        if (!props.restApiName)
+            throw `Api restApiName undefined for ${id}`;
         const api = new aws_apigateway_1.LambdaRestApi(scope, `${id}`, {
             ...props,
             cloudWatchRole: props.cloudWatchRole || false,
@@ -53,7 +55,7 @@ class ApiManager {
             handler: lambdaFunction,
             minCompressionSize: props.minCompressionSizeInBytes ? aws_cdk_lib_1.Size.bytes(props.minCompressionSizeInBytes) : undefined,
             proxy: props.proxy ?? true,
-            restApiName: `${props.restApiName}-${scope.props.stage}`,
+            restApiName: scope.resourceNameFormatter(props.restApiName, props.resourceNameOptions),
         });
         if (props.tags && !lodash_1.default.isEmpty(props.tags)) {
             lodash_1.default.forEach(props.tags, tag => {

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

@@ -1,8 +1,13 @@
-import { LambdaRestApiProps as LambdaRestApigProps } from 'aws-cdk-lib/aws-apigateway';
+import { LambdaRestApiProps as LambdaRestApigProps, RestApiProps } from 'aws-cdk-lib/aws-apigateway';
+import { ResourceNameFormatterProps } from '../../common';
 import { TagProps } from '../../types';
 /**
  */
 export interface LambdaRestApiProps extends LambdaRestApigProps {
     tags?: TagProps[];
     minCompressionSizeInBytes?: number;
+    resourceNameOptions?: ResourceNameFormatterProps;
+}
+export interface RestApigProps extends RestApiProps {
+    resourceNameOptions?: ResourceNameFormatterProps;
 }

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

@@ -50,7 +50,7 @@ class AppConfigManager {
             throw `AppConfig props undefined for ${id}`;
         const application = new aws_appconfig_1.CfnApplication(scope, `${id}`, {
             ...props.application,
-            name: `${props.application.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.application.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-ApplicationId`, scope, aws_cdk_lib_1.Fn.ref(application.logicalId));
         (0, utils_1.createCfnOutput)(`${id}-ApplicationName`, scope, application.name);
@@ -92,7 +92,7 @@ class AppConfigManager {
             ...props.configurationProfile,
             applicationId,
             locationUri: props.configurationProfile.locationUri || 'hosted',
-            name: `${props.configurationProfile.name}-${scope.props.stage}`,
+            name: scope.resourceNameFormatter(props.configurationProfile.name, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-configurationProfileId`, scope, aws_cdk_lib_1.Fn.ref(profile.logicalId));
         (0, utils_1.createCfnOutput)(`${id}-configurationProfileName`, scope, profile.name);

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

@@ -1,4 +1,5 @@
 import { CfnApplicationProps, CfnConfigurationProfileProps, CfnDeploymentProps, CfnDeploymentStrategyProps, CfnEnvironmentProps } from 'aws-cdk-lib/aws-appconfig';
+import { ResourceNameFormatterProps } from '../../common';
 /**
  */
 export interface AppConfigProps {
@@ -8,4 +9,5 @@ export interface AppConfigProps {
     deploymentStrategy: CfnDeploymentStrategyProps;
     environment: CfnEnvironmentProps;
     id: string;
+    resourceNameOptions?: ResourceNameFormatterProps;
 }

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

@@ -228,6 +228,8 @@ class CloudFrontManager {
     createEdgeFunction(id, scope, props, layers, code, role, environment, vpc, securityGroups, accessPoint, mountPath) {
         if (!props)
             throw `EdgeFunction props undefined for ${id}`;
+        if (!props.functionName)
+            throw `EdgeFunction functionName undefined for ${id}`;
         const edgeFunction = new cf.experimental.EdgeFunction(scope, `${id}`, {
             code: code,
             description: props.description,
@@ -235,7 +237,7 @@ class CloudFrontManager {
                 ...environment,
             },
             filesystem: accessPoint ? aws_lambda_1.FileSystem.fromEfsAccessPoint(accessPoint, mountPath ?? '/mnt/msg') : undefined,
-            functionName: `${props.functionName}-${scope.props.stage}`,
+            functionName: scope.resourceNameFormatter(props.functionName, props.resourceNameOptions),
             handler: props.handler ?? 'index.handler',
             layers: layers,
             logRetention: props.logRetention,
@@ -286,12 +288,16 @@ class CloudFrontManager {
      * @param props
      */
     createCloudfrontFunction(id, scope, props) {
+        if (!props)
+            throw `CloudFront Function props undefined for ${id}`;
+        if (!props.functionName)
+            throw `CloudFront Function functionName undefined for ${id}`;
         const cloudfrontFunction = new aws_cloudfront_1.Function(scope, `${id}`, {
             code: aws_cloudfront_1.FunctionCode.fromFile({
                 filePath: props.functionFilePath,
             }),
             comment: props.comment,
-            functionName: `${props.functionName}-${scope.props.stage}`,
+            functionName: scope.resourceNameFormatter(props.functionName, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-functionArn`, scope, cloudfrontFunction.functionArn);
         (0, utils_1.createCfnOutput)(`${id}-functionName`, scope, cloudfrontFunction.functionName);

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

@@ -1,4 +1,5 @@
 import { DistributionProps as CfDistributionProps, CloudFrontWebDistributionProps, FunctionProps } from 'aws-cdk-lib/aws-cloudfront';
+import { ResourceNameFormatterProps } from '../../common';
 import { TagProps } from '../../types';
 /**
  */
@@ -15,4 +16,5 @@ export interface DistributionProps extends CfDistributionProps {
 export interface CloudfrontFunctionProps extends FunctionProps {
     eventType: string;
     functionFilePath: string;
+    resourceNameOptions?: ResourceNameFormatterProps;
 }

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

@@ -40,6 +40,8 @@ class CloudTrailManager {
     createCloudTrail(id, scope, props, logGroup, dataBucket, logBucket, logBucketPolicy) {
         if (!props)
             throw `CloudTrail props undefined for ${id}`;
+        if (!props.trailName)
+            throw `CloudTrail trailName undefined for ${id}`;
         const role = scope.iamManager.createRoleForCloudTrail(`${id}Role`, scope, logGroup);
         const cloudTrail = new aws_cloudtrail_1.CfnTrail(scope, `${id}`, {
             ...props,
@@ -60,7 +62,7 @@ class CloudTrailManager {
             s3BucketName: logBucket.bucketName,
             s3KeyPrefix: `logs-${props.trailName}`,
             tags: [{ key: 'service', value: scope.props.name }],
-            trailName: `${props.trailName}-${scope.props.stage}`,
+            trailName: scope.resourceNameFormatter(props.trailName, props.resourceNameOptions),
         });
         cloudTrail.addDependency(logBucketPolicy);
         cloudTrail.addDependency(logGroup);

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

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

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

@@ -56,9 +56,11 @@ class DynamodbManager {
     createTableV2(id, scope, props) {
         if (!props)
             throw `Table props undefined for ${id}`;
+        if (!props.tableName)
+            throw `Table tableName undefined for ${id}`;
         const table = new aws_dynamodb_1.TableV2(scope, `${id}`, {
             ...props,
-            tableName: `${props.tableName}-${scope.props.stage}`,
+            tableName: scope.resourceNameFormatter(props.tableName, props.resourceNameOptions),
         });
         (0, utils_1.createCfnOutput)(`${id}-tableName`, scope, table.tableName);
         (0, utils_1.createCfnOutput)(`${id}-tableArn`, scope, table.tableArn);

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

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