@gradientedge/cdk-utils 9.19.0 → 9.21.0

package/dist/src/lib/aws/common/resource-name-formatter.js

@@ -16,11 +16,15 @@ class ResourceNameFormatter extends constructs_1.Construct {
      */
     format(resourceName, options) {
         const resourceNameElements = [];
-        resourceNameElements.push(options?.globalPrefix ? this.props.globalPrefix : undefined);
-        resourceNameElements.push(options?.prefix ?? this.props.resourcePrefix);
+        if (!options?.exclude) {
+            resourceNameElements.push(options?.globalPrefix ? this.props.globalPrefix : undefined);
+            resourceNameElements.push(options?.prefix ?? this.props.resourcePrefix);
+        }
         resourceNameElements.push(resourceName);
-        resourceNameElements.push(options?.suffix ?? this.props.resourceSuffix);
-        resourceNameElements.push(options?.globalSuffix ? this.props.globalSuffix : undefined);
+        if (!options?.exclude) {
+            resourceNameElements.push(options?.suffix ?? this.props.resourceSuffix);
+            resourceNameElements.push(options?.globalSuffix ? this.props.globalSuffix : undefined);
+        }
         resourceNameElements.push(this.props.stage);
         return resourceNameElements.filter(resourceNameElement => resourceNameElement != undefined).join('-');
     }

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

@@ -22,6 +22,7 @@ export interface CommonStackProps extends BaseProps, StackProps {
     };
 }
 export interface ResourceNameFormatterProps {
+    exclude?: boolean;
     globalPrefix?: boolean;
     globalSuffix?: boolean;
     prefix?: string;

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

@@ -39,7 +39,6 @@ export declare class ApiToAnyTarget extends CommonConstruct {
      * @summary Method to resolve a certificate based on attributes
      */
     protected resolveCertificate(): void;
-    protected createApiToAnyTargetRestApiLogGroup(): void;
     protected createApiToAnyTargetRestApi(): void;
     protected createApiToAnyTargetResource(apiResourceProps: ApiToAnyTargetRestApiResource): Resource | undefined;
     protected createApiDomain(): void;

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

@@ -41,7 +41,6 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
         this.resolveHostedZone();
         this.resolveCertificate();
         /* restApi related resources */
-        this.createApiToAnyTargetRestApiLogGroup();
         this.createApiToAnyTargetRestApi();
         this.createApiDomain();
         this.createApiBasePathMapping();
@@ -73,12 +72,6 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
         }
         this.apiToAnyTargetRestApi.certificate = this.acmManager.resolveCertificate(`${this.id}-certificate`, this, this.props.api.certificate);
     }
-    createApiToAnyTargetRestApiLogGroup() {
-        this.apiToAnyTargetRestApi.accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-            logGroupName: `${this.id}-access`,
-            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
-        });
-    }
     createApiToAnyTargetRestApi() {
         if (this.props.api.useExisting && this.props.api.importedRestApiRef) {
             this.apiToAnyTargetRestApi.api = aws_apigateway_1.RestApi.fromRestApiId(this, `${this.id}-rest-api`, aws_cdk_lib_1.Fn.importValue(this.props.api.importedRestApiRef));
@@ -86,6 +79,12 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
         }
         if (!this.props.api.restApi?.restApiName)
             throw `RestApi name undefined for ${this.id}`;
+        const restApiName = this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway);
+        const restApiAccessLogName = this.resourceNameFormatter.format(`${this.props.api.restApi?.restApiName}-access`, this.props.resourceNameOptions?.apigateway);
+        this.apiToAnyTargetRestApi.accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
+            logGroupName: restApiAccessLogName,
+            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
+        });
         this.apiToAnyTargetRestApi.api = new aws_apigateway_1.RestApi(this, `${this.id}-rest-api`, {
             cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
             defaultCorsPreflightOptions: {
@@ -112,7 +111,7 @@ class ApiToAnyTarget extends common_1.CommonConstruct {
                 types: [this.isProductionStage() ? aws_apigateway_1.EndpointType.EDGE : aws_apigateway_1.EndpointType.REGIONAL],
             },
             ...this.props.api.restApi,
-            restApiName: this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway),
+            restApiName,
         });
         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-eventbridge-target/main.d.ts

