Merge pull request #574 from NHSDigital/release/2025-04-23

Release/2025 04 23

Author: jameslinnell

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2025-04-23
+- [PI-879] Update Billing alarm recipients
+- [PI-880] Allow dependabot PRs to pass branch name check
+
 ## 2025-04-04
 - [PI-876] Add Backups permission policy to PROD
 

VERSION

@@ -1 +1 @@
-2025.04.04.a
+2025.04.23

changelog/2025-04-23.md

@@ -0,0 +1,2 @@
+- [PI-879] Update Billing alarm recipients
+- [PI-880] Allow dependabot PRs to pass branch name check

infrastructure/terraform/per_account/modules/billing_alarms/main.tf

@@ -1,7 +1,7 @@
 resource "aws_ssm_parameter" "billing_alert_subscribers" {
   name  = "${var.project}-billing-subscribers"
   type  = "StringList"
-  value = "rowan.gill1@nhs.net,warran.mavrodaris2@nhs.net"
+  value = "james.linnell2@nhs.net,[email protected],[email protected],[email protected],jade.havenhand1@nhs.net"
 }
 
 data "aws_ssm_parameter" "billing_alert_subscribers" {

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connecting-party-manager"
-version = "2025.04.04.a"
+version = "2025.04.23"
 description = "Repository for the Connecting Party Manager API and related services"
 authors = ["NHS England"]
 license = "LICENSE.md"

scripts/workflow/check-branch-name.sh

@@ -6,14 +6,18 @@ current_branch=$(git rev-parse --abbrev-ref HEAD)
 # Define a regular expression pattern to match the desired branch naming conventions
 feature_pattern="^feature/PI-[0-9]+[-][A-Za-z0-9\_]*$"
 release_pattern="^release/[0-9]{4}-[0-9]{2}-[0-9]{2}(-[a-z])?$"
+dependabot_pattern="^dependabot/.*"
 
 if [[ $current_branch =~ $feature_pattern ]]; then
-    echo "The branch '$current_branch' conforms to the feature branch pattern."
-    exit 0
+  echo "The branch '$current_branch' conforms to the feature branch pattern."
+  exit 0
 elif [[ $current_branch =~ $release_pattern ]]; then
-    echo "The branch '$current_branch' conforms to the release branch pattern."
-    exit 0
+  echo "The branch '$current_branch' conforms to the release branch pattern."
+  exit 0
+elif [[ $current_branch =~ $dependabot_pattern ]]; then
+  echo "The branch '$current_branch' conforms to the dependabot branch pattern."
+  exit 0
 else
-    echo "The branch '$current_branch' does not conform to any of the allowed patterns."
-    exit 1
+  echo "The branch '$current_branch' does not conform to any of the allowed patterns."
+  exit 1
 fi