chore: enforce trailing comma style (#536)

To help reduce line diffs in the future.

---

_By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license_

.projenrc.ts

@@ -5,6 +5,7 @@ import {
   DependencyType,
   ReleasableCommits,
 } from "projen";
+import { TrailingComma } from "projen/lib/javascript";
 
 const CDK_VERSION = "2.112.0";
 
@@ -75,13 +76,18 @@ _By submitting this pull request, I confirm that my contribution is made under t
 
   // Code linting config
   prettier: true,
+  prettierOptions: {
+    settings: {
+      trailingComma: TrailingComma.ALL,
+    },
+  },
 });
 
 // Experimental modules
 ["@aws-cdk/aws-redshift-alpha"].forEach((dep) => {
   project.deps.addDependency(
     `${dep}@${CDK_VERSION}-alpha.0`,
-    DependencyType.DEVENV
+    DependencyType.DEVENV,
   );
 });
 // https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60310

lib/common/alarm/AlarmFactory.ts

@@ -545,26 +545,26 @@ export class AlarmFactory {
       new AlarmNamingStrategy(
         props.globalAlarmDefaults.alarmNamePrefix,
         props.localAlarmNamePrefix,
-        props.globalAlarmDefaults.dedupeStringProcessor
+        props.globalAlarmDefaults.dedupeStringProcessor,
       );
   }
 
   addAlarm(
     metric: MetricWithAlarmSupport,
-    props: AddAlarmProps
+    props: AddAlarmProps,
   ): AlarmWithAnnotation {
     // adjust the metric
 
     const metricAdjuster = props.metricAdjuster
       ? CompositeMetricAdjuster.of(
           props.metricAdjuster,
-          DefaultMetricAdjuster.INSTANCE
+          DefaultMetricAdjuster.INSTANCE,
         )
       : DefaultMetricAdjuster.INSTANCE;
     const adjustedMetric = metricAdjuster.adjustMetric(
       metric,
       this.alarmScope,
-      props
+      props,
     );
 
     // metric that will be ultimately used to create the alarm
@@ -574,11 +574,11 @@ export class AlarmFactory {
 
     const actionsEnabled = this.determineActionsEnabled(
       props.actionsEnabled,
-      props.disambiguator
+      props.disambiguator,
     );
     const action = this.determineAction(
       props.disambiguator,
-      props.actionOverride
+      props.actionOverride,
     );
     const alarmName = this.alarmNamingStrategy.getName(props);
     const alarmNameSuffix = props.alarmNameSuffix;
@@ -587,7 +587,7 @@ export class AlarmFactory {
       props.alarmDescription,
       props.alarmDescriptionOverride,
       props.runbookLink,
-      props.documentationLink
+      props.documentationLink,
     );
     const dedupeString = this.alarmNamingStrategy.getDedupeString(props);
     const evaluateLowSampleCountPercentile =
@@ -604,7 +604,7 @@ export class AlarmFactory {
 
     if (evaluationPeriods < datapointsToAlarm) {
       throw new Error(
-        `evaluationPeriods must be greater than or equal to datapointsToAlarm for ${alarmName}`
+        `evaluationPeriods must be greater than or equal to datapointsToAlarm for ${alarmName}`,
       );
     }
 
@@ -639,7 +639,7 @@ export class AlarmFactory {
           metricSampleCountId = props.sampleCountMetricId;
         } else {
           throw new Error(
-            "sampleCountMetricId must be specified when using minSampleCountToEvaluateDatapoint with a multiple-metric MathExpression"
+            "sampleCountMetricId must be specified when using minSampleCountToEvaluateDatapoint with a multiple-metric MathExpression",
           );
         }
       } else {
@@ -704,18 +704,18 @@ export class AlarmFactory {
           datapointsToAlarm: 1,
           evaluationPeriods: 1,
           actionsEnabled,
-        }
+        },
       );
       alarm = new CompositeAlarm(this.alarmScope, `${alarmName}-WithSamples`, {
         actionsEnabled,
         compositeAlarmName: `${alarmName}-WithSamples`,
         alarmDescription: this.joinDescriptionParts(
           alarmDescription,
-          `Min number of samples to alarm: ${props.minMetricSamplesToAlarm}`
+          `Min number of samples to alarm: ${props.minMetricSamplesToAlarm}`,
         ),
         alarmRule: AlarmRule.allOf(
           AlarmRule.fromAlarm(primaryAlarm, AlarmState.ALARM),
-          AlarmRule.not(AlarmRule.fromAlarm(noSamplesAlarm, AlarmState.ALARM))
+          AlarmRule.not(AlarmRule.fromAlarm(noSamplesAlarm, AlarmState.ALARM)),
         ),
       });
     }
