Skip to content

Commit cf26388

Browse files
author
Eugene Cheung
authored
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_
1 parent 8e1f062 commit cf26388

File tree

166 files changed

+1278
-1266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+1278
-1266
lines changed

.prettierrc.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
DependencyType,
66
ReleasableCommits,
77
} from "projen";
8+
import { TrailingComma } from "projen/lib/javascript";
89

910
const CDK_VERSION = "2.112.0";
1011

@@ -75,13 +76,18 @@ _By submitting this pull request, I confirm that my contribution is made under t
7576

7677
// Code linting config
7778
prettier: true,
79+
prettierOptions: {
80+
settings: {
81+
trailingComma: TrailingComma.ALL,
82+
},
83+
},
7884
});
7985

8086
// Experimental modules
8187
["@aws-cdk/aws-redshift-alpha"].forEach((dep) => {
8288
project.deps.addDependency(
8389
`${dep}@${CDK_VERSION}-alpha.0`,
84-
DependencyType.DEVENV
90+
DependencyType.DEVENV,
8591
);
8692
});
8793
// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60310

lib/common/alarm/AlarmFactory.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -545,26 +545,26 @@ export class AlarmFactory {
545545
new AlarmNamingStrategy(
546546
props.globalAlarmDefaults.alarmNamePrefix,
547547
props.localAlarmNamePrefix,
548-
props.globalAlarmDefaults.dedupeStringProcessor
548+
props.globalAlarmDefaults.dedupeStringProcessor,
549549
);
550550
}
551551