@@ -86,7 +86,6 @@ export declare class ApiToEventBridgeTarget extends CommonConstruct {
      * @summary Method to create api integration method error response
      */
     protected createApiToEventBridgeTargetMethodErrorResponse(): void;
-    protected createApiToEventBridgeTargetRestApiLogGroup(): void;
     /**
      * @summary Method to create rest restApi for Api
      */

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

@@ -63,7 +63,6 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
         this.createApiToEventBridgeTargetIntegrationResponse();
         this.createApiToEventBridgeTargetIntegrationErrorResponse();
         this.createApiToEventBridgeTargetIntegration();
-        this.createApiToEventBridgeTargetRestApiLogGroup();
         this.createApiToEventBridgeTargetRestApi();
         this.createApiToEventBridgeTargetResource();
         this.createApiToEventBridgeTargetResponseModel();
@@ -121,7 +120,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             return;
         this.apiEvent.logGroup = this.logManager.createLogGroup(`${this.id}-log`, this, {
             ...{
-                logGroupName: `${this.id}-api-to-event-bridge-target`,
+                logGroupName: `${this.id}-api-to-event-bridge-target-${this.props.stage}`,
             },
             ...this.props.event.logGroup,
         });
@@ -288,12 +287,6 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             ...this.props.api.methodErrorResponse,
         };
     }
-    createApiToEventBridgeTargetRestApiLogGroup() {
-        this.apiToEventBridgeTargetRestApi.accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-            logGroupName: `${this.id}-access`,
-            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
-        });
-    }
     /**
      * @summary Method to create rest restApi for Api
      */
@@ -304,6 +297,12 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
         }
         if (!this.props.api.restApi?.restApiName)
             throw `RestApi name undefined for ${this.id}`;
+        const restApiName = this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway);
+        const restApiAccessLogName = this.resourceNameFormatter.format(`${this.props.api.restApi?.restApiName}-access`, this.props.resourceNameOptions?.apigateway);
+        this.apiToEventBridgeTargetRestApi.accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
+            logGroupName: restApiAccessLogName,
+            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
+        });
         this.apiToEventBridgeTargetRestApi.api = new aws_apigateway_1.RestApi(this, `${this.id}-rest-api`, {
             cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
             defaultCorsPreflightOptions: {
@@ -333,7 +332,7 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
                 types: [aws_apigateway_1.EndpointType.REGIONAL],
             },
             ...this.props.api.restApi,
-            restApiName: this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway),
+            restApiName,
         });
         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-with-sns/main.js

@@ -199,7 +199,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
         if (this.props.api.useExisting)
             return;
         this.apiEvent.logGroupSuccess = this.logManager.createLogGroup(`${this.id}-destination-success-log`, this, {
-            logGroupName: `${this.id}-destination`,
+            logGroupName: `${this.id}-destination-${this.props.stage}`,
             ...this.props.event.logGroupSuccess,
         });
     }
@@ -233,7 +233,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
         if (this.props.api.useExisting)
             return;
         this.apiEvent.logGroupFailure = this.logManager.createLogGroup(`${this.id}-destination-failure-log`, this, {
-            logGroupName: `${this.id}-destination-failure`,
+            logGroupName: `${this.id}-destination-failure-${this.props.stage}`,
             ...this.props.event.logGroupFailure,
         });
     }
@@ -409,12 +409,14 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
             this.apiDestinedRestApi.api = aws_apigateway_1.RestApi.fromRestApiId(this, `${this.id}-sns-rest-api`, aws_cdk_lib_1.Fn.importValue(this.props.api.importedRestApiRef));
             return;
         }
-        const accessLogGroup = this.logManager.createLogGroup(`${this.id}-sns-rest-api-access-log`, this, {
-            logGroupName: `${this.id}-access`,
-            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
-        });
         if (!this.props.api.restApi?.restApiName)
             throw `RestApi name undefined for ${this.id}`;
