@gradientedge/cdk-utils 8.124.0 → 8.126.0

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

@@ -62,19 +62,14 @@ export class CloudWatchManager {
     })
 
     const expression = new watch.MathExpression({
+      ...props,
       expression: props.expression,
       period: props.periodInSecs ? cdk.Duration.seconds(props.periodInSecs) : cdk.Duration.minutes(5),
       usingMetrics: metrics,
     })
 
     const alarm = expression.createAlarm(scope, `${id}`, {
-      alarmDescription: props.alarmDescription,
-      alarmName: props.alarmName,
-      comparisonOperator: props.comparisonOperator,
-      datapointsToAlarm: props.datapointsToAlarm,
-      evaluationPeriods: props.evaluationPeriods,
-      threshold: props.threshold,
-      treatMissingData: props.treatMissingData,
+      ...props,
     })
 
     utils.createCfnOutput(`${id}-alarmArn`, scope, alarm.alarmArn)
@@ -94,13 +89,7 @@ export class CloudWatchManager {
     if (!props) throw `Alarm props undefined for ${id}`
 
     const alarm = metric.createAlarm(scope, `${id}`, {
-      alarmDescription: props.alarmDescription,
-      alarmName: props.alarmName,
-      comparisonOperator: props.comparisonOperator,
-      datapointsToAlarm: props.datapointsToAlarm,
-      evaluationPeriods: props.evaluationPeriods,
-      threshold: props.threshold,
-      treatMissingData: props.treatMissingData,
+      ...props,
     })
 
     utils.createCfnOutput(`${id}-alarmArn`, scope, alarm.alarmArn)
@@ -120,11 +109,10 @@ export class CloudWatchManager {
     if (!props) throw `Dashboard props undefined for ${id}`
 
     const dashboard = new watch.Dashboard(scope, `${id}`, {
-      dashboardName: props.dashboardName,
+      ...props,
       end: CloudWatchManager.determineTimeRange(props.end),
-      periodOverride: props.periodOverride,
       start: CloudWatchManager.determineTimeRange(props.start),
-      widgets: widgets,
+      widgets,
     })
 
     utils.createCfnOutput(`${id}-dashboardName`, scope, props.dashboardName)
@@ -192,7 +180,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, distributionId }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, distributionId })),
     })
   }
 
@@ -208,7 +196,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, stateMachineArn }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, stateMachineArn })),
     })
   }
 
@@ -225,7 +213,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, eventBusName, ruleName }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, eventBusName, ruleName })),
     })
   }
 
@@ -241,7 +229,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, apiName }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, apiName })),
     })
   }
 
@@ -257,7 +245,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, functionName }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, functionName })),
     })
   }
 
@@ -273,7 +261,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, service }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, service })),
     })
   }
 
@@ -289,7 +277,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, clusterName }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, clusterName })),
     })
   }
 
@@ -312,7 +300,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, clusterName, serviceName }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, clusterName, serviceName })),
     })
   }
 
@@ -328,7 +316,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, loadBalancer }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, loadBalancer })),
     })
   }
 
@@ -344,7 +332,7 @@ export class CloudWatchManager {
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
       ...props,
-      metricProps: _.map(metricProps, { ..._, cacheClusterId }),
+      metricProps: metricProps.map(metricProp => ({ ...metricProp, cacheClusterId })),
     })
   }
 