552552
addAlarm(
553553
metric: MetricWithAlarmSupport,
554-
props: AddAlarmProps
554+
props: AddAlarmProps,
555555
): AlarmWithAnnotation {
556556
// adjust the metric
557557

558558
const metricAdjuster = props.metricAdjuster
559559
? CompositeMetricAdjuster.of(
560560
props.metricAdjuster,
561-
DefaultMetricAdjuster.INSTANCE
561+
DefaultMetricAdjuster.INSTANCE,
562562
)
563563
: DefaultMetricAdjuster.INSTANCE;
564564
const adjustedMetric = metricAdjuster.adjustMetric(
565565
metric,
566566
this.alarmScope,
567-
props
567+
props,
568568
);
569569

570570
// metric that will be ultimately used to create the alarm
@@ -574,11 +574,11 @@ export class AlarmFactory {
574574

575575
const actionsEnabled = this.determineActionsEnabled(
576576
props.actionsEnabled,
577-
props.disambiguator
577+
props.disambiguator,
578578
);
579579
const action = this.determineAction(
580580
props.disambiguator,
581-
props.actionOverride
581+
props.actionOverride,
582582
);
583583
const alarmName = this.alarmNamingStrategy.getName(props);
584584
const alarmNameSuffix = props.alarmNameSuffix;
@@ -587,7 +587,7 @@ export class AlarmFactory {
587587
props.alarmDescription,
588588
props.alarmDescriptionOverride,
589589
props.runbookLink,
590-
props.documentationLink
590+
props.documentationLink,
591591
);
592592
const dedupeString = this.alarmNamingStrategy.getDedupeString(props);
593593
const evaluateLowSampleCountPercentile =
@@ -604,7 +604,7 @@ export class AlarmFactory {
604604

605605
if (evaluationPeriods < datapointsToAlarm) {
606606
throw new Error(
607-
`evaluationPeriods must be greater than or equal to datapointsToAlarm for ${alarmName}`
607+
`evaluationPeriods must be greater than or equal to datapointsToAlarm for ${alarmName}`,
608608
);
609609
}
610610

@@ -639,7 +639,7 @@ export class AlarmFactory {
639639
metricSampleCountId = props.sampleCountMetricId;
640640
} else {
641641
throw new Error(
642-
"sampleCountMetricId must be specified when using minSampleCountToEvaluateDatapoint with a multiple-metric MathExpression"
642+
"sampleCountMetricId must be specified when using minSampleCountToEvaluateDatapoint with a multiple-metric MathExpression",
643643
);
644644
}
645645
} else {
@@ -704,18 +704,18 @@ export class AlarmFactory {
704704
datapointsToAlarm: 1,
705705
evaluationPeriods: 1,
706706
actionsEnabled,
707-
}
707+
},
708708
);
709709
alarm = new CompositeAlarm(this.alarmScope, `${alarmName}-WithSamples`, {
710710
actionsEnabled,
711711
compositeAlarmName: `${alarmName}-WithSamples`,
712712
alarmDescription: this.joinDescriptionParts(
713713
alarmDescription,
714-
`Min number of samples to alarm: ${props.minMetricSamplesToAlarm}`
714+
`Min number of samples to alarm: ${props.minMetricSamplesToAlarm}`,
715715
),
716716
alarmRule: AlarmRule.allOf(
717717
AlarmRule.fromAlarm(primaryAlarm, AlarmState.ALARM),
718-
AlarmRule.not(AlarmRule.fromAlarm(noSamplesAlarm, AlarmState.ALARM))
718+
AlarmRule.not(AlarmRule.fromAlarm(noSamplesAlarm, AlarmState.ALARM)),
719719
),
720720
});
721721
}
@@ -769,7 +769,7 @@ export class AlarmFactory {
769769
alarmRuleWhenAlarming: AlarmRule.fromAlarm(alarm, AlarmState.ALARM),
770770
alarmRuleWhenInsufficientData: AlarmRule.fromAlarm(
771771
alarm,
772-
AlarmState.INSUFFICIENT_DATA
772+
AlarmState.INSUFFICIENT_DATA,
773773
),
774774
dedupeString,
775775
annotation,
@@ -779,11 +779,11 @@ export class AlarmFactory {
779779

780780
addCompositeAlarm(
781781
alarms: AlarmWithAnnotation[],
782-
props: AddCompositeAlarmProps
782+
props: AddCompositeAlarmProps,
783783
): CompositeAlarm {
784784
const actionsEnabled = this.determineActionsEnabled(
785785
props?.actionsEnabled,
786-
props?.disambiguator
786+
props?.disambiguator,
787787
);
788788
const action =
789789
props.actionOverride ?? this.globalAlarmDefaults.action ?? noopAction();
@@ -793,7 +793,7 @@ export class AlarmFactory {
793793
props?.alarmDescription ?? "Composite alarm",
794794
props?.alarmDescriptionOverride,
795795
props?.runbookLink,
796-
props?.documentationLink
796+
props?.documentationLink,
797797
);
798798
const dedupeString = this.alarmNamingStrategy.getDedupeString(namingInput);
799799
const alarmRule = this.determineCompositeAlarmRule(alarms, props);
@@ -822,7 +822,7 @@ export class AlarmFactory {
822822

823823
protected determineCompositeAlarmRule(
824824
alarms: AlarmWithAnnotation[],
825-
props: AddCompositeAlarmProps
825+
props: AddCompositeAlarmProps,
826826
): IAlarmRule {
827827
const alarmRules = alarms.map((alarm) => alarm.alarmRuleWhenAlarming);
828828
const operator = props.compositeOperator ?? CompositeAlarmOperator.OR;
@@ -838,7 +838,7 @@ export class AlarmFactory {
838838

839839
protected determineActionsEnabled(
840840
actionsEnabled?: boolean,
841-
disambiguator?: string
841+
disambiguator?: string,
842842
): boolean {
843843
if (actionsEnabled !== undefined) {
844844
// alarm-specific override to true or false
@@ -857,7 +857,7 @@ export class AlarmFactory {
857857

858858
protected determineAction(
859859
disambiguator?: string,
860-
actionOverride?: IAlarmActionStrategy
860+
actionOverride?: IAlarmActionStrategy,
861861
): IAlarmActionStrategy {
862862
// Explicit override
863863
if (actionOverride) {
@@ -888,7 +888,7 @@ export class AlarmFactory {
888888
alarmDescription: string,
889889
alarmDescriptionOverride?: string,
890890
runbookLinkOverride?: string,
891-
documentationLinkOverride?: string
891+
documentationLinkOverride?: string,
892892
) {
893893
const parts = [alarmDescriptionOverride ?? alarmDescription];
894894

lib/common/alarm/AlarmNamingStrategy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class AlarmNamingStrategy implements IAlarmNamingStrategy {
1515
constructor(
1616
globalPrefix: string,
1717
localPrefix: string,
18-
dedupeStringStrategy?: IAlarmDedupeStringProcessor
18+
dedupeStringStrategy?: IAlarmDedupeStringProcessor,
1919
) {
2020
this.globalPrefix = globalPrefix;
2121
this.localPrefix = localPrefix;
@@ -71,7 +71,7 @@ export class AlarmNamingStrategy implements IAlarmNamingStrategy {
7171
getDedupeString(props: AlarmNamingInput) {
7272
if (props.dedupeStringOverride) {
7373
return this.dedupeStringStrategy.processDedupeStringOverride(
74-
props.dedupeStringOverride
74+
props.dedupeStringOverride,
7575
);
7676
}
7777

lib/common/alarm/IAlarmAnnotationStrategy.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ export abstract class FillingAlarmAnnotationStrategy
5959
}
6060

6161
protected abstract createAnnotationToFill(
62-
props: AlarmAnnotationStrategyProps
62+
props: AlarmAnnotationStrategyProps,
6363
): HorizontalAnnotation;
6464

6565
protected getAlarmingRangeShade(
66-
props: AlarmAnnotationStrategyProps
66+
props: AlarmAnnotationStrategyProps,
6767
): Shading | undefined {
6868
switch (props.comparisonOperator) {
6969
case ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD:
@@ -87,7 +87,7 @@ export abstract class FillingAlarmAnnotationStrategy
8787
*/
8888
export class DefaultAlarmAnnotationStrategy extends FillingAlarmAnnotationStrategy {
8989
protected createAnnotationToFill(
90-
props: AlarmAnnotationStrategyProps
90+
props: AlarmAnnotationStrategyProps,
9191
): HorizontalAnnotation {
9292
return props.alarm.toAnnotation();
9393
}

lib/common/alarm/action/MultipleAlarmActionStrategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function multipleActions(...actions: IAlarmActionStrategy[]) {
88
}
99

1010
export function isMultipleAlarmActionStrategy(
11-
obj?: any
11+
obj?: any,
1212
): obj is MultipleAlarmActionStrategy {
1313
return !!(obj && obj instanceof MultipleAlarmActionStrategy);
1414
}

lib/common/alarm/action/OpsItemAlarmActionStrategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export function createLowSeverityOpsItem(category?: OpsItemCategory) {
5252
*/
5353
export function createOpsItem(
5454
severity: OpsItemSeverity,
55-
category?: OpsItemCategory
55+
category?: OpsItemCategory,
5656
) {
5757
return new OpsItemAlarmActionStrategy(severity, category);
5858
}

lib/common/alarm/action/SnsAlarmActionStrategy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
export function notifySns(
1010
onAlarmTopic: ITopic,
1111
onOkTopic?: ITopic,
12-
onInsufficientDataTopic?: ITopic
12+
onInsufficientDataTopic?: ITopic,
1313
): IAlarmActionStrategy {
1414
return new SnsAlarmActionStrategy({
1515
onAlarmTopic,
@@ -62,7 +62,7 @@ export class SnsAlarmActionStrategy implements IAlarmActionStrategy {
6262

6363
if (this.onInsufficientDataTopic) {
6464
props.alarm.addInsufficientDataAction(
65-
new SnsAction(this.onInsufficientDataTopic)
65+
new SnsAction(this.onInsufficientDataTopic),
6666
);
6767
}
6868
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class CompositeMetricAdjuster implements IMetricAdjuster {
1717
adjustMetric(
1818
metric: MetricWithAlarmSupport,
1919
alarmScope: Construct,
20-
props: AddAlarmProps
20+
props: AddAlarmProps,
2121
): MetricWithAlarmSupport {
2222
let adjustedMetric = metric;
2323
for (const adjuster of this.adjusters) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class DefaultMetricAdjuster implements IMetricAdjuster {
1515
adjustMetric(
1616
metric: MetricWithAlarmSupport,
1717
_: Construct,
18-
props: AddAlarmProps
18+
props: AddAlarmProps,
1919
): MetricWithAlarmSupport {
2020
let adjustedMetric = metric;
2121
if (props.period) {

0 commit comments

Comments
 (0)