+        const restApiName = this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway);
+        const restApiAccessLogName = this.resourceNameFormatter.format(`${this.props.api.restApi?.restApiName}-access`, this.props.resourceNameOptions?.apigateway);
+        const accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
+            logGroupName: restApiAccessLogName,
+            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
+        });
         this.apiDestinedRestApi.api = new aws_apigateway_1.RestApi(this, `${this.id}-sns-rest-api`, {
             defaultCorsPreflightOptions: {
                 allowHeaders: aws_apigateway_1.Cors.DEFAULT_HEADERS,
@@ -438,7 +440,7 @@ class ApiToEventBridgeTargetWithSns extends common_1.CommonConstruct {
                 types: [aws_apigateway_1.EndpointType.REGIONAL],
             },
             ...this.props.api,
-            restApiName: this.resourceNameFormatter.format(this.props.api.restApi?.restApiName, this.props.resourceNameOptions?.apigateway),
+            restApiName,
         });
         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

@@ -113,10 +113,6 @@ class ApiToLambdaTarget extends common_1.CommonConstruct {
             this.apiToLambdaTargetRestApi.api = aws_apigateway_1.RestApi.fromRestApiId(this, `${this.id}-rest-api`, aws_cdk_lib_1.Fn.importValue(this.props.api.importedRestApiRef));
             return;
         }
-        const accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-            logGroupName: `${this.id}-access`,
-            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
-        });
         this.props.api.restApi = {
             ...this.props.api.restApi,
             defaultMethodOptions: {
@@ -125,9 +121,6 @@ class ApiToLambdaTarget extends common_1.CommonConstruct {
                     this.apiToLambdaTargetRestApi.methodErrorResponse,
                 ],
             },
-            deployOptions: {
-                accessLogDestination: new aws_apigateway_1.LogGroupLogDestination(accessLogGroup),
-            },
         };
         this.apiToLambdaTargetRestApi.api = this.apiManager.createLambdaRestApi(`${this.id}-lambda-rest-api`, this, this.props.api.restApi, this.apiToLambdaTargetRestApi.lambda);
         this.addCfnOutput(`${this.id}-restApiId`, this.apiToLambdaTargetRestApi.api.restApiId);

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

