NHSDigital · ajmu1 · Oct 16, 2025 · Mar 13, 2023 · Mar 14, 2023 · Mar 14, 2023
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
-/.github @nhsd-exeter/maintainers
-/build/automation/lib @nhsd-exeter/maintainers
-/build/automation/init.mk @nhsd-exeter/maintainers
-/.gitignore @nhsd-exeter/maintainers
-/project.code-workspace @nhsd-exeter/maintainers
+/.github @NHSDigital/data-sourcing-ftrs/maintainers
+/build/automation/lib @NHSDigital/data-sourcing-ftrs/maintainers
+/build/automation/init.mk @NHSDigital/data-sourcing-ftrs/maintainers
+/.gitignore @NHSDigital/data-sourcing-ftrs/maintainers
+/project.code-workspace @NHSDigital/data-sourcing-ftrs/maintainers
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -34,8 +34,8 @@ jobs:
           projectBaseDir: .
           args: >
             -Dsonar.sources=application,infrastructure,scripts,test,build/docker
-            -Dsonar.organization=nhsd-exeter
-            -Dsonar.projectKey=uec-dos-int
+            -Dsonar.organization=nhsdigital
+            -Dsonar.projectKey=nhsdigital_dos-integration
             -Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
             -Dsonar.python.coverage.reportPaths=coverage.xml
             -Dsonar.python.version=3.12
@@ -48,7 +48,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Check Markdown format
-        uses: DavidAnson/markdownlint-cli2-action@v13
+        uses: DavidAnson/markdownlint-cli2-action@v20
         with:
           config: .github/workflows/configs/markdownlint/.markdownlint.json
       - name: Check Markdown links

diff --git a/.github/workflows/update-pull-request-description.yml b/.github/workflows/update-pull-request-description.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Get Branch Name
-        uses: mdecoleman/pr-branch-name@2.0.0
+        uses: mdecoleman/pr-branch-name@v3.0.0
         id: branch_name
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -30,7 +30,7 @@ jobs:
         run: echo "TEMPLATE_NAME=$(cat .github/PULL_REQUEST_TEMPLATE/${{ env.BRANCH_DESIGNATOR }}_pull_request_template.md > /dev/null 2>&1 && echo ${{ env.BRANCH_DESIGNATOR }}_pull_request_template.md || echo task_pull_request_template.md)" >> $GITHUB_ENV
       - name: Render Pull Request template
         id: template
-        uses: chuhlomin/render-template@v1.5
+        uses: chuhlomin/render-template@v1.10
         with:
           template: .github/PULL_REQUEST_TEMPLATE/${{ env.TEMPLATE_NAME }}
           vars: |

diff --git a/Makefile b/Makefile
@@ -272,7 +272,7 @@ tag-commit-to-destroy-environment: # Tag git commit to destroy deployment - mand
 	fi
 
 get-environment-from-pr:
-	ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=nhsd-exeter/dos-integration |  jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?<x>.[0-9]*).*"; "ds-\(.x)") ')
+	ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=NHSDigital/dos-integration |  jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?<x>.[0-9]*).*"; "ds-\(.x)") ')
 	echo $$ENVIRONMENT
 
 is-environment-deployed:

diff --git a/README.md b/README.md
@@ -102,13 +102,13 @@ The main components you will need for _basic_ development work, are your OS vers
 - Git
 - Python (The project currently runs on 3.12)
 - AWS CLI
-- Docker
+- Docker/Podman
 
 ### Clone Repository
 
 Clone the repository
 
-    git clone git@github.com:nhsd-exeter/dos-integration.git
+    git clone git@github.com:NHSDigital/dos-integration.git
     cd ./dos-integration
 
 ### AWS Authentication
@@ -192,7 +192,7 @@ To run ruff on you branch:
 
 List all the type of test suites included and provide instructions how to execute them
 
-- Unit
+- Unit Testing
 - Integration
 - Performance
 
@@ -240,7 +240,7 @@ This testing is generally done by a tester
 Prerequisites
 
     assume # Granted assume AWS Role
-    Sign into Non-Prod VPN # To connect to lambdas within the VPC
+    Sign into Non-Prod VPN #  To connect to lambdas within the VPC
     IP is in the IP Allow List # To connect to the API Gateway
     make tester-build
 

diff --git a/application/change_event_dlq_handler/requirements.txt b/application/change_event_dlq_handler/requirements.txt
@@ -1 +1 @@
-aws-lambda-powertools[tracer] ~= 2.43.0
+aws-lambda-powertools[tracer] ~= 3.20.0
diff --git a/application/common/constants.py b/application/common/constants.py
@@ -2,7 +2,8 @@
 
 CLOSED_AND_HIDDEN_STATUSES = ["HIDDEN", "CLOSED"]
 
