Merge branch 'master' into ved-318-multiple-entries-system-site-route

Thomas-Boyle · web-flow · commit 01ac68884fdc · 2026-04-20T10:52:59.000+01:00
diff --git a/.github/workflows/dependabot-auto-approve.yml b/.github/workflows/dependabot-auto-approve.yml
@@ -0,0 +1,23 @@
+name: Dependabot Auto-Approve
+
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch Dependabot metadata
+        id: metadata
+        continue-on-error: true
+        uses: dependabot/fetch-metadata@ffa630c65fa7e0ecfa0625b5ceda64399aea1b36
+
+      - name: Auto-approve minor and patch updates
+        if: steps.metadata.outcome == 'success' && contains(fromJSON('["version-update:semver-minor", "version-update:semver-patch"]'), steps.metadata.outputs.update-type)
+        uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363
+        with:
+          github-token: ${{ github.token }}
diff --git a/infrastructure/account/recordprocessor_ecr_repo.tf b/infrastructure/account/recordprocessor_ecr_repo.tf
@@ -4,27 +4,4 @@ resource "aws_ecr_repository" "recordprocessor_repository" {
   }
   image_tag_mutability = "IMMUTABLE"
   name                 = "imms-recordprocessor-repo"
-}
-
-resource "aws_ecr_lifecycle_policy" "recordprocessor_repository_lifecycle_policy" {
-  repository = aws_ecr_repository.recordprocessor_repository.name
-
-  policy = <<EOF
-{
-  "rules": [
-    {
-      "rulePriority": 1,
-      "description": "Keep last 10 images.",
-      "selection": {
-        "tagStatus": "any",
-        "countType": "imageCountMoreThan",
-        "countNumber": 10
-      },
-      "action": {
-        "type": "expire"
-      }
-    }
-  ]
-}
-EOF
 }
diff --git a/infrastructure/instance/.terraform.lock.hcl b/infrastructure/instance/.terraform.lock.hcl
diff --git a/infrastructure/instance/main.tf b/infrastructure/instance/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.9.0"
+      version = "4.2.0"
     }
   }
   backend "s3" {
diff --git a/infrastructure/terraform_aws_backup/aws-backup-destination/main.tf b/infrastructure/terraform_aws_backup/aws-backup-destination/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.9.0"
+      version = "4.2.0"
     }
   }
   backend "s3" {
diff --git a/infrastructure/terraform_aws_backup/aws-backup-source/main.tf b/infrastructure/terraform_aws_backup/aws-backup-source/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     docker = {
       source  = "kreuzwerker/docker"
-      version = "3.9.0"
+      version = "4.2.0"
     }
   }
   backend "s3" {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "license": "MIT",
   "homepage": "https://github.com/NHSDigital/immunisation-fhir-api",
   "devDependencies": {
-    "@redocly/cli": "^2.27.1",
+    "@redocly/cli": "^2.28.1",
     "husky": "^9.1.7",
     "lint-staged": "^16.4.0",
     "prettier": "^3.8.3"
diff --git a/tests/e2e_automation/poetry.lock b/tests/e2e_automation/poetry.lock

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ terraform {`
`6`	`6`	`}`
`7`	`7`	`docker = {`
`8`	`8`	`source = "kreuzwerker/docker"`
`9`		`- version = "3.9.0"`
	`9`	`+ version = "4.2.0"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`backend "s3" {`