@@ -38,12 +38,19 @@ class ApiManager {
             throw `Api props undefined for ${id}`;
         if (!props.restApiName)
             throw `Api restApiName undefined for ${id}`;
+        const restApiName = scope.resourceNameFormatter.format(props.restApiName, scope.props.resourceNameOptions?.apigateway);
+        const restApiAccessLogName = scope.resourceNameFormatter.format(`${props.restApiName}-access`, scope.props.resourceNameOptions?.apigateway);
+        const accessLogGroup = scope.logManager.createLogGroup(`${id}-rest-api-access-log`, scope, {
+            logGroupName: restApiAccessLogName,
+            removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
+        });
         const api = new aws_apigateway_1.LambdaRestApi(scope, `${id}`, {
             ...props,
             cloudWatchRole: props.cloudWatchRole || false,
             deploy: props.deploy || true,
             deployOptions: {
                 ...props.deployOptions,
+                accessLogDestination: new aws_apigateway_1.LogGroupLogDestination(accessLogGroup),
                 description: `${id} - ${scope.props.stage} stage`,
                 stageName: scope.props.stage,
             },
@@ -55,7 +62,7 @@ class ApiManager {
             handler: lambdaFunction,
             minCompressionSize: props.minCompressionSizeInBytes ? aws_cdk_lib_1.Size.bytes(props.minCompressionSizeInBytes) : undefined,
             proxy: props.proxy ?? true,
-            restApiName: scope.resourceNameFormatter.format(props.restApiName, scope.props.resourceNameOptions?.apigateway),
+            restApiName,
         });
         if (props.tags && !lodash_1.default.isEmpty(props.tags)) {
             lodash_1.default.forEach(props.tags, tag => {

package/dist/src/lib/aws/services/cloudwatch/logs.js

@@ -88,7 +88,7 @@ class LogManager {
             throw `Logs logGroupName undefined for ${id}`;
         const logGroup = new logs.CfnLogGroup(scope, `${id}`, {
             ...props,
-            logGroupName: `${scope.resourceNameFormatter.format(props.logGroupName, scope.props.resourceNameOptions?.logs)}`,
+            logGroupName: props.logGroupName,
             retentionInDays: props.retention,
         });
         if (props.tags && !lodash_1.default.isEmpty(props.tags)) {
@@ -112,7 +112,7 @@ class LogManager {
             throw `Logs logGroupName undefined for ${id}`;
         const logGroup = new logs.LogGroup(scope, `${id}`, {
             ...props,
-            logGroupName: `${scope.resourceNameFormatter.format(props.logGroupName, scope.props.resourceNameOptions?.logs)}`,
+            logGroupName: props.logGroupName,
             removalPolicy: props.removalPolicy ?? cdk.RemovalPolicy.DESTROY,
             retention: props.retention,
         });

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

@@ -102,7 +102,7 @@ class LambdaManager {
             handler: handler || 'index.lambda_handler',
             layers,
             logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
-                logGroupName: props.functionName,
+                logGroupName: functionName,
                 removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
                 retention: scope.props.logRetention ?? logRetention,
             }),
@@ -205,7 +205,7 @@ class LambdaManager {
             filesystem: accessPoint ? aws_lambda_1.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
             functionName,
             logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
-                logGroupName: props.functionName,
+                logGroupName: functionName,
                 removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY,
                 retention: scope.props.logRetention ?? logRetention,
             }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "9.19.0",
+  "version": "9.21.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

package/src/lib/aws/common/resource-name-formatter.ts

@@ -17,11 +17,15 @@ export class ResourceNameFormatter extends Construct {
    */
   public format(resourceName: string, options?: ResourceNameFormatterProps) {
     const resourceNameElements = []
-    resourceNameElements.push(options?.globalPrefix ? this.props.globalPrefix : undefined)
-    resourceNameElements.push(options?.prefix ?? this.props.resourcePrefix)
+    if (!options?.exclude) {
+      resourceNameElements.push(options?.globalPrefix ? this.props.globalPrefix : undefined)
+      resourceNameElements.push(options?.prefix ?? this.props.resourcePrefix)
+    }
     resourceNameElements.push(resourceName)
-    resourceNameElements.push(options?.suffix ?? this.props.resourceSuffix)
-    resourceNameElements.push(options?.globalSuffix ? this.props.globalSuffix : undefined)
+    if (!options?.exclude) {
+      resourceNameElements.push(options?.suffix ?? this.props.resourceSuffix)
+      resourceNameElements.push(options?.globalSuffix ? this.props.globalSuffix : undefined)
+    }
     resourceNameElements.push(this.props.stage)
     return resourceNameElements.filter(resourceNameElement => resourceNameElement != undefined).join('-')
   }

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

@@ -22,6 +22,7 @@ export interface CommonStackProps extends BaseProps, StackProps {
 }
 
 export interface ResourceNameFormatterProps {
+  exclude?: boolean
   globalPrefix?: boolean
   globalSuffix?: boolean
   prefix?: string

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

@@ -58,7 +58,6 @@ export class ApiToAnyTarget extends CommonConstruct {
     this.resolveCertificate()
 
     /* restApi related resources */
-    this.createApiToAnyTargetRestApiLogGroup()
     this.createApiToAnyTargetRestApi()
     this.createApiDomain()
     this.createApiBasePathMapping()
@@ -109,13 +108,6 @@ export class ApiToAnyTarget extends CommonConstruct {
     )
   }
 
-  protected createApiToAnyTargetRestApiLogGroup() {
-    this.apiToAnyTargetRestApi.accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-      logGroupName: `${this.id}-access`,
-      removalPolicy: RemovalPolicy.DESTROY,
-    })
-  }
-
   protected createApiToAnyTargetRestApi() {
     if (this.props.api.useExisting && this.props.api.importedRestApiRef) {
       this.apiToAnyTargetRestApi.api = RestApi.fromRestApiId(
@@ -128,6 +120,21 @@ export class ApiToAnyTarget extends CommonConstruct {
 
     if (!this.props.api.restApi?.restApiName) throw `RestApi name undefined for ${this.id}`
 
+    const restApiName = this.resourceNameFormatter.format(
+      this.props.api.restApi?.restApiName,
+      this.props.resourceNameOptions?.apigateway
+    )
+
+    const restApiAccessLogName = this.resourceNameFormatter.format(
+      `${this.props.api.restApi?.restApiName}-access`,
+      this.props.resourceNameOptions?.apigateway
+    )
+
+    this.apiToAnyTargetRestApi.accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
+      logGroupName: restApiAccessLogName,
+      removalPolicy: RemovalPolicy.DESTROY,
+    })
+
     this.apiToAnyTargetRestApi.api = new RestApi(this, `${this.id}-rest-api`, {
       cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
       defaultCorsPreflightOptions: {
@@ -154,10 +161,7 @@ export class ApiToAnyTarget extends CommonConstruct {
         types: [this.isProductionStage() ? EndpointType.EDGE : EndpointType.REGIONAL],
       },
       ...this.props.api.restApi,
-      restApiName: this.resourceNameFormatter.format(
-        this.props.api.restApi?.restApiName,
-        this.props.resourceNameOptions?.apigateway
-      ),
+      restApiName,
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiToAnyTargetRestApi.api.restApiId)
     this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiToAnyTargetRestApi.api.root.resourceId)

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

@@ -94,7 +94,6 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     this.createApiToEventBridgeTargetIntegrationResponse()
     this.createApiToEventBridgeTargetIntegrationErrorResponse()
     this.createApiToEventBridgeTargetIntegration()
-    this.createApiToEventBridgeTargetRestApiLogGroup()
     this.createApiToEventBridgeTargetRestApi()
     this.createApiToEventBridgeTargetResource()
     this.createApiToEventBridgeTargetResponseModel()
@@ -178,7 +177,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}-api-to-event-bridge-target`,
+        logGroupName: `${this.id}-api-to-event-bridge-target-${this.props.stage}`,
       },
       ...this.props.event.logGroup,
     })
@@ -354,17 +353,6 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     }
   }
 
-  protected createApiToEventBridgeTargetRestApiLogGroup() {
-    this.apiToEventBridgeTargetRestApi.accessLogGroup = this.logManager.createLogGroup(
-      `${this.id}-rest-api-access-log`,
-      this,
-      {
-        logGroupName: `${this.id}-access`,
-        removalPolicy: RemovalPolicy.DESTROY,
-      }
-    )
-  }
-
   /**
    * @summary Method to create rest restApi for Api
    */
@@ -380,6 +368,25 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
 
     if (!this.props.api.restApi?.restApiName) throw `RestApi name undefined for ${this.id}`
 
+    const restApiName = this.resourceNameFormatter.format(
+      this.props.api.restApi?.restApiName,
+      this.props.resourceNameOptions?.apigateway
+    )
+
+    const restApiAccessLogName = this.resourceNameFormatter.format(
+      `${this.props.api.restApi?.restApiName}-access`,
+      this.props.resourceNameOptions?.apigateway
+    )
+
+    this.apiToEventBridgeTargetRestApi.accessLogGroup = this.logManager.createLogGroup(
+      `${this.id}-rest-api-access-log`,
+      this,
+      {
+        logGroupName: restApiAccessLogName,
+        removalPolicy: RemovalPolicy.DESTROY,
+      }
+    )
+
     this.apiToEventBridgeTargetRestApi.api = new RestApi(this, `${this.id}-rest-api`, {
       cloudWatchRole: this.props.api.restApi?.cloudWatchRole ?? true,
       defaultCorsPreflightOptions: {
@@ -409,10 +416,7 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
         types: [EndpointType.REGIONAL],
       },
       ...this.props.api.restApi,
-      restApiName: this.resourceNameFormatter.format(
-        this.props.api.restApi?.restApiName,
-        this.props.resourceNameOptions?.apigateway
-      ),
+      restApiName,
     })
 
     this.addCfnOutput(`${this.id}-restApiId`, this.apiToEventBridgeTargetRestApi.api.restApiId)

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

@@ -274,7 +274,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinationLogGroupSuccess() {
     if (this.props.api.useExisting) return
     this.apiEvent.logGroupSuccess = this.logManager.createLogGroup(`${this.id}-destination-success-log`, this, {
-      logGroupName: `${this.id}-destination`,
+      logGroupName: `${this.id}-destination-${this.props.stage}`,
       ...this.props.event.logGroupSuccess,
     })
   }
@@ -314,7 +314,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
   protected createApiDestinationLogGroupFailure() {
     if (this.props.api.useExisting) return
     this.apiEvent.logGroupFailure = this.logManager.createLogGroup(`${this.id}-destination-failure-log`, this, {
-      logGroupName: `${this.id}-destination-failure`,
+      logGroupName: `${this.id}-destination-failure-${this.props.stage}`,
       ...this.props.event.logGroupFailure,
     })
   }
@@ -508,13 +508,23 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
       return
     }
 
-    const accessLogGroup = this.logManager.createLogGroup(`${this.id}-sns-rest-api-access-log`, this, {
-      logGroupName: `${this.id}-access`,
+    if (!this.props.api.restApi?.restApiName) throw `RestApi name undefined for ${this.id}`
+
+    const restApiName = this.resourceNameFormatter.format(
+      this.props.api.restApi?.restApiName,
+      this.props.resourceNameOptions?.apigateway
+    )
+
+    const restApiAccessLogName = this.resourceNameFormatter.format(
+      `${this.props.api.restApi?.restApiName}-access`,
+      this.props.resourceNameOptions?.apigateway
+    )
+
+    const accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
+      logGroupName: restApiAccessLogName,
       removalPolicy: RemovalPolicy.DESTROY,
     })
 
-    if (!this.props.api.restApi?.restApiName) throw `RestApi name undefined for ${this.id}`
-
     this.apiDestinedRestApi.api = new RestApi(this, `${this.id}-sns-rest-api`, {
       defaultCorsPreflightOptions: {
         allowHeaders: Cors.DEFAULT_HEADERS,
@@ -538,10 +548,7 @@ export class ApiToEventBridgeTargetWithSns extends CommonConstruct {
         types: [EndpointType.REGIONAL],
       },
       ...this.props.api,
-      restApiName: this.resourceNameFormatter.format(
-        this.props.api.restApi?.restApiName,
-        this.props.resourceNameOptions?.apigateway
-      ),
+      restApiName,
     })
     this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId)
     this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiDestinedRestApi.api.root.resourceId)

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

@@ -1,11 +1,5 @@
-import { Fn, RemovalPolicy } from 'aws-cdk-lib'
-import {
-  BasePathMapping,
-  LambdaIntegration,
-  LogGroupLogDestination,
-  Resource,
-  RestApi,
-} from 'aws-cdk-lib/aws-apigateway'
+import { Fn } from 'aws-cdk-lib'
+import { BasePathMapping, LambdaIntegration, Resource, RestApi } from 'aws-cdk-lib/aws-apigateway'
 import { PolicyDocument, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam'
 import { Function } from 'aws-cdk-lib/aws-lambda'
 import { ISecret } from 'aws-cdk-lib/aws-secretsmanager'
@@ -155,11 +149,6 @@ export class ApiToLambdaTarget extends CommonConstruct {
       return
     }
 
-    const accessLogGroup = this.logManager.createLogGroup(`${this.id}-rest-api-access-log`, this, {
-      logGroupName: `${this.id}-access`,
-      removalPolicy: RemovalPolicy.DESTROY,
-    })
-
     this.props.api.restApi = {
       ...this.props.api.restApi,
       defaultMethodOptions: {
@@ -168,9 +157,6 @@ export class ApiToLambdaTarget extends CommonConstruct {
           this.apiToLambdaTargetRestApi.methodErrorResponse,
         ],
       },
-      deployOptions: {
-        accessLogDestination: new LogGroupLogDestination(accessLogGroup),
-      },
     }
 
     this.apiToLambdaTargetRestApi.api = this.apiManager.createLambdaRestApi(

package/src/lib/aws/services/api-gateway/main.ts

@@ -1,4 +1,4 @@
-import { Tags, Size } from 'aws-cdk-lib'
+import { RemovalPolicy, Size, Tags } from 'aws-cdk-lib'
 import {
   Cors,
   Deployment,
@@ -9,8 +9,9 @@ import {
   IRestApi,
   Integration,
   LambdaRestApi,
-  SecurityPolicy,
+  LogGroupLogDestination,
   MethodResponse,
+  SecurityPolicy,
 } from 'aws-cdk-lib/aws-apigateway'
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
 import { IFunction } from 'aws-cdk-lib/aws-lambda'
@@ -48,12 +49,27 @@ export class ApiManager {
     if (!props) throw `Api props undefined for ${id}`
     if (!props.restApiName) throw `Api restApiName undefined for ${id}`
 
+    const restApiName = scope.resourceNameFormatter.format(
+      props.restApiName,
+      scope.props.resourceNameOptions?.apigateway
+    )
+    const restApiAccessLogName = scope.resourceNameFormatter.format(
+      `${props.restApiName}-access`,
+      scope.props.resourceNameOptions?.apigateway
+    )
+
+    const accessLogGroup = scope.logManager.createLogGroup(`${id}-rest-api-access-log`, scope, {
+      logGroupName: restApiAccessLogName,
+      removalPolicy: RemovalPolicy.DESTROY,
+    })
+
     const api = new LambdaRestApi(scope, `${id}`, {
       ...props,
       cloudWatchRole: props.cloudWatchRole || false,
       deploy: props.deploy || true,
       deployOptions: {
         ...props.deployOptions,
+        accessLogDestination: new LogGroupLogDestination(accessLogGroup),
         description: `${id} - ${scope.props.stage} stage`,
         stageName: scope.props.stage,
       },
@@ -65,7 +81,7 @@ export class ApiManager {
       handler: lambdaFunction,
       minCompressionSize: props.minCompressionSizeInBytes ? Size.bytes(props.minCompressionSizeInBytes) : undefined,
       proxy: props.proxy ?? true,
-      restApiName: scope.resourceNameFormatter.format(props.restApiName, scope.props.resourceNameOptions?.apigateway),
+      restApiName,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {

package/src/lib/aws/services/cloudwatch/logs.ts

@@ -64,7 +64,7 @@ export class LogManager {
 
     const logGroup = new logs.CfnLogGroup(scope, `${id}`, {
       ...props,
-      logGroupName: `${scope.resourceNameFormatter.format(props.logGroupName, scope.props.resourceNameOptions?.logs)}`,
+      logGroupName: props.logGroupName,
       retentionInDays: props.retention,
     })
 
@@ -91,7 +91,7 @@ export class LogManager {
 
     const logGroup = new logs.LogGroup(scope, `${id}`, {
       ...props,
-      logGroupName: `${scope.resourceNameFormatter.format(props.logGroupName, scope.props.resourceNameOptions?.logs)}`,
+      logGroupName: props.logGroupName,
       removalPolicy: props.removalPolicy ?? cdk.RemovalPolicy.DESTROY,
       retention: props.retention,
     })

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

@@ -147,7 +147,7 @@ export class LambdaManager {
       handler: handler || 'index.lambda_handler',
       layers,
       logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
-        logGroupName: props.functionName,
+        logGroupName: functionName,
         removalPolicy: RemovalPolicy.DESTROY,
         retention: scope.props.logRetention ?? logRetention,
       }),
@@ -306,7 +306,7 @@ export class LambdaManager {
       filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
       functionName,
       logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
-        logGroupName: props.functionName,
+        logGroupName: functionName,
         removalPolicy: RemovalPolicy.DESTROY,
         retention: scope.props.logRetention ?? logRetention,
       }),