@@ -769,7 +769,7 @@ export class AlarmFactory {
       alarmRuleWhenAlarming: AlarmRule.fromAlarm(alarm, AlarmState.ALARM),
       alarmRuleWhenInsufficientData: AlarmRule.fromAlarm(
         alarm,
-        AlarmState.INSUFFICIENT_DATA
+        AlarmState.INSUFFICIENT_DATA,
       ),
       dedupeString,
       annotation,
@@ -779,11 +779,11 @@ export class AlarmFactory {
 
   addCompositeAlarm(
     alarms: AlarmWithAnnotation[],
-    props: AddCompositeAlarmProps
+    props: AddCompositeAlarmProps,
   ): CompositeAlarm {
     const actionsEnabled = this.determineActionsEnabled(
       props?.actionsEnabled,
-      props?.disambiguator
+      props?.disambiguator,
     );
     const action =
       props.actionOverride ?? this.globalAlarmDefaults.action ?? noopAction();
@@ -793,7 +793,7 @@ export class AlarmFactory {
       props?.alarmDescription ?? "Composite alarm",
       props?.alarmDescriptionOverride,
       props?.runbookLink,
-      props?.documentationLink
+      props?.documentationLink,
     );
     const dedupeString = this.alarmNamingStrategy.getDedupeString(namingInput);
     const alarmRule = this.determineCompositeAlarmRule(alarms, props);
@@ -822,7 +822,7 @@ export class AlarmFactory {
 
   protected determineCompositeAlarmRule(
     alarms: AlarmWithAnnotation[],
-    props: AddCompositeAlarmProps
+    props: AddCompositeAlarmProps,
   ): IAlarmRule {
     const alarmRules = alarms.map((alarm) => alarm.alarmRuleWhenAlarming);
     const operator = props.compositeOperator ?? CompositeAlarmOperator.OR;
@@ -838,7 +838,7 @@ export class AlarmFactory {
 
   protected determineActionsEnabled(
     actionsEnabled?: boolean,
-    disambiguator?: string
+    disambiguator?: string,
   ): boolean {
     if (actionsEnabled !== undefined) {
       // alarm-specific override to true or false
@@ -857,7 +857,7 @@ export class AlarmFactory {
 
   protected determineAction(
     disambiguator?: string,
-    actionOverride?: IAlarmActionStrategy
+    actionOverride?: IAlarmActionStrategy,
   ): IAlarmActionStrategy {
     // Explicit override
     if (actionOverride) {
@@ -888,7 +888,7 @@ export class AlarmFactory {
     alarmDescription: string,
     alarmDescriptionOverride?: string,
     runbookLinkOverride?: string,
-    documentationLinkOverride?: string
+    documentationLinkOverride?: string,
   ) {
     const parts = [alarmDescriptionOverride ?? alarmDescription];
 

lib/common/alarm/AlarmNamingStrategy.ts

@@ -15,7 +15,7 @@ export class AlarmNamingStrategy implements IAlarmNamingStrategy {
   constructor(
     globalPrefix: string,
     localPrefix: string,
-    dedupeStringStrategy?: IAlarmDedupeStringProcessor
+    dedupeStringStrategy?: IAlarmDedupeStringProcessor,
   ) {
     this.globalPrefix = globalPrefix;
     this.localPrefix = localPrefix;
@@ -71,7 +71,7 @@ export class AlarmNamingStrategy implements IAlarmNamingStrategy {
   getDedupeString(props: AlarmNamingInput) {
     if (props.dedupeStringOverride) {
       return this.dedupeStringStrategy.processDedupeStringOverride(
-        props.dedupeStringOverride
+        props.dedupeStringOverride,
       );
     }
 

lib/common/alarm/IAlarmAnnotationStrategy.ts

@@ -59,11 +59,11 @@ export abstract class FillingAlarmAnnotationStrategy
   }
 
   protected abstract createAnnotationToFill(
-    props: AlarmAnnotationStrategyProps
+    props: AlarmAnnotationStrategyProps,
   ): HorizontalAnnotation;
 
   protected getAlarmingRangeShade(
-    props: AlarmAnnotationStrategyProps
+    props: AlarmAnnotationStrategyProps,
   ): Shading | undefined {
     switch (props.comparisonOperator) {
       case ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD:
@@ -87,7 +87,7 @@ export abstract class FillingAlarmAnnotationStrategy
  */
 export class DefaultAlarmAnnotationStrategy extends FillingAlarmAnnotationStrategy {
   protected createAnnotationToFill(
-    props: AlarmAnnotationStrategyProps
+    props: AlarmAnnotationStrategyProps,
   ): HorizontalAnnotation {
     return props.alarm.toAnnotation();
   }

lib/common/alarm/action/MultipleAlarmActionStrategy.ts

@@ -8,7 +8,7 @@ export function multipleActions(...actions: IAlarmActionStrategy[]) {
 }
 
 export function isMultipleAlarmActionStrategy(
-  obj?: any
+  obj?: any,
 ): obj is MultipleAlarmActionStrategy {
   return !!(obj && obj instanceof MultipleAlarmActionStrategy);
 }

lib/common/alarm/action/OpsItemAlarmActionStrategy.ts

@@ -52,7 +52,7 @@ export function createLowSeverityOpsItem(category?: OpsItemCategory) {
  */
 export function createOpsItem(
   severity: OpsItemSeverity,
-  category?: OpsItemCategory
+  category?: OpsItemCategory,
 ) {
   return new OpsItemAlarmActionStrategy(severity, category);
 }

lib/common/alarm/action/SnsAlarmActionStrategy.ts

@@ -9,7 +9,7 @@ import {
 export function notifySns(
   onAlarmTopic: ITopic,
   onOkTopic?: ITopic,
-  onInsufficientDataTopic?: ITopic
+  onInsufficientDataTopic?: ITopic,
 ): IAlarmActionStrategy {
   return new SnsAlarmActionStrategy({
     onAlarmTopic,
@@ -62,7 +62,7 @@ export class SnsAlarmActionStrategy implements IAlarmActionStrategy {
 
     if (this.onInsufficientDataTopic) {
       props.alarm.addInsufficientDataAction(
-        new SnsAction(this.onInsufficientDataTopic)
+        new SnsAction(this.onInsufficientDataTopic),
       );
     }
   }

lib/common/alarm/metric-adjuster/CompositeMetricAdjuster.ts

@@ -17,7 +17,7 @@ export class CompositeMetricAdjuster implements IMetricAdjuster {
   adjustMetric(
     metric: MetricWithAlarmSupport,
     alarmScope: Construct,
-    props: AddAlarmProps
+    props: AddAlarmProps,
   ): MetricWithAlarmSupport {
     let adjustedMetric = metric;
     for (const adjuster of this.adjusters) {

lib/common/alarm/metric-adjuster/DefaultMetricAdjuster.ts

@@ -15,7 +15,7 @@ export class DefaultMetricAdjuster implements IMetricAdjuster {
   adjustMetric(
     metric: MetricWithAlarmSupport,
     _: Construct,
-    props: AddAlarmProps
+    props: AddAlarmProps,
   ): MetricWithAlarmSupport {
     let adjustedMetric = metric;
     if (props.period) {

lib/common/alarm/metric-adjuster/IMetricAdjuster.ts

@@ -16,6 +16,6 @@ export interface IMetricAdjuster {
   adjustMetric(
     metric: MetricWithAlarmSupport,
     alarmScope: Construct,
-    props: AddAlarmProps
+    props: AddAlarmProps,
   ): MetricWithAlarmSupport;
 }

lib/common/alarm/metric-adjuster/Route53HealthCheckMetricAdjuster.ts

@@ -29,12 +29,12 @@ export class Route53HealthCheckMetricAdjuster implements IMetricAdjuster {
   adjustMetric(
     metric: MetricWithAlarmSupport,
     alarmScope: Construct,
-    props: AddAlarmProps
+    props: AddAlarmProps,
   ): MetricWithAlarmSupport {
     // Route53 health checks do not support composite alarms
     if (props.minMetricSamplesToAlarm) {
       throw new Error(
-        "Alarms with 'minMetricSamplesToAlarm' are not supported."
+        "Alarms with 'minMetricSamplesToAlarm' are not supported.",
       );
     }
 
@@ -57,7 +57,7 @@ export class Route53HealthCheckMetricAdjuster implements IMetricAdjuster {
     // Route53 health checks only support a subset of statistics
     if (!SUPPORTED_STATS.has(statistic)) {
       throw new Error(
-        `Metrics with statistic '${statistic}' are not supported.`
+        `Metrics with statistic '${statistic}' are not supported.`,
       );
     }
 

lib/common/metric/AnomalyDetectionMathExpression.ts

@@ -54,7 +54,7 @@ export class AnomalyDetectionMathExpression extends MathExpression {
         }
 
         cfnAlarm.addPropertyOverride(`Metrics.${index}.ReturnData`, returnData);
-      }
+      },
     );
 
     return alarm;

lib/common/metric/BaseMetricFactory.ts

@@ -5,7 +5,7 @@ export interface BaseMetricFactoryProps {
 }
 
 export abstract class BaseMetricFactory<
-  PropsType extends BaseMetricFactoryProps
+  PropsType extends BaseMetricFactoryProps,
 > {
   protected readonly metricFactory: MetricFactory;