-PHARMACY_SERVICE_TYPE_IDS = [13, 131, 132, 134, 137, 148, 149]
+DISTANCE_SELLING_PHARMACY_ID = 134
+PHARMACY_SERVICE_TYPE_IDS = [13, 131, 132, DISTANCE_SELLING_PHARMACY_ID, 137, 148, 149]
 PHARMACY_ORGANISATION_SUB_TYPES = ["Community", "DistanceSelling"]
 PHARMACY_ODSCODE_LENGTH = 5
 PHARMACY_SERVICE_TYPE_ID = 13

diff --git a/application/dos_db_handler/requirements.txt b/application/dos_db_handler/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools[tracer] ~= 2.43.0
+aws-lambda-powertools[tracer] ~= 3.20.0
 psycopg[binary]
diff --git a/application/dos_db_update_dlq_handler/requirements.txt b/application/dos_db_update_dlq_handler/requirements.txt
@@ -1 +1 @@
-aws-lambda-powertools[tracer] ~= 2.43.0
+aws-lambda-powertools[tracer] ~= 3.20.0
diff --git a/application/event_replay/requirements.txt b/application/event_replay/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools[tracer] ~= 2.43.0
+aws-lambda-powertools[tracer] ~= 3.20.0
 simplejson
diff --git a/application/ingest_change_event/requirements.txt b/application/ingest_change_event/requirements.txt
@@ -1 +1 @@
-aws-lambda-powertools[tracer, validation] ~= 2.43.0
+aws-lambda-powertools[tracer, validation] ~= 3.20.0
diff --git a/application/quality_checker/requirements.txt b/application/quality_checker/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools[tracer, validation] ~= 2.43.0
+aws-lambda-powertools[tracer, validation] ~= 3.20.0
 psycopg[binary]
diff --git a/application/quality_checker/search_dos.py b/application/quality_checker/search_dos.py
@@ -3,8 +3,8 @@
 from aws_lambda_powertools.logging import Logger
 from psycopg import Connection
 
-from common.commissioned_service_type import CommissionedServiceType
-from common.constants import DOS_ACTIVE_STATUS_ID, PHARMACY_SERVICE_TYPE_IDS
+from common.commissioned_service_type import PALLIATIVE_CARE, CommissionedServiceType
+from common.constants import DISTANCE_SELLING_PHARMACY_ID, DOS_ACTIVE_STATUS_ID, PHARMACY_SERVICE_TYPE_IDS
 from common.dos import DoSService
 from common.dos_db_connection import query_dos_db
 
