Merge branch 'main' into feature/refactor-backend-provider-configurat…

…ions

.github/workflows/code-scanning.yml

@@ -39,7 +39,7 @@ jobs:
         run: tflint --disable-rule=terraform_unused_declarations --format sarif > tflint.sarif
       - name: Upload SARIF file
         if: success() || failure()
-        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/upload-sarif@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
         with:
           sarif_file: tflint.sarif
   trivy:
@@ -64,7 +64,7 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: success() || failure()
-        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/upload-sarif@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
         with:
           sarif_file: 'trivy-results.sarif'
   checkov:
@@ -92,6 +92,6 @@ jobs:
           skip_check: CKV_GIT_1,CKV_AWS_126,CKV2_AWS_38,CKV2_AWS_39
       - name: Upload SARIF file
         if: success() || failure()
-        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/upload-sarif@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
         with:
           sarif_file: ./checkov.sarif

.github/workflows/format-code.yml

@@ -41,7 +41,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter/flavors/terraform@f90c800040e4f84800700b27b2394d3eecc1fdad #v8.4.0
+        uses: oxsecurity/megalinter/flavors/terraform@839e6d63c0423eb74ce2578225f8b8b4bed63ede #v8.4.1
         env:
           # All available variables are described in documentation
           # https://megalinter.io/configuration/#shared-variables

.github/workflows/scorecards.yml

@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/upload-sarif@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
         with:
           sarif_file: results.sarif

.lycheeignore

@@ -0,0 +1 @@
+https://github.com/ministryofjustice/yjaf-infra-aws-mgmt*

environments/sprinkler.json

@@ -58,4 +58,3 @@
   "go-live-date": "",
   "github-oidc-team-repositories": [""]
 }
-

source/runbooks/dr-process.html.md.erb

@@ -1,7 +1,7 @@
 ---
 owner_slack: "#modernisation-platform"
 title: Disaster Recovery Process
-last_reviewed_on: 2024-07-24
+last_reviewed_on: 2025-01-27
 review_in: 6 months
 ---
 

source/runbooks/yjaf-delete-account.html.md.erb

@@ -37,4 +37,4 @@ There are two files to update:
 
 Raise a PR for changes to be reviewed by the Team. Merge changes to run automated pipelines.
 
-Done.
+Done.

source/runbooks/yjaf-password-reset.html.md.erb

@@ -22,4 +22,4 @@ This is a manual process that is managed via the console.
 7. Select the `Reset Password` option
 8. Check that `Autogenerated password` is selected and tick the `User must create new password at next sign-in`
 9. Click on the `Reset Password` button to generate a new password
-10. Copy the autogenerated password and email it to the user
+10. Copy the autogenerated password and email it to the user

source/team/vision.html.md.erb

@@ -1,7 +1,7 @@
 ---
 owner_slack: "#modernisation-platform"
 title: Our vision
-last_reviewed_on: 2024-10-25
+last_reviewed_on: 2025-01-27
 review_in: 3 months
 ---
 

source/user-guide/creating-environments.html.md.erb

@@ -1,7 +1,7 @@
 ---
 owner_slack: "#modernisation-platform"
 title: Creating environments in the Modernisation Platform
-last_reviewed_on: 2024-07-22
+last_reviewed_on: 2025-01-27
 review_in: 6 months
 ---
 

source/user-guide/platform-user-roles.html.md.erb

@@ -1,7 +1,7 @@
 ---
 owner_slack: "#modernisation-platform"
 title: Platform User Roles
-last_reviewed_on: 2024-07-20
+last_reviewed_on: 2025-01-27
 review_in: 6 months
 ---
 

source/user-guide/security-testing-and-ithc.html.md.erb

@@ -1,7 +1,7 @@
 ---
 owner_slack: "#modernisation-platform"
 title: Security Testing and ITHC
-last_reviewed_on: 2024-07-25
+last_reviewed_on: 2025-01-27
 review_in: 6 months
 ---
 

terraform/templates/modernisation-platform-environments-isolated/platform_backend.tf

@@ -5,10 +5,10 @@ terraform {
   backend "s3" {
     acl                  = "bucket-owner-full-control"
     bucket               = "modernisation-platform-terraform-state"
-    dynamodb_table       = "modernisation-platform-terraform-state-lock"
     encrypt              = true
     key                  = "terraform.tfstate"
     region               = "eu-west-2"
+    use_lockfile         = true
     workspace_key_prefix = "environments/members/$application_name" # This will store the object as environments/members/$application_name/${workspace}/terraform.tfstate
   }
 }

terraform/templates/modernisation-platform-environments/platform_backend.tf

@@ -5,10 +5,10 @@ terraform {
   backend "s3" {
     acl                  = "bucket-owner-full-control"
     bucket               = "modernisation-platform-terraform-state"
-    dynamodb_table       = "modernisation-platform-terraform-state-lock"
     encrypt              = true
     key                  = "terraform.tfstate"
     region               = "eu-west-2"
+    use_lockfile         = true
     workspace_key_prefix = "environments/members/$application_name" # This will store the object as environments/members/$application_name/${workspace}/terraform.tfstate
   }
 }