Skip to content

[PRM-717] Disable report generation in dev, and enable the email trigger (for manual report generation testing) #118

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

Merged
chrisbloe merged 2 commits into from
Feb 25, 2026
Merged

[PRM-717] Disable report generation in dev, and enable the email trigger (for manual report generation testing) #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8f6d1a
[PRM-717] Disable report generation in dev, and enable the email trig…
chrisbloe Feb 24, 2026
8060104
[PRM-717] - Syntax error fix
samfallowfield Feb 25, 2026
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
2 changes: 1 addition & 1 deletion lambdas/store_asid_lookup/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Once the email is received into the GP2GP mailbox, our team must (within the fir

```json
{
"time": "YYY-MM-01T00:00:00Z"
"time": "YYYY-MM-01T00:00:00Z"
}
```

Expand Down
4 changes: 0 additions & 4 deletions stacks/email_and_alerting/terraform/email-report-lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ resource "aws_lambda_permission" "allow_trigger_from_s3_object_created" {
}

resource "aws_s3_bucket_notification" "reports_generator_s3_object_created" {
count = var.environment == "dev" ? 0 : 1
bucket = data.aws_ssm_parameter.reports_generator_bucket_name.value

lambda_function {
Expand All @@ -58,6 +57,3 @@ resource "aws_s3_bucket_notification" "reports_generator_s3_object_created" {
aws_lambda_permission.allow_trigger_from_s3_object_created,
]
}



4 changes: 4 additions & 0 deletions stacks/email_and_alerting/terraform/moved-4.0.0.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
moved {
from = aws_s3_bucket_notification.reports_generator_s3_object_created[0]
to = aws_s3_bucket_notification.reports_generator_s3_object_created
}
39 changes: 39 additions & 0 deletions stacks/step_function/terraform/moved-4.0.0.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
moved {
from = aws_cloudwatch_event_target.monthly_transfer_outcomes_per_supplier_pathway_report_event_trigger
to = aws_cloudwatch_event_target.monthly_transfer_outcomes_per_supplier_pathway_report_event_trigger[0]
}

moved {
from = aws_cloudwatch_event_target.monthly_sicbl_level_integration_times_report_event_trigger
to = aws_cloudwatch_event_target.monthly_sicbl_level_integration_times_report_event_trigger[0]
}

moved {
from = aws_cloudwatch_event_target.weekly_transfer_outcomes_per_supplier_pathway_report_event_trigger
to = aws_cloudwatch_event_target.weekly_transfer_outcomes_per_supplier_pathway_report_event_trigger[0]
}

moved {
from = aws_cloudwatch_event_target.weekly_transfer_level_technical_failures_report_event_trigger
to = aws_cloudwatch_event_target.weekly_transfer_level_technical_failures_report_event_trigger[0]
}

moved {
from = aws_cloudwatch_event_target.weekly_transfer_details_by_hour_report_event_trigger
to = aws_cloudwatch_event_target.weekly_transfer_details_by_hour_report_event_trigger[0]
}

moved {
from = aws_cloudwatch_event_target.daily_transfer_outcomes_per_supplier_pathway_report_event_trigger
to = aws_cloudwatch_event_target.daily_transfer_outcomes_per_supplier_pathway_report_event_trigger[0]
}

moved {
from = aws_cloudwatch_event_target.daily_transfer_level_technical_failures_report_event_trigger
to = aws_cloudwatch_event_target.daily_transfer_level_technical_failures_report_event_trigger[0]
}

moved {
from = aws_cloudwatch_event_target.daily_transfer_details_by_hour_report_event_trigger
to = aws_cloudwatch_event_target.daily_transfer_details_by_hour_report_event_trigger[0]
}
18 changes: 17 additions & 1 deletion stacks/step_function/terraform/reports-generator-event-triggers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
resource "aws_cloudwatch_event_target" "monthly_transfer_outcomes_per_supplier_pathway_report_event_trigger" {
count = var.environment == "dev" ? 0 : 1

target_id = "${var.environment}-monthly-reports-generator-transfer-outcomes-trigger"
rule = aws_cloudwatch_event_rule.run_once_a_month_on_15th_cron_expression.name
arn = aws_sfn_state_machine.reports_generator.arn
Expand All @@ -13,6 +15,8 @@ resource "aws_cloudwatch_event_target" "monthly_transfer_outcomes_per_supplier_p
}

resource "aws_cloudwatch_event_target" "monthly_sicbl_level_integration_times_report_event_trigger" {
count = var.environment == "dev" ? 0 : 1

target_id = "${var.environment}-monthly-reports-generator-sicbl-level-integr-trigger"
rule = aws_cloudwatch_event_rule.run_once_a_month_on_15th_cron_expression.name
arn = aws_sfn_state_machine.reports_generator.arn
Expand All @@ -27,6 +31,8 @@ resource "aws_cloudwatch_event_target" "monthly_sicbl_level_integration_times_re
}

resource "aws_cloudwatch_event_target" "weekly_transfer_outcomes_per_supplier_pathway_report_event_trigger" {
count = var.environment == "dev" ? 0 : 1

target_id = "${var.environment}-weekly-reports-generator-transfer-outcomes-trigger"
rule = aws_cloudwatch_event_rule.run_once_a_week_on_monday_cron_expression.name
arn = aws_sfn_state_machine.reports_generator.arn
Expand All @@ -41,6 +47,8 @@ resource "aws_cloudwatch_event_target" "weekly_transfer_outcomes_per_supplier_pa
}

resource "aws_cloudwatch_event_target" "weekly_transfer_level_technical_failures_report_event_trigger" {
count = var.environment == "dev" ? 0 : 1

target_id = "${var.environment}-weekly-reports-generator-transfer-level-trigger"
rule = aws_cloudwatch_event_rule.run_once_a_week_on_monday_cron_expression.name
arn = aws_sfn_state_machine.reports_generator.arn
Expand All @@ -55,6 +63,8 @@ resource "aws_cloudwatch_event_target" "weekly_transfer_level_technical_failures
}

resource "aws_cloudwatch_event_target" "weekly_transfer_details_by_hour_report_event_trigger" {
count = var.environment == "dev" ? 0 : 1

target_id = "${var.environment}-weekly-reports-generator-transfer-hourly-trigger"
rule = aws_cloudwatch_event_rule.run_once_a_week_on_monday_cron_expression.name
arn = aws_sfn_state_machine.reports_generator.arn
Expand All @@ -69,6 +79,8 @@ resource "aws_cloudwatch_event_target" "weekly_transfer_details_by_hour_report_e
}

resource "aws_cloudwatch_event_target" "daily_transfer_outcomes_per_supplier_pathway_report_event_trigger" {
count = var.environment == "dev" ? 0 : 1

target_id = "${var.environment}-daily-reports-generator-transfer-outcomes-trigger"
rule = aws_cloudwatch_event_rule.run_daily_7am_cron_expression.name
arn = aws_sfn_state_machine.reports_generator.arn
Expand All @@ -83,6 +95,8 @@ resource "aws_cloudwatch_event_target" "daily_transfer_outcomes_per_supplier_pat
}

resource "aws_cloudwatch_event_target" "daily_transfer_level_technical_failures_report_event_trigger" {
count = var.environment == "dev" ? 0 : 1

target_id = "${var.environment}-daily-reports-transfer-level-technical-failures-trigger"
rule = aws_cloudwatch_event_rule.run_daily_7am_cron_expression.name
arn = aws_sfn_state_machine.reports_generator.arn
Expand All @@ -97,6 +111,8 @@ resource "aws_cloudwatch_event_target" "daily_transfer_level_technical_failures_
}

resource "aws_cloudwatch_event_target" "daily_transfer_details_by_hour_report_event_trigger" {
count = var.environment == "dev" ? 0 : 1

target_id = "${var.environment}-daily-reports-details-by-hour-trigger"
rule = aws_cloudwatch_event_rule.run_daily_7am_cron_expression.name
arn = aws_sfn_state_machine.reports_generator.arn
Expand All @@ -108,4 +124,4 @@ resource "aws_cloudwatch_event_target" "daily_transfer_details_by_hour_report_ev
"ALERT_ENABLED" : "false",
"SEND_EMAIL_NOTIFICATION" : "true"
})
}
}