Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix formatting in the support-workers.ts CDK lib #6756

Merged
merged 1 commit into from
Feb 3, 2025
+74 −16
Merged

Fix formatting in the support-workers.ts CDK lib #6756

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 74 additions & 16 deletions cdk/lib/support-workers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,20 @@ import {
import { LambdaInvoke } from "aws-cdk-lib/aws-stepfunctions-tasks";

type PaymentProvider = "Stripe" | "DirectDebit" | "PayPal";
type ProductType = "Contribution" | "Paper" | "GuardianWeekly" | "SupporterPlus" | "TierThree";
type ProductType =
| "Contribution"
| "Paper"
| "GuardianWeekly"
| "SupporterPlus"
| "TierThree";

interface SupportWorkersProps extends GuStackProps {
promotionsDynamoTables: string[];
s3Files: string[];
supporterProductDataTables: string[];
eventBusArns: string[];
}

export class SupportWorkers extends GuStack {
constructor(scope: App, id: string, props: SupportWorkersProps) {
super(scope, id, props);
Expand Down Expand Up @@ -321,7 +327,11 @@ export class SupportWorkers extends GuStack {
actionsEnabled: isProd,
snsTopicName: `alarms-handler-topic-${this.stage}`,
alarmName: `support-workers ${this.stage} No successful recurring paypal contributions recently.`,
metric: this.buildPaymentSuccessMetric("PayPal", "Contribution", Duration.seconds(3600)),
metric: this.buildPaymentSuccessMetric(
"PayPal",
"Contribution",
Duration.seconds(3600)
),
comparisonOperator: ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
evaluationPeriods: 4,
treatMissingData: TreatMissingData.BREACHING,
Expand All @@ -333,7 +343,11 @@ export class SupportWorkers extends GuStack {
actionsEnabled: isProd,
snsTopicName: `alarms-handler-topic-${this.stage}`,
alarmName: `support-workers ${this.stage} No successful recurring stripe contributions recently.`,
metric: this.buildPaymentSuccessMetric("Stripe", "Contribution", Duration.seconds(3600)),
metric: this.buildPaymentSuccessMetric(
"Stripe",
"Contribution",
Duration.seconds(3600)
),
comparisonOperator: ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
evaluationPeriods: 3,
treatMissingData: TreatMissingData.BREACHING,
Expand All @@ -345,7 +359,11 @@ export class SupportWorkers extends GuStack {
actionsEnabled: isProd,
snsTopicName: `alarms-handler-topic-${this.stage}`,
alarmName: `support-workers ${this.stage} No successful recurring gocardless contributions recently.`,
metric: this.buildPaymentSuccessMetric("DirectDebit", "Contribution", Duration.seconds(3600)),
metric: this.buildPaymentSuccessMetric(
"DirectDebit",
"Contribution",
Duration.seconds(3600)
),
comparisonOperator: ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
evaluationPeriods: 18,
treatMissingData: TreatMissingData.BREACHING,
Expand All @@ -357,7 +375,11 @@ export class SupportWorkers extends GuStack {
actionsEnabled: isProd,
snsTopicName: `alarms-handler-topic-${this.stage}`,
alarmName: `support-workers ${this.stage} No successful recurring paypal supporter plus contributions recently.`,
metric: this.buildPaymentSuccessMetric("PayPal", "SupporterPlus", Duration.seconds(3600)),
metric: this.buildPaymentSuccessMetric(
"PayPal",
"SupporterPlus",
Duration.seconds(3600)
),
comparisonOperator: ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
evaluationPeriods: 6,
treatMissingData: TreatMissingData.BREACHING,
Expand All @@ -369,7 +391,11 @@ export class SupportWorkers extends GuStack {
actionsEnabled: isProd,
snsTopicName: `alarms-handler-topic-${this.stage}`,
alarmName: `support-workers ${this.stage} No successful recurring stripe supporter plus contributions recently.`,
metric: this.buildPaymentSuccessMetric("Stripe", "SupporterPlus", Duration.seconds(3600)),
metric: this.buildPaymentSuccessMetric(
"Stripe",
"SupporterPlus",
Duration.seconds(3600)
),
comparisonOperator: ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
evaluationPeriods: 3,
treatMissingData: TreatMissingData.BREACHING,
Expand All @@ -381,7 +407,11 @@ export class SupportWorkers extends GuStack {
actionsEnabled: isProd,
snsTopicName: `alarms-handler-topic-${this.stage}`,
alarmName: `support-workers ${this.stage} No successful recurring gocardless supporter plus contributions recently.`,
metric: this.buildPaymentSuccessMetric("DirectDebit", "SupporterPlus", Duration.seconds(3600)),
metric: this.buildPaymentSuccessMetric(
"DirectDebit",
"SupporterPlus",
Duration.seconds(3600)
),
comparisonOperator: ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
evaluationPeriods: 18,
treatMissingData: TreatMissingData.BREACHING,
Expand All @@ -399,9 +429,21 @@ export class SupportWorkers extends GuStack {
expression: "SUM([FILL(m1,0),FILL(m2,0),FILL(m3,0)])",
label: "AllPaperConversions",
usingMetrics: {
m1: this.buildPaymentSuccessMetric("Stripe", "Paper", Duration.seconds(300)),
m2: this.buildPaymentSuccessMetric("DirectDebit", "Paper", Duration.seconds(300)),
m3: this.buildPaymentSuccessMetric("PayPal", "Paper", Duration.seconds(300)),
m1: this.buildPaymentSuccessMetric(
"Stripe",
"Paper",
Duration.seconds(300)
),
m2: this.buildPaymentSuccessMetric(
"DirectDebit",
"Paper",
Duration.seconds(300)
),
m3: this.buildPaymentSuccessMetric(
"PayPal",
"Paper",
Duration.seconds(300)
),
},
}),
comparisonOperator: ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
Expand All @@ -419,9 +461,21 @@ export class SupportWorkers extends GuStack {
label: "AllWeeklyConversions",
expression: "SUM([FILL(m1,0),FILL(m2,0),FILL(m3,0)])",
usingMetrics: {
m1: this.buildPaymentSuccessMetric("Stripe", "GuardianWeekly", Duration.seconds(300)),
m2: this.buildPaymentSuccessMetric("DirectDebit", "GuardianWeekly", Duration.seconds(300)),
m3: this.buildPaymentSuccessMetric("PayPal", "GuardianWeekly", Duration.seconds(300)),
m1: this.buildPaymentSuccessMetric(
"Stripe",
"GuardianWeekly",
Duration.seconds(300)
),
m2: this.buildPaymentSuccessMetric(
"DirectDebit",
"GuardianWeekly",
Duration.seconds(300)
),
m3: this.buildPaymentSuccessMetric(
"PayPal",
"GuardianWeekly",
Duration.seconds(300)
),
},
}),
comparisonOperator: ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,
Expand Down Expand Up @@ -470,7 +524,11 @@ export class SupportWorkers extends GuStack {
}).node.addDependency(stateMachine);
}

buildPaymentSuccessMetric = (paymentProvider: PaymentProvider, productType: ProductType, period: Duration) => {
buildPaymentSuccessMetric = (
paymentProvider: PaymentProvider,
productType: ProductType,
period: Duration
) => {
return new Metric({
metricName: "PaymentSuccess",
namespace: "support-frontend",
Expand All @@ -481,6 +539,6 @@ export class SupportWorkers extends GuStack {
},
statistic: "Sum",
period: period,
})
}
});
};
}