Merge pull request #4709 from nhsuk/next

Version 4.3.0

Author: misaka

.github/workflows/continuous-deployment.yml

@@ -21,3 +21,23 @@ jobs:
     with:
       environment: ${{ matrix.environment }}
       server_types: all
+  slack-notification:
+    needs: [deploy, test]
+    runs-on: ubuntu-latest
+    permissions: {}
+    if: ${{ !cancelled() }}
+    steps:
+      - name: Send Slack notification
+        if: needs.test.result == 'failure' || needs.deploy.result == 'failure'
+        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        with:
+          webhook: ${{ secrets.SLACK_MAVIS_ALERTS_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            text: ":rotating_light: Continuous Deployment failed :rotating_light:"
+            blocks:
+              - type: "section"
+                text:
+                  type: "mrkdwn"
+                  text: ":rotating_light: *Continuous Deployment failed* :rotating_light:\n\n \
+                          <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View workflow run>"

.github/workflows/data-replication-pipeline.yml

@@ -108,7 +108,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
     outputs:
       SNAPSHOT_ARN: ${{ steps.get-latest-snapshot.outputs.SNAPSHOT_ARN }}
 
@@ -167,7 +167,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Get db secret arn
         id: get-db-secret-arn
         working-directory: terraform/app
@@ -201,6 +201,25 @@ jobs:
         with:
           name: tfplan_infrastructure-${{ inputs.environment }}
           path: ${{ runner.temp }}/tfplan
+      - name: Notify pending approval
+        if: inputs.environment == 'production'
+        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        with:
+          webhook: ${{ secrets.SLACK_MAVIS_TECH_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            text: ":hourglass: Approval required :hourglass:"
+            blocks:
+              - type: "section"
+                text:
+                  type: "mrkdwn"
+                  text: "${{ github.workflow }} requires approval"
+              - type: "section"
+                fields:
+                  - type: "mrkdwn"
+                    text: "<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View workflow run>"
+                  - type: "mrkdwn"
+                    text: "*Triggered by:*\n${{ github.actor }}"
 
   apply:
     name: Terraform apply
@@ -226,7 +245,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Apply the changes
         run: |
           set -e

.github/workflows/deploy-application.yml

@@ -68,7 +68,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Get terraform output
         id: terraform-output
         working-directory: terraform/app

.github/workflows/deploy-backup-infrastructure.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Terraform Plan
         id: plan
         env:
@@ -87,7 +87,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Apply the changes
         env:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.BACKUP_MODULES_ACCESS_TOKEN }}

.github/workflows/deploy-infrastructure.yml

@@ -70,7 +70,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Check if any deployments are running
         run: ../scripts/check-for-running-deployments.sh ${{ inputs.environment }}
       - name: Terraform Plan
@@ -118,7 +118,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Apply the changes
         run: |
           set -e

.github/workflows/deploy-monitoring.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Terraform Plan
         id: plan
         run: |
@@ -110,7 +110,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Apply AWS changes
         run: |
           set -e
@@ -140,7 +140,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Install dependencies
         run: |
           sudo apt-get update

.github/workflows/destroy-infrastructure.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - name: Ensure DB cluster can be deleted
         run: |
           set -e

.github/workflows/test.yml

@@ -155,6 +155,6 @@ jobs:
       - uses: actions/checkout@v5
       - uses: hashicorp/setup-terraform@v3
         with:
-          terraform_version: 1.11.4
+          terraform_version: 1.13.3
       - run: terraform init -backend=false
       - run: terraform validate

.ruby-version

@@ -1 +1 @@
-ruby-3.4.3
+ruby-3.4.6

.tool-versions

@@ -4,6 +4,6 @@ nodejs      22.15.0
 pkl         0.28.1
 postgres    17.2
 redis       8.2.1
-ruby        3.4.3
-terraform   1.11.4
+ruby        3.4.6
+terraform   1.13.3
 tflint      0.55.1