@gradientedge/cdk-utils 9.10.0 → 9.10.1

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,
         });
     }

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

@@ -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/services/appconfig/main.js

@@ -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/eventbridge/main.js

@@ -39,9 +39,13 @@ class EventManager {
             throw `EventBus props undefined for ${id}`;
         if (!props.eventBusName)
             throw `EventBus eventBusName undefined for ${id}`;
+        let eventBusName = props.eventBusName;
+        if (eventBusName && eventBusName != 'default') {
+            eventBusName = scope.resourceNameFormatter(props.eventBusName, props.resourceNameOptions);
+        }
         const eventBus = new aws_events_1.EventBus(scope, `${id}`, {
             ...props,
-            eventBusName: scope.resourceNameFormatter(props.eventBusName, props.resourceNameOptions),
+            eventBusName,
         });
         (0, utils_1.createCfnOutput)(`${id}-eventBusName`, scope, `${props.eventBusName}-${scope.props.stage}`);
         (0, utils_1.createCfnOutput)(`${id}-eventBusArn`, scope, eventBus.eventBusArn);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
     "node": ">=16 <=20",
-    "pnpm": "=8"
+    "pnpm": "=9"
   },
   "packageManager": "pnpm@8.15.8",
   "repository": {

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

@@ -159,12 +159,12 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       this.apiEvent.eventBus = EventBus.fromEventBusName(
         this,
         `${this.id}-event-bus`,
-        `${this.props.event.eventBusName}-${this.props.stage}`
+        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',
     })
   }
 
@@ -175,7 +175,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     if (this.props.api.useExisting) 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,
     })
@@ -186,11 +186,12 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
    */
   protected 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(
@@ -355,7 +356,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
       `${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: RemovalPolicy.DESTROY,
       }
     )

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

@@ -156,7 +156,7 @@ export class ApiToLambdaTarget extends CommonConstruct {
     }
 
     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: RemovalPolicy.DESTROY,
     })
 

package/src/lib/aws/construct/application-configuration/main.ts

@@ -79,7 +79,7 @@ export class ApplicationConfiguration extends CommonConstruct {
     this.appConfigDeploymentStrategy = new 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/src/lib/aws/services/appconfig/main.ts

@@ -109,7 +109,7 @@ export 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),
     })
 
     createCfnOutput(`${id}-configurationProfileId`, scope, Fn.ref(profile.logicalId))

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

@@ -45,9 +45,13 @@ export class EventManager {
     if (!props) throw `EventBus props undefined for ${id}`
     if (!props.eventBusName) throw `EventBus eventBusName undefined for ${id}`
 
+    let eventBusName = props.eventBusName
+    if (eventBusName && eventBusName != 'default') {
+      eventBusName = scope.resourceNameFormatter(props.eventBusName, props.resourceNameOptions)
+    }
     const eventBus = new EventBus(scope, `${id}`, {
       ...props,
-      eventBusName: scope.resourceNameFormatter(props.eventBusName, props.resourceNameOptions),
+      eventBusName,
     })
 
     createCfnOutput(`${id}-eventBusName`, scope, `${props.eventBusName}-${scope.props.stage}`)