@@ -357,9 +345,7 @@ export class CloudWatchManager {
   public createTextWidget(id: string, scope: CommonConstruct, props: TextWidgetProps) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.TextWidget({
-      height: props.height,
-      markdown: props.markdown,
-      width: props.width,
+      ...props,
     })
 
     if (props.positionX && props.positionY) widget.position(props.positionX, props.positionY)
@@ -377,14 +363,9 @@ export class CloudWatchManager {
   public createSingleValueWidget(id: string, scope: CommonConstruct, props: NumericWidgetProps, metrics: IMetric[]) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.SingleValueWidget({
-      fullPrecision: props.fullPrecision,
-      height: props.height,
-      metrics: metrics,
+      ...props,
+      metrics,
       region: props.region ?? scope.props.region,
-      setPeriodToTimeRange: props.setPeriodToTimeRange,
-      sparkline: props.sparkline,
-      title: props.title,
-      width: props.width,
     })
 
     if (props.positionX && props.positionY) widget.position(props.positionX, props.positionY)
@@ -402,14 +383,9 @@ export class CloudWatchManager {
   public createGuageWidget(id: string, scope: CommonConstruct, props: GuageWidgetProps, metrics: IMetric[]) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.GaugeWidget({
-      height: props.height,
-      leftYAxis: props.leftYAxis,
-      metrics: metrics,
+      ...props,
+      metrics,
       region: props.region ?? scope.props.region,
-      setPeriodToTimeRange: props.setPeriodToTimeRange,
-      statistic: props.statistic,
-      title: props.title,
-      width: props.width,
     })
 
     if (props.positionX && props.positionY) widget.position(props.positionX, props.positionY)
@@ -434,20 +410,10 @@ export class CloudWatchManager {
   ) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.GraphWidget({
-      height: props.height,
+      ...props,
       left: leftYMetrics,
-      leftAnnotations: props.leftAnnotations,
-      leftYAxis: props.leftYAxis,
-      legendPosition: props.legendPosition,
-      liveData: props.liveData,
       region: props.region ?? scope.props.region,
       right: rightYMetrics,
-      rightAnnotations: props.rightAnnotations,
-      rightYAxis: props.rightYAxis,
-      stacked: props.stacked,
-      title: props.title,
-      view: props.view,
-      width: props.width,
     })
 
     if (props.positionX && props.positionY) widget.position(props.positionX, props.positionY)
@@ -470,10 +436,8 @@ export class CloudWatchManager {
   ) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.AlarmStatusWidget({
-      alarms: alarms,
-      height: props.height,
-      title: props.title,
-      width: props.width,
+      ...props,
+      alarms,
     })
 
     if (props.positionX && props.positionY) widget.position(props.positionX, props.positionY)
@@ -491,14 +455,9 @@ export class CloudWatchManager {
   public createLogQueryWidget(id: string, scope: CommonConstruct, props: LogQueryWidgetProps, logGroupNames: string[]) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.LogQueryWidget({
-      height: props.height,
-      logGroupNames: logGroupNames,
-      queryLines: props.queryLines,
-      queryString: props.queryString,
+      ...props,
+      logGroupNames,
       region: props.region ?? scope.props.region,
-      title: props.title,
-      view: props.view,
-      width: props.width,
     })
 
     if (props.positionX && props.positionY) widget.position(props.positionX, props.positionY)

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

@@ -32,23 +32,8 @@ export class DynamodbManager {
     if (!props) throw `Table props undefined for ${id}`
 
     const table = new Table(scope, `${id}`, {
-      billingMode: props.billingMode,
-      contributorInsightsEnabled: props.contributorInsightsEnabled,
-      encryption: props.encryption,
-      encryptionKey: props.encryptionKey,
-      kinesisStream: props.kinesisStream,
-      partitionKey: props.partitionKey,
-      pointInTimeRecovery: props.pointInTimeRecovery,
-      readCapacity: props.readCapacity,
-      removalPolicy: props.removalPolicy,
-      replicationRegions: props.replicationRegions,
-      replicationTimeout: props.replicationTimeout,
-      sortKey: props.sortKey,
-      stream: props.stream,
+      ...props,
       tableName: `${props.tableName}-${scope.props.stage}`,
-      timeToLiveAttribute: props.timeToLiveAttribute,
-      waitForReplicationToFinish: props.waitForReplicationToFinish,
-      writeCapacity: props.writeCapacity,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {

package/src/lib/aws/services/elastic-container-service/main.ts

@@ -47,13 +47,9 @@ export class EcsManager {
     if (!props) throw `Ecs Cluster props undefined for ${id}`
 
     const ecsCluster = new Cluster(scope, `${id}`, {
-      capacity: props.capacity,
+      ...props,
       clusterName: `${props.clusterName}-${scope.props.stage}`,
-      containerInsights: props.containerInsights,
-      defaultCloudMapNamespace: props.defaultCloudMapNamespace,
-      enableFargateCapacityProviders: props.enableFargateCapacityProviders,
-      executeCommandConfiguration: props.executeCommandConfiguration,
-      vpc: vpc,
+      vpc,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {
@@ -96,41 +92,33 @@ export class EcsManager {
     if (!props) throw `EcsTask props undefined for ${id}`
 
     const ecsTask = new TaskDefinition(scope, `${id}`, {
+      ...props,
       compatibility: Compatibility.FARGATE,
-      cpu: props.cpu,
-      ephemeralStorageGiB: props.ephemeralStorageGiB,
       executionRole: role,
       family: `${props.family}-${scope.props.stage}`,
-      inferenceAccelerators: props.inferenceAccelerators,
-      ipcMode: props.ipcMode,
-      memoryMiB: props.memoryMiB,
       networkMode: NetworkMode.AWS_VPC,
-      pidMode: props.pidMode,
-      placementConstraints: props.placementConstraints,
-      proxyConfiguration: props.proxyConfiguration,
       runtimePlatform: {
         cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? CpuArchitecture.X86_64,
         operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? OperatingSystemFamily.LINUX,
       },
       taskRole: role,
-      volumes: props.volumes,
     })
 
     ecsTask.addContainer('EcsContainer', {
-      command: command,
+      command,
       cpu: props.cpu ? parseInt(props.cpu) : undefined,
       disableNetworking: false,
-      environment: environment,
+      environment,
       image: containerImage,
       logging: LogDriver.awsLogs({
-        logGroup: logGroup,
+        logGroup,
         logRetention: props.logging?.logRetention,
         multilinePattern: props.logging?.multilinePattern,
         streamPrefix: `${id}`,
       }),
       memoryLimitMiB: props.memoryMiB ? parseInt(props.memoryMiB) : undefined,
       privileged: false,
-      secrets: secrets,
+      secrets,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {
@@ -164,29 +152,20 @@ export class EcsManager {
       throw `TaskImageOptions for Ecs Load balanced Fargate Service props undefined for ${id}`
 
     const fargateService = new ApplicationLoadBalancedFargateService(scope, `${id}-ecs-service`, {
+      ...props,
       assignPublicIp: props.assignPublicIp ?? true,
-      certificate: props.certificate,
-      cluster: cluster,
-      cpu: props.cpu,
-      desiredCount: props.desiredCount,
-      domainName: props.domainName,
-      domainZone: props.domainZone,
+      cluster,
       enableECSManagedTags: true,
       healthCheckGracePeriod: props.healthCheckGracePeriod ?? Duration.seconds(60),
-      listenerPort: props.listenerPort,
       loadBalancerName: `${id}-${scope.props.stage}`,
-      memoryLimitMiB: props.memoryLimitMiB,
       runtimePlatform: {
         cpuArchitecture: props.runtimePlatform?.cpuArchitecture ?? CpuArchitecture.X86_64,
         operatingSystemFamily: props.runtimePlatform?.operatingSystemFamily ?? OperatingSystemFamily.LINUX,
       },
       serviceName: `${id}-${scope.props.stage}`,
       taskImageOptions: {
-        containerPort: props.taskImageOptions?.containerPort,
+        ...props.taskImageOptions,
         enableLogging: props.taskImageOptions?.enableLogging ?? true,
-        environment: props.taskImageOptions?.environment,
-        executionRole: props.taskImageOptions?.executionRole,
-        image: props.taskImageOptions.image,
         logDriver:
           props.taskImageOptions?.logDriver ??
           LogDriver.awsLogs({
@@ -195,21 +174,15 @@ export class EcsManager {
             multilinePattern: props.logging?.multilinePattern,
             streamPrefix: `${id}-${scope.props.stage}/ecs`,
           }),
-        secrets: props.taskImageOptions?.secrets,
-        taskRole: props.taskImageOptions?.taskRole,
       },
     })
 
     if (props.healthCheck) {
       fargateService.targetGroup.configureHealthCheck({
+        ...props.healthCheck,
         enabled: props.healthCheck.enabled ?? true,
-        healthyGrpcCodes: props.healthCheck.healthyGrpcCodes,
-        healthyHttpCodes: props.healthCheck.healthyHttpCodes,
-        healthyThresholdCount: props.healthCheck.healthyThresholdCount,
         interval: props.healthCheck.interval ?? Duration.seconds(props.healthCheck.intervalInSecs),
         path: props.healthCheck.path ?? '/',
-        port: props.healthCheck.port,
-        protocol: props.healthCheck.protocol,
         timeout: props.healthCheck.timeout ?? Duration.seconds(props.healthCheck.timeoutInSecs),
         unhealthyThresholdCount: props.healthCheck.unhealthyThresholdCount,
       })

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

@@ -58,24 +58,10 @@ export class ElastiCacheManager {
     const subnetGroup = this.createElastiCacheSubnetGroup(`${id}-subnetGroup`, scope, subnetIds)
 
     const elasticacheCluster = new CfnCacheCluster(scope, `${id}`, {
-      autoMinorVersionUpgrade: props.autoMinorVersionUpgrade,
-      azMode: props.azMode,
-      cacheNodeType: props.cacheNodeType,
-      cacheParameterGroupName: props.cacheParameterGroupName,
-      cacheSecurityGroupNames: props.cacheSecurityGroupNames,
+      ...props,
       cacheSubnetGroupName: subnetGroup.cacheSubnetGroupName,
       clusterName: `${id}-${scope.props.stage}`,
-      engine: props.engine,
-      engineVersion: props.engineVersion,
-      logDeliveryConfigurations: logDeliveryConfigurations,
-      numCacheNodes: props.numCacheNodes,
-      port: props.port,
-      preferredAvailabilityZones: props.preferredAvailabilityZones,
-      preferredMaintenanceWindow: props.preferredMaintenanceWindow,
-      snapshotArns: props.snapshotArns,
-      snapshotName: props.snapshotName,
-      snapshotRetentionLimit: props.snapshotRetentionLimit,
-      snapshotWindow: props.snapshotWindow,
+      logDeliveryConfigurations,
       vpcSecurityGroupIds: securityGroupIds,
     })
 
@@ -114,27 +100,11 @@ export class ElastiCacheManager {
     const subnetGroup = this.createElastiCacheSubnetGroup(`${id}-subnetGroup`, scope, subnetIds)
 
     const elasticacheCluster = new CfnReplicationGroup(scope, `${id}`, {
-      autoMinorVersionUpgrade: props.autoMinorVersionUpgrade,
-      automaticFailoverEnabled: props.automaticFailoverEnabled,
-      cacheNodeType: props.cacheNodeType,
-      cacheParameterGroupName: props.cacheParameterGroupName,
-      cacheSecurityGroupNames: props.cacheSecurityGroupNames,
+      ...props,
       cacheSubnetGroupName: subnetGroup.cacheSubnetGroupName,
-      engine: props.engine,
-      engineVersion: props.engineVersion,
-      globalReplicationGroupId: props.globalReplicationGroupId,
-      logDeliveryConfigurations: props.logDeliveryConfigurations,
-      multiAzEnabled: props.multiAzEnabled,
-      numCacheClusters: props.numCacheClusters,
-      numNodeGroups: props.numNodeGroups,
-      port: props.port,
-      preferredCacheClusterAZs: props.preferredCacheClusterAZs,
-      preferredMaintenanceWindow: props.preferredMaintenanceWindow,
-      primaryClusterId: props.primaryClusterId,
-      replicasPerNodeGroup: props.replicasPerNodeGroup,
       replicationGroupDescription: `${id} Redis Replication Cluster`,
       replicationGroupId: `${id}-${scope.props.stage}`,
-      securityGroupIds: securityGroupIds,
+      securityGroupIds,
     })
 
     elasticacheCluster.addDependency(subnetGroup)

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

@@ -38,6 +38,7 @@ export class EventManager {
     if (!props) throw `EventBus props undefined for ${id}`
 
     const eventBus = new EventBus(scope, `${id}`, {
+      ...props,
       eventBusName: `${props.eventBusName}-${scope.props.stage}`,
     })
 
@@ -65,12 +66,9 @@ export class EventManager {
     if (!props) throw `EventRule props undefined for ${id}`
 
     const rule = new Rule(scope, `${id}`, {
-      description: props.description,
-      enabled: props.enabled,
-      eventBus: eventBus,
-      eventPattern: props.eventPattern,
+      ...props,
+      eventBus,
       ruleName: `${props.ruleName}-${scope.props.stage}`,
-      schedule: props.schedule,
     })
 
     if (targets && !_.isEmpty(targets)) {
@@ -113,12 +111,12 @@ export class EventManager {
     if (!props) throw `EventRule props undefined for ${id}`
 
     const eventRule = new CfnRule(scope, `${id}`, {
+      ...props,
       description: 'Rule to send notification to lambda function target',
-      eventBusName: eventBusName,
-      eventPattern: eventPattern,
+      eventBusName,
+      eventPattern,
       name: `${props.name}-${scope.props.stage}`,
-      scheduleExpression: scheduleExpression,
-      state: props.state,
+      scheduleExpression,
       targets: [
         {
           arn: lambdaFunction.functionArn,
@@ -165,10 +163,10 @@ export class EventManager {
     if (!props) throw `EventRule props undefined for ${id}`
 
     const eventRule = new CfnRule(scope, `${id}`, {
+      ...props,
       description: 'Rule to send notification on new objects in data bucket to ecs task target',
-      eventPattern: eventPattern,
+      eventPattern,
       name: `${props.name}-${scope.props.stage}`,
-      state: props.state,
       targets: [
         {
           arn: cluster.clusterArn,
@@ -216,9 +214,6 @@ export class EventManager {
 
     const pipe = new CfnPipe(scope, `${id}`, {
       ...props,
-      description: props.description,
-      enrichment: props.enrichment,
-      enrichmentParameters: props.enrichmentParameters,
       name: `${props.name}-${scope.props.stage}`,
       roleArn: pipeRole.roleArn,
       source: sourceQueue.queueArn,

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

@@ -30,16 +30,8 @@ export class KmsManager {
     if (!props) throw `KMS Key props undefined for ${id}`
 
     const key = new Key(scope, `${id}`, {
-      admins: props.admins,
+      ...props,
       alias: `${props.alias}-${scope.props.stage}`,
-      description: props.description,
-      enableKeyRotation: props.enableKeyRotation,
-      enabled: props.enabled,
-      keySpec: props.keySpec,
-      keyUsage: props.keyUsage,
-      pendingWindow: props.pendingWindow,
-      policy: props.policy,
-      removalPolicy: props.removalPolicy,
     })
 
     createCfnOutput(`${id}-keyId`, scope, key.keyId)

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

@@ -44,10 +44,12 @@ export class LambdaManager {
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param code
+   * @param architectures
    */
-  public createLambdaLayer(id: string, scope: CommonConstruct, code: AssetCode) {
+  public createLambdaLayer(id: string, scope: CommonConstruct, code: AssetCode, architectures?: Architecture[]) {
     const lambdaLayer = new LayerVersion(scope, `${id}`, {
       code: code,
+      compatibleArchitectures: architectures ?? [Architecture.ARM_64],
       compatibleRuntimes: [scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME],
       description: `${id}`,
       layerVersionName: `${id}-${scope.props.stage}`,
@@ -101,39 +103,36 @@ export class LambdaManager {
 
     const lambdaFunction = new Function(scope, `${id}`, {
       ...props,
-      ...{
-        allowPublicSubnet: !!vpc,
-        architecture: props.architecture ?? Architecture.ARM_64,
-        code: code,
-        deadLetterQueue: deadLetterQueue,
-        environment: {
-          LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
-            ? ''
-            : scope.ssmManager.readStringParameter(
-                `${id}-sm-ts`,
-                scope,
-                `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
-              ),
-          REGION: scope.props.region,
-          STAGE: scope.props.stage,
-          ...environment,
-        },
-        filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
-        functionName: functionName,
-        handler: handler || 'index.lambda_handler',
-        insightsVersion: props.insightsVersion,
-        layers: layers,
-        logRetention: scope.props.logRetention ?? props.logRetention,
-        reservedConcurrentExecutions:
-          props.reservedConcurrentExecutions ?? scope.props.defaultReservedLambdaConcurrentExecutions,
-        role: role instanceof Role ? role : undefined,
-        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
-        securityGroups: securityGroups,
-        timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(15),
-        tracing: scope.props.defaultTracing ?? props.tracing,
-        vpc,
-        vpcSubnets,
+      allowPublicSubnet: !!vpc,
+      architecture: props.architecture ?? Architecture.ARM_64,
+      code,
+      deadLetterQueue,
+      environment: {
+        LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
+          ? ''
+          : scope.ssmManager.readStringParameter(
+              `${id}-sm-ts`,
+              scope,
+              `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
+            ),
+        REGION: scope.props.region,
+        STAGE: scope.props.stage,
+        ...environment,
       },
+      filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
+      functionName,
+      handler: handler || 'index.lambda_handler',
+      layers,
+      logRetention: scope.props.logRetention ?? props.logRetention,
+      reservedConcurrentExecutions:
+        props.reservedConcurrentExecutions ?? scope.props.defaultReservedLambdaConcurrentExecutions,
+      role: role instanceof Role ? role : undefined,
+      runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
+      securityGroups,
+      timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(15),
+      tracing: scope.props.defaultTracing ?? props.tracing,
+      vpc,
+      vpcSubnets,
     })
 
     if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
@@ -254,36 +253,31 @@ export class LambdaManager {
 
     const lambdaFunction = new DockerImageFunction(scope, `${id}`, {
       ...props,
-      ...{
-        allowPublicSubnet: !!vpc,
-        architecture: props.architecture ?? Architecture.ARM_64,
-        code: code,
-        deadLetterQueue: deadLetterQueue,
-        environment: {
-          LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
-            ? ''
-            : scope.ssmManager.readStringParameter(
-                `${id}-sm-ts`,
-                scope,
-                `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
-              ),
-          REGION: scope.props.region,
-          STAGE: scope.props.stage,
-          ...environment,
-        },
-        filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
-        functionName: functionName,
-        insightsVersion: props.insightsVersion,
-        logRetention: scope.props.logRetention ?? props.logRetention,
-        reservedConcurrentExecutions: props.reservedConcurrentExecutions,
-        role: role instanceof Role ? role : undefined,
-        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
-        securityGroups: securityGroups,
-        timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(1),
-        tracing: props.tracing,
-        vpc,
-        vpcSubnets,
+      allowPublicSubnet: !!vpc,
+      architecture: props.architecture ?? Architecture.ARM_64,
+      code,
+      deadLetterQueue,
+      environment: {
+        LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
+          ? ''
+          : scope.ssmManager.readStringParameter(
+              `${id}-sm-ts`,
+              scope,
+              `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
+            ),
+        REGION: scope.props.region,
+        STAGE: scope.props.stage,
+        ...environment,
       },
+      filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
+      functionName,
+      logRetention: scope.props.logRetention ?? props.logRetention,
+      role: role instanceof Role ? role : undefined,
+      securityGroups: securityGroups,
+      timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(1),
+      tracing: props.tracing,
+      vpc,
+      vpcSubnets,
     })
 
     if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
@@ -318,17 +312,7 @@ export class LambdaManager {
 
     const lambdaFunctionAlias = new Alias(scope, `${id}`, {
       ...props,
-      ...{
-        additionalVersions: props.additionalVersions,
-        aliasName: props.aliasName,
-        description: props.description,
-        maxEventAge: props.maxEventAge,
-        onFailure: props.onFailure,
-        onSuccess: props.onSuccess,
-        provisionedConcurrentExecutions: props.provisionedConcurrentExecutions,
-        retryAttempts: props.retryAttempts,
-        version: lambdaVersion,
-      },
+      version: lambdaVersion,
     })
 
     createCfnOutput(`${id}-lambdaAliasName`, scope, lambdaFunctionAlias.functionArn)