Merge branch 'main' of github.com:ministryofjustice/opg-digideps into D…

…DLS-399
ministryofjustice · Dec 5, 2024 · 736c6f8 · 736c6f8
2 parents 78c124a + c17b6ec
commit 736c6f8
Show file tree

Hide file tree

Showing 131 changed files with 5,840 additions and 3,526 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,3 +1,4 @@
 * @ministryofjustice/digideps
 /.github/workflows/* @ministryofjustice/opg-webops
 /.github/CODEOWNERS @ministryofjustice/opg-webops
+terraform/* @ministryofjustice/opg-webops
diff --git a/.github/workflows/_build-and-push.yml b/.github/workflows/_build-and-push.yml
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
 
       - name: set up docker buildx
-        uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
+        uses: docker/setup-buildx-action@0f069ddc17b8eb78586b08a7fe335fd54649e2d3
 
       - name: export dates
         id: cache-dates
@@ -144,7 +144,7 @@ jobs:
 
       - name: trivy image scanning
         id: trivy_scan
-        uses: aquasecurity/trivy-action@2b6a709cf9c4025c5438138008beaddbb02086f0 # pin@v0.7.1
+        uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # pin@v0.7.1
         with:
           image-ref: ${{ matrix.svc_name }}:latest
           severity: "HIGH,CRITICAL"

diff --git a/.github/workflows/_latest-deployed-image.yml b/.github/workflows/_latest-deployed-image.yml
@@ -40,7 +40,7 @@ jobs:
       - name: "Terraform version [${{ steps.tf_version_setup.outputs.TERRAFORM_VERSION }}]"
         run: echo "terraform version [${{ steps.tf_version_setup.outputs.TERRAFORM_VERSION }}]"
 
-      - uses: hashicorp/setup-terraform@1b93182764c8332e7679b2393cb307cbe7baf9dc # pin@v2.0.0
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # pin@v2.0.0
         with:
           terraform_version: ${{ steps.tf_version_setup.outputs.TERRAFORM_VERSION }}
           terraform_wrapper: false

diff --git a/.github/workflows/_lint-terraform.yml b/.github/workflows/_lint-terraform.yml
@@ -24,11 +24,11 @@ jobs:
 
       - id: terraform_version
         name: get terraform version
-        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.0.8
+        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.1.0
         with:
           terraform_directory: terraform/${{ matrix.folder }}
 
-      - uses: hashicorp/setup-terraform@1b93182764c8332e7679b2393cb307cbe7baf9dc # pin@v2.0.0
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # pin@v2.0.0
         with:
           terraform_version: ${{ steps.terraform_version.outputs.version }}
           terraform_wrapper: false

diff --git a/.github/workflows/_run-task.yml b/.github/workflows/_run-task.yml
@@ -36,11 +36,11 @@ jobs:
 
       - id: terraform_version
         name: get terraform version
-        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.0.8
+        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.1.0
         with:
           terraform_directory: terraform/environment
 
-      - uses: hashicorp/setup-terraform@1b93182764c8332e7679b2393cb307cbe7baf9dc # pin@v2.0.0
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # pin@v2.0.0
         with:
           terraform_version: ${{ steps.terraform_version.outputs.version }}
           terraform_wrapper: false

diff --git a/.github/workflows/_run-terraform.yml b/.github/workflows/_run-terraform.yml
@@ -49,11 +49,11 @@ jobs:
 
       - id: terraform_version
         name: get terraform version
-        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.0.8
+        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.1.0
         with:
           terraform_directory: terraform/${{ inputs.terraform_path }}
 
-      - uses: hashicorp/setup-terraform@1b93182764c8332e7679b2393cb307cbe7baf9dc # pin@v2.0.0
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # pin@v2.0.0
         with:
           terraform_version: ${{ steps.terraform_version.outputs.version }}
           terraform_wrapper: false
@@ -99,7 +99,7 @@ jobs:
       - id: terraform_workspace_manager
         if: inputs.apply && inputs.terraform_path == 'environment' && inputs.pull_request_path
         name: register workspace
-        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-workspace-manager@v3.0.8
+        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-workspace-manager@v3.1.0
         with:
           aws_account_id: 248804316466
           aws_iam_role: digideps-ci

diff --git a/.github/workflows/_unit-tests-api.yml b/.github/workflows/_unit-tests-api.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
 
       - name: set up docker buildx
-        uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
+        uses: docker/setup-buildx-action@0f069ddc17b8eb78586b08a7fe335fd54649e2d3
 
       - name: cache docker layers
         id: cache-docker

diff --git a/.github/workflows/_unit-tests-client.yml b/.github/workflows/_unit-tests-client.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@3b9b8c884f6b4bb4d5be2779c26374abadae0871 # pin@v3
 
       - name: set up docker buildx
-        uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
+        uses: docker/setup-buildx-action@0f069ddc17b8eb78586b08a7fe335fd54649e2d3
 
       - name: download resources artifact
         uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7

diff --git a/.github/workflows/scheduled-restore-anon-preprod.yml b/.github/workflows/scheduled-restore-anon-preprod.yml
@@ -19,34 +19,34 @@ permissions:
   statuses: none
 
 jobs:
-  backup_production:
-    name: backup production
-    uses: ./.github/workflows/_run-task.yml
-    with:
-      workspace: production02
-      account_name: production
-      task_name: "backup"
-      timeout: "700"
-    secrets: inherit
+  #  backup_production:
+  #    name: backup production
+  #    uses: ./.github/workflows/_run-task.yml
+  #    with:
+  #      workspace: production02
+  #      account_name: production
+  #      task_name: "backup"
+  #      timeout: "700"
+  #    secrets: inherit
 
-  restore_to_preproduction:
-    name: restore to preproduction
-    uses: ./.github/workflows/_run-task.yml
-    needs:
-      - backup_production
-    with:
-      workspace: preproduction
-      account_name: preproduction
-      task_name: "restore_from_production"
-      timeout: "3600"
-    secrets: inherit
+  #  restore_to_preproduction:
+  #    name: restore to preproduction
+  #    uses: ./.github/workflows/_run-task.yml
+  #    needs:
+  #      - backup_production
+  #    with:
+  #      workspace: preproduction
+  #      account_name: preproduction
+  #      task_name: "restore_from_production"
+  #      timeout: "3600"
+  #    secrets: inherit
 
   slack_notify_failure:
     name: notify of failure
     uses: ./.github/workflows/_slack-notification.yml
     if: ${{ failure() }}
-    needs:
-      - restore_to_preproduction
+    #    needs:
+    #      - backup_production
     with:
       success: no
       branch: main

diff --git a/.github/workflows/scheduled-workspace-cleanup.yml b/.github/workflows/scheduled-workspace-cleanup.yml
@@ -26,11 +26,11 @@ jobs:
 
       - id: terraform_version
         name: get terraform version
-        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.0.8
+        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.1.0
         with:
           terraform_directory: terraform/environment
 
-      - uses: hashicorp/setup-terraform@1b93182764c8332e7679b2393cb307cbe7baf9dc # pin@v2.0.0
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # pin@v2.0.0
         with:
           terraform_version: ${{ steps.terraform_version.outputs.version }}
           terraform_wrapper: false

diff --git a/.github/workflows/workflow-destroy-on-merge.yml b/.github/workflows/workflow-destroy-on-merge.yml
@@ -47,15 +47,15 @@ jobs:
       - workspace_name
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - id: terraform_version
         name: get terraform version
-        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.0.8
+        uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.1.0
         with:
           terraform_directory: terraform/environment
 
-      - uses: hashicorp/setup-terraform@1b93182764c8332e7679b2393cb307cbe7baf9dc # pin@v2.0.0
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # pin@v2.0.0
         with:
           terraform_version: ${{ steps.terraform_version.outputs.version }}
           terraform_wrapper: false

diff --git a/.github/workflows/workflow-path-to-live.yml b/.github/workflows/workflow-path-to-live.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: generate semver tag and release
         id: semver_tag
-        uses: ministryofjustice/opg-github-actions/.github/actions/semver-tag@v3.0.8
+        uses: ministryofjustice/opg-github-actions/.github/actions/semver-tag@v3.1.0
         with:
           prerelease: false
           default_bump: "minor"

diff --git a/.github/workflows/workflow-pull-request-path.yml b/.github/workflows/workflow-pull-request-path.yml
@@ -55,7 +55,7 @@ jobs:
           echo "- Build Identifier: ${BUILD_IDENTIFIER}" >> $GITHUB_STEP_SUMMARY
       - name: generate semver tag and release
         id: semver_tag
-        uses: ministryofjustice/opg-github-actions/.github/actions/semver-tag@v3.0.8
+        uses: ministryofjustice/opg-github-actions/.github/actions/semver-tag@v3.1.0
         with:
           prerelease: true
           default_bump: "minor"

diff --git a/api/app/composer.json b/api/app/composer.json
@@ -22,7 +22,7 @@
     },
     "require": {
         "php": "^8.1",
-        "aws/aws-sdk-php": "3.299.1",
+        "aws/aws-sdk-php": "3.329.0",
         "doctrine/doctrine-bundle": "^2.2",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.6.3",
@@ -55,7 +55,7 @@
         "symfony/routing": "^5.4.0",
         "symfony/security-bundle": "^5.4.0",
         "symfony/security-core": "^5.4.0",
-        "symfony/security-http": "5.4.45",
+        "symfony/security-http": "5.4.47",
         "symfony/serializer": "^5.4.0",
         "symfony/validator": "^5.4.0",
         "symfony/yaml": "^5.4.0"
@@ -78,12 +78,12 @@
         "phpstan/phpstan-phpunit": "^1.0.0",
         "phpunit/phpcov": "8.2.1",
         "phpunit/phpunit": "^9.5.10",
-        "symfony/http-client": "5.4.46",
+        "symfony/http-client": "5.4.47",
         "symfony/browser-kit": "^5.4.0",
         "symfony/maker-bundle": "^1.29",
         "symfony/mime": "^5.4.0",
         "symfony/phpunit-bridge": "^5.4.0",
-        "symfony/var-dumper": "^5.4.0"
+        "symfony/var-dumper": "5.4.48"
     },
     "scripts": {
         "post-install-cmd": [