@@ -83,6 +83,9 @@ def search_for_incorrectly_profiled_z_code_on_incorrect_type(
         list[DoSService]: List of matching services.
     """
     matchable_service_types = PHARMACY_SERVICE_TYPE_IDS.copy()
+    if service_type == PALLIATIVE_CARE:
+        # Remove DSPs from check, as it's valid for the palliative z-code to be present on them
+        matchable_service_types.remove(DISTANCE_SELLING_PHARMACY_ID)
     matchable_service_types.remove(service_type.DOS_TYPE_ID)
     starting_character = getenv("ODSCODE_STARTING_CHARACTER") or "f"
     cursor = query_dos_db(

diff --git a/application/send_email/requirements.txt b/application/send_email/requirements.txt
@@ -1 +1 @@
-aws-lambda-powertools[tracer] ~= 2.43.0
+aws-lambda-powertools[tracer] ~= 3.20.0
diff --git a/application/service_matcher/requirements.txt b/application/service_matcher/requirements.txt
@@ -1,3 +1,3 @@
-aws-lambda-powertools[tracer] ~= 2.43.0
+aws-lambda-powertools[tracer] ~= 3.20.0
 psycopg[binary]
 pytz
diff --git a/application/service_sync/requirements.txt b/application/service_sync/requirements.txt
@@ -1,3 +1,3 @@
-aws-lambda-powertools[tracer] ~= 2.43.0
+aws-lambda-powertools[tracer] ~= 3.20.0
 psycopg[binary]
 pytz
diff --git a/application/slack_messenger/requirements.txt b/application/slack_messenger/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools[tracer] ~= 2.43.0
+aws-lambda-powertools[tracer] ~= 3.20.0
 requests
diff --git a/build/automation/lib/docker.mk b/build/automation/lib/docker.mk
@@ -580,7 +580,7 @@ docker-run-sonar-scanner-cli: ### Run sonar-scanner-cli container - mandatory: C
 	mkdir -p $(TMP_DIR)/.sonar/cache
 	image=$$([ -n "$(IMAGE)" ] && echo $(IMAGE) || echo sonarsource/sonar-scanner-cli:$(DOCKER_SONAR_SCANNER_CLI_VERSION))
 	container=$$([ -n "$(CONTAINER)" ] && echo $(CONTAINER) || echo node-$(BUILD_COMMIT_HASH)-$(BUILD_ID)-$$(date --date=$$(date -u +"%Y-%m-%dT%H:%M:%S%z") -u +"%Y%m%d%H%M%S" 2> /dev/null)-$$(make secret-random LENGTH=8))
-	docker run --interactive $(_TTY) --rm \
+	$(DOCKER_CMD) run --interactive $(_TTY) --rm \
 		--name $$container \
 		--user $$(id -u):$$(id -g) \
 		--env-file <(make _list-variables PATTERN="^(AWS|TX|TEXAS|NHSD|TERRAFORM)") \

diff --git a/build/automation/var/project.mk b/build/automation/var/project.mk
@@ -1,4 +1,4 @@
-ORG_NAME = nhsd-exeter
+ORG_NAME = NHSDigital
 PROGRAMME = uec
 PROJECT_GROUP = uec/dos
 PROJECT_GROUP_SHORT = uec-dos
@@ -26,7 +26,7 @@ TF_VAR_environment = $(ENVIRONMENT)
 TF_VAR_aws_account_name = $(AWS_ACCOUNT_NAME)
 TF_VAR_deployment_secrets = $(DEPLOYMENT_SECRETS)
 PROJECT_DEPLOYMENT_SECRETS = $(DEPLOYMENT_SECRETS)
-TF_VAR_github_owner = nhsd-exeter
+TF_VAR_github_owner = NHSDigital
 TF_VAR_github_repo = dos-integration
 PARALLEL_TEST_COUNT := $(or $(PARALLEL_TEST_COUNT), auto)
 
@@ -45,11 +45,13 @@ TF_VAR_cicd_blue_green_deployment_pipeline_name := $(PROJECT_ID)-$(ENVIRONMENT)-
 TF_VAR_cicd_shared_resources_deployment_pipeline_name := $(PROJECT_ID)-$(ENVIRONMENT)-cicd-shared-resources-deployment-pipeline
 TF_VAR_blue_green_deployment_new_version_parameter_name := $(PROJECT_ID)-$(ENVIRONMENT)-blue-green-deployment-new-version
 TF_VAR_development_tools_encryption_key_alias := $(PROJECT_ID)-$(ENVIRONMENT)-development-tools-encryption-key
-TF_VAR_github_url := https://github.com/nhsd-exeter/dos-integration.git
+TF_VAR_github_url := https://github.com/NHSDigital/dos-integration.git
 TF_VAR_pipeline_topic_name := $(PROJECT_ID)-$(ENVIRONMENT)-pipeline-topic
 TF_VAR_pipeline_notification_name := $(PROJECT_ID)-$(ENVIRONMENT)-pipeline-notification
 TF_VAR_cicd_blue_green_deployment_pipeline_nofitication_name := $(PROJECT_ID)-$(ENVIRONMENT)-blue-green-pipeline-notification
 TF_VAR_cicd_shared_resources_deployment_pipeline_nofitication_name := $(PROJECT_ID)-$(ENVIRONMENT)-shared-resources-pipeline-notification
+TF_VAR_cicd_blue_green_deployment_pipeline_eventbridge_rule_name := $(PROJECT_ID)-$(ENVIRONMENT)-trigger-blue-green-pipeline
+TF_VAR_cicd_shared_resources_deployment_pipeline_eventbridge_rule_name := $(PROJECT_ID)-$(ENVIRONMENT)-trigger-shared-resources-pipeline
 TF_VAR_pipeline_chatbot_channel := $(PROJECT_ID)-cicd-slk-channel
 TF_VAR_nightly_rule_name := $(PROJECT_ID)-$(ENVIRONMENT)-performance-pipeline-nightly-rule
 

diff --git a/infrastructure/modules/eventbridge_pipeline_trigger/main.tf b/infrastructure/modules/eventbridge_pipeline_trigger/main.tf
@@ -0,0 +1,22 @@
+resource "aws_cloudwatch_event_rule" "trigger_pipeline" {
+  name          = var.rule_name
+  description   = var.description
+  event_pattern = <<EOF
+{
+  "source": ["aws.s3"],
+  "detail-type": ["Object Created"],
+  "resources": ["arn:aws:s3:::${var.bucket_name}"],
+  "detail": {
+    "object": {
+      "key": ["${var.object_key}"]
+    }
+  }
+}
+EOF
+}
+
+resource "aws_cloudwatch_event_target" "pipeline_target" {
+  rule     = aws_cloudwatch_event_rule.trigger_pipeline.name
+  arn      = var.pipeline_arn
+  role_arn = var.pipeline_role_arn
+}
diff --git a/infrastructure/modules/eventbridge_pipeline_trigger/outputs.tf b/infrastructure/modules/eventbridge_pipeline_trigger/outputs.tf
@@ -0,0 +1,9 @@
+output "eventbridge_rule_id" {
+  description = "The EventBridge rule Name we just created."
+  value       = aws_cloudwatch_event_rule.trigger_pipeline.id
+}
+
+output "eventbridge_rule_arn" {
+  description = "The EventBridge rule ARN we just created."
+  value       = aws_cloudwatch_event_rule.trigger_pipeline.arn
+}
diff --git a/infrastructure/modules/eventbridge_pipeline_trigger/variables.tf b/infrastructure/modules/eventbridge_pipeline_trigger/variables.tf
@@ -0,0 +1,30 @@
+variable "bucket_name" {
+  description = "Name of the S3 bucket to monitor."
+  type        = string
+}
+
+variable "pipeline_arn" {
+  description = "ARN of the CodePipeline to trigger."
+  type        = string
+}
+
+variable "pipeline_role_arn" {
+  description = "Role ARN for EventBridge to trigger the pipeline."
+  type        = string
+}
+
+variable "rule_name" {
+  description = "Name of the EventBridge rule."
+  type        = string
+}
+
+variable "description" {
+  description = "Description of the EventBridge rule."
+  type        = string
+}
+
+variable "object_key" {
+  description = "S3 object key to filter on."
+  type        = string
+  default     = "repository.zip"
+}
diff --git a/...development-and-deployment-tools/batch-buildspecs/build-deploy-test-release-buildspec.yml b/...development-and-deployment-tools/batch-buildspecs/build-deploy-test-release-buildspec.yml
@@ -128,8 +128,8 @@ batch:
     - identifier: integration_test
       env:
         compute-type: BUILD_GENERAL1_LARGE
-        image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
-        type: LINUX_CONTAINER
+        image: aws/codebuild/amazonlinux2-aarch64-standard:3.0
+        type: ARM_CONTAINER
         privileged-mode: true
         variables:
           PROFILE: dev

diff --git a/.../development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-buildspec.yml b/.../development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-buildspec.yml
@@ -139,8 +139,8 @@ batch:
     - identifier: integration_test_reporting
       env:
         compute-type: BUILD_GENERAL1_LARGE
-        image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
-        type: LINUX_CONTAINER
+        image: aws/codebuild/amazonlinux2-aarch64-standard:3.0
+        type: ARM_CONTAINER
         privileged-mode: true
         variables:
           PROFILE: dev
@@ -153,8 +153,8 @@ batch:
     - identifier: integration_test_validation
       env:
         compute-type: BUILD_GENERAL1_LARGE
-        image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
-        type: LINUX_CONTAINER
+        image: aws/codebuild/amazonlinux2-aarch64-standard:3.0
+        type: ARM_CONTAINER
         privileged-mode: true
         variables:
           PROFILE: dev
@@ -167,8 +167,8 @@ batch:
     - identifier: integration_test_opening_times
       env:
         compute-type: BUILD_GENERAL1_LARGE
-        image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
-        type: LINUX_CONTAINER
+        image: aws/codebuild/amazonlinux2-aarch64-standard:3.0
+        type: ARM_CONTAINER
         privileged-mode: true
         variables:
           PROFILE: dev
@@ -181,8 +181,8 @@ batch:
     - identifier: integration_test_general
       env:
         compute-type: BUILD_GENERAL1_LARGE
-        image: aws/codebuild/amazonlinux2-x86_64-standard:5.0
-        type: LINUX_CONTAINER
+        image: aws/codebuild/amazonlinux2-aarch64-standard:3.0
+        type: ARM_CONTAINER
         privileged-mode: true
         variables:
           PROFILE: dev

diff --git a/infrastructure/stacks/development-and-deployment-tools/build_tools_image.tf b/infrastructure/stacks/development-and-deployment-tools/build_tools_image.tf
@@ -28,7 +28,7 @@ resource "aws_codebuild_webhook" "build_image_webhook" {
 resource "aws_codebuild_project" "build_image" {
   for_each       = local.independent_build_images
   name           = "${var.project_id}-${var.environment}-build-${each.key}-stage"
-  description    = "Builds ${each.key} x86 development docker container image"
+  description    = "Builds ${each.key} x64 development docker container image"
   build_timeout  = "10"
   queued_timeout = "5"
   service_role   = data.aws_iam_role.pipeline_role.arn
@@ -45,8 +45,8 @@ resource "aws_codebuild_project" "build_image" {
 
   environment {
     compute_type                = "BUILD_GENERAL1_SMALL"
-    image                       = "aws/codebuild/amazonlinux2-x86_64-standard:5.0"
-    type                        = "LINUX_CONTAINER"
+    image                       = "aws/codebuild/amazonlinux2-aarch64-standard:3.0"
+    type                        = "ARM_CONTAINER"
     image_pull_credentials_type = "CODEBUILD"
     privileged_mode             = true
 

diff --git a/...re/stacks/development-and-deployment-tools/buildspecs/production-smoke-test-buildspec.yml b/...re/stacks/development-and-deployment-tools/buildspecs/production-smoke-test-buildspec.yml
@@ -9,7 +9,10 @@ phases:
       - export AWS_SECRET_ACCESS_KEY=$(echo $temp_role | jq -r .Credentials.SecretAccessKey)
       - export AWS_SESSION_TOKEN=$(echo $temp_role | jq -r .Credentials.SessionToken)
       - make docker-hub-signin
-      - make docker-pull NAME=tester
+      # - make docker-pull NAME=tester
+      # Using digest to handle image arch issue in smoke test stage for no arm terraform image in v1.2.1
+      - make docker-pull NAME=tester DIGEST=sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c
+      - docker tag $(make _docker-get-reg)/tester@sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c $(make _docker-get-reg)/tester:latest
       - unset AWS_ACCESS_KEY_ID
       - unset AWS_SECRET_ACCESS_KEY
       - unset AWS_SESSION_TOKEN

diff --git a/...astructure/stacks/development-and-deployment-tools/cicd_blue_green_deployment_pipeline.tf b/...astructure/stacks/development-and-deployment-tools/cicd_blue_green_deployment_pipeline.tf
@@ -21,7 +21,7 @@ resource "aws_codepipeline" "cicd_blue_green_deployment_pipeline" {
       configuration = {
         S3Bucket             = var.cicd_blue_green_deployment_pipeline_artefact_bucket
         S3ObjectKey          = "repository.zip"
-        PollForSourceChanges = "True"
+        PollForSourceChanges = "False"
       }
     }
   }
@@ -332,7 +332,6 @@ resource "aws_codepipeline" "cicd_blue_green_deployment_pipeline" {
   ]
 }
 
-
 module "cicd_blue_green_deployment_pipeline_artefact_bucket" {
   source             = "../../modules/s3"
   name               = var.cicd_blue_green_deployment_pipeline_artefact_bucket
@@ -341,3 +340,19 @@ module "cicd_blue_green_deployment_pipeline_artefact_bucket" {
   versioning_enabled = "true"
   force_destroy      = "true"
 }
+
+resource "aws_s3_bucket_notification" "uec-dos-int-dev-eventbridge_blue_green" {
+  bucket      = module.cicd_blue_green_deployment_pipeline_artefact_bucket.s3_bucket_id
+  eventbridge = true
+  depends_on  = [module.cicd_blue_green_deployment_pipeline_artefact_bucket]
+}
+
+module "blue_green_eventbridge_trigger" {
+  source            = "../../modules/eventbridge_pipeline_trigger"
+  bucket_name       = module.cicd_blue_green_deployment_pipeline_artefact_bucket.s3_bucket_id
+  pipeline_arn      = aws_codepipeline.cicd_blue_green_deployment_pipeline.arn
+  pipeline_role_arn = data.aws_iam_role.pipeline_role.arn
+  rule_name         = var.cicd_blue_green_deployment_pipeline_eventbridge_rule_name
+  description       = "Trigger Blue/Green pipeline when repository.zip is updated"
+  depends_on        = [module.cicd_blue_green_deployment_pipeline_artefact_bucket]
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		aws-lambda-powertools[tracer] ~= 2.43.0
		aws-lambda-powertools[tracer] ~= 3.20.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		aws-lambda-powertools[tracer, validation] ~= 2.43.0
		aws-lambda-powertools[tracer, validation] ~= 3.20.0