@gradientedge/cdk-utils 8.124.0 → 8.125.0

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

@@ -46,42 +46,22 @@ export class ApiManager {
   public createLambdaRestApi(id: string, scope: CommonConstruct, props: LambdaRestApiProps, lambdaFunction: IFunction) {
     if (!props) throw `Api props undefined for ${id}`
     const api = new LambdaRestApi(scope, `${id}`, {
-      binaryMediaTypes: props.binaryMediaTypes,
+      ...props,
       cloudWatchRole: props.cloudWatchRole || false,
-      defaultCorsPreflightOptions: props.defaultCorsPreflightOptions,
-      defaultMethodOptions: props.defaultMethodOptions,
       deploy: props.deploy || true,
       deployOptions: {
-        accessLogDestination: props.deployOptions?.accessLogDestination,
-        accessLogFormat: props.deployOptions?.accessLogFormat,
-        cacheClusterEnabled: props.deployOptions?.cacheClusterEnabled,
-        cacheClusterSize: props.deployOptions?.cacheClusterSize,
-        cachingEnabled: props.deployOptions?.cachingEnabled,
-        clientCertificateId: props.deployOptions?.clientCertificateId,
-        dataTraceEnabled: props.deployOptions?.dataTraceEnabled,
+        ...props.deployOptions,
         description: `${id} - ${scope.props.stage} stage`,
-        documentationVersion: props.deployOptions?.documentationVersion,
-        loggingLevel: props.deployOptions?.loggingLevel,
-        methodOptions: props.deployOptions?.methodOptions,
-        metricsEnabled: props.deployOptions?.metricsEnabled,
         stageName: scope.props.stage,
-        tracingEnabled: props.deployOptions?.tracingEnabled,
-        variables: props.deployOptions?.variables,
       },
-      domainName: props.domainName,
       endpointConfiguration: {
+        ...props.endpointConfiguration,
         types: props.endpointConfiguration?.types || [EndpointType.REGIONAL],
-        vpcEndpoints: props.endpointConfiguration?.vpcEndpoints,
       },
-      endpointTypes: props.endpointTypes,
       failOnWarnings: props.failOnWarnings || false,
       handler: lambdaFunction,
-      minCompressionSize: props.minCompressionSize,
-      parameters: props.parameters,
-      policy: props.policy,
       proxy: props.proxy ?? true,
       restApiName: `${props.restApiName}-${scope.props.stage}`,
-      retainDeployments: props.retainDeployments,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {
@@ -105,8 +85,8 @@ export class ApiManager {
    */
   public createApiDomain(id: string, scope: CommonConstruct, domainName: string, certificate: ICertificate) {
     const apiDomain = new DomainName(scope, `${id}`, {
-      certificate: certificate,
-      domainName: domainName,
+      certificate,
+      domainName,
       endpointType: scope.isProductionStage() ? EndpointType.EDGE : EndpointType.REGIONAL,
       securityPolicy: SecurityPolicy.TLS_1_2,
     })
@@ -189,11 +169,11 @@ export class ApiManager {
    * @summary Method to create an api deployment
    * @param id
    * @param scope
-   * @param restApi
+   * @param api
    */
-  public createApiDeployment(id: string, scope: CommonConstruct, restApi: IRestApi) {
+  public createApiDeployment(id: string, scope: CommonConstruct, api: IRestApi) {
     new Deployment(scope, `${id}`, {
-      api: restApi,
+      api,
       retainDeployments: false,
     })
   }

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

@@ -50,9 +50,8 @@ export class AppConfigManager {
     if (!props) throw `AppConfig props undefined for ${id}`
 
     const application = new CfnApplication(scope, `${id}`, {
-      description: props.application.description,
+      ...props.application,
       name: `${props.application.name}-${scope.props.stage}`,
-      tags: props.application.tags,
     })
 
     createCfnOutput(`${id}-ApplicationId`, scope, Fn.ref(application.logicalId))
@@ -78,11 +77,9 @@ export class AppConfigManager {
     if (!props) throw `AppConfig props undefined for ${id}`
 
     const environment = new CfnEnvironment(scope, `${id}`, {
-      applicationId: applicationId,
-      description: props.environment.description,
-      monitors: props.environment.monitors,
+      ...props.environment,
+      applicationId,
       name: props.environment.name ?? scope.props.stage,
-      tags: props.environment.tags,
     })
 
     createCfnOutput(`${id}-configurationEnvironmentId`, scope, Fn.ref(environment.logicalId))
@@ -93,7 +90,7 @@ export class AppConfigManager {
 
   /**
    * @summary Method to create an AppConfig Configuration Profile for a given application
-   * - <p>&#9888; The <b>locationUri</b> is defaulted to <i>hosted</i> if undefined</p>
+   * - The <b>locationUri</b> is defaulted to <i>hosted</i> if undefined</p>
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param applicationId id of the application
@@ -109,14 +106,10 @@ export class AppConfigManager {
     if (!props) throw `AppConfig props undefined for ${id}`
 
     const profile = new CfnConfigurationProfile(scope, `${id}`, {
-      applicationId: applicationId,
-      description: props.configurationProfile.description,
+      ...props.configurationProfile,
+      applicationId,
       locationUri: props.configurationProfile.locationUri || 'hosted',
       name: `${props.configurationProfile.name}-${scope.props.stage}`,
-      retrievalRoleArn: props.configurationProfile.retrievalRoleArn,
-      tags: props.configurationProfile.tags,
-      type: props.configurationProfile.type,
-      validators: props.configurationProfile.validators,
     })
 
     createCfnOutput(`${id}-configurationProfileId`, scope, Fn.ref(profile.logicalId))

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

@@ -87,12 +87,9 @@ export class CloudFrontManager {
     if (!props) throw `CloudFront props undefined for ${id}`
 
     const distribution = new CloudFrontWebDistribution(scope, `${id}`, {
+      ...props,
       comment: `${id} - ${scope.props.stage} stage`,
-      defaultRootObject: props.defaultRootObject,
-      enableIpV6: props.enableIpV6,
       enabled: props.enabled ?? true,
-      errorConfigurations: props.errorConfigurations,
-      geoRestriction: props.geoRestriction,
       httpVersion: props.httpVersion ?? HttpVersion.HTTP2,
       loggingConfig: {
         bucket: logBucket,
@@ -113,7 +110,6 @@ export class CloudFrontManager {
         securityPolicy: SecurityPolicyProtocol.TLS_V1_1_2016,
         sslMethod: SSLMethod.SNI,
       }),
-      webACLId: props.webACLId,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {
@@ -154,31 +150,23 @@ export class CloudFrontManager {
     defaultFunctionAssociations?: FunctionAssociation[]
   ) {
     const distribution = new Distribution(scope, `${id}`, {
-      additionalBehaviors: props.additionalBehaviors,
-      certificate: certificate,
+      ...props,
+      certificate,
       comment: `${id} - ${scope.props.stage} stage`,
       defaultBehavior: {
-        cachePolicy: props.defaultBehavior ? props.defaultBehavior.cachePolicy : undefined,
-        edgeLambdas: props.defaultBehavior ? props.defaultBehavior.edgeLambdas : undefined,
+        ...props.defaultBehavior,
         functionAssociations: defaultFunctionAssociations ?? undefined,
-        origin: origin,
-        originRequestPolicy: props.defaultBehavior ? props.defaultBehavior.originRequestPolicy : undefined,
-        viewerProtocolPolicy: props.defaultBehavior ? props.defaultBehavior.viewerProtocolPolicy : undefined,
+        origin,
       },
-      defaultRootObject: props.defaultRootObject,
       domainNames: aliases,
-      enableIpv6: props.enableIpv6,
       enableLogging: props.enableLogging ?? true,
       enabled: props.enabled ?? true,
-      errorResponses: props.errorResponses,
-      geoRestriction: props.geoRestriction,
       httpVersion: props.httpVersion ?? HttpVersion.HTTP2,
-      logBucket: logBucket,
+      logBucket,
       logFilePrefix: props.logFilePrefix ?? `edge/`,
       logIncludesCookies: props.logIncludesCookies ?? true,
       minimumProtocolVersion: props.minimumProtocolVersion ?? SecurityPolicyProtocol.TLS_V1_2_2021,
       priceClass: props.priceClass ?? PriceClass.PRICE_CLASS_ALL,
-      webAclId: props.webAclId,
     })
 
     if (props.tags && !_.isEmpty(props.tags)) {

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

@@ -53,9 +53,9 @@ export class CloudTrailManager {
     const role = scope.iamManager.createRoleForCloudTrail(`${id}Role`, scope, logGroup)
 
     const cloudTrail = new CfnTrail(scope, `${id}`, {
+      ...props,
       cloudWatchLogsLogGroupArn: logGroup.attrArn,
       cloudWatchLogsRoleArn: role.attrArn,
-      enableLogFileValidation: props.enableLogFileValidation,
       eventSelectors: [
         {
           dataResources: [
@@ -68,9 +68,6 @@ export class CloudTrailManager {
           readWriteType: 'WriteOnly',
         },
       ],
-      includeGlobalServiceEvents: props.includeGlobalServiceEvents,
-      isLogging: props.isLogging,
-      isMultiRegionTrail: props.isMultiRegionTrail,
       s3BucketName: logBucket.bucketName,
       s3KeyPrefix: `logs-${props.trailName}`,
       tags: [{ key: 'service', value: scope.props.name }],

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)
@@ -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)