Merge branch 'main' into dependabot/github_actions/aws-actions/aws-se…

…cretsmanager-get-secrets-2.0.1
ministryofjustice · Feb 6, 2024 · 5da04a7 · 5da04a7
2 parents 100fe23 + 703a420
commit 5da04a7
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 24 deletions.
diff --git a/.github/workflows/repository-openssf-scorecard.yml b/.github/workflows/repository-openssf-scorecard.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Upload SARIF results
         id: upload_sarif_results
-        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v3.1.0
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v3.1.0
         with:
           name: SARIF results
           path: results.sarif

diff --git a/.github/workflows/reusable-workflow-containers.yml b/.github/workflows/reusable-workflow-containers.yml
@@ -182,7 +182,7 @@ jobs:
 
       - name: Scan Image
         id: scan_image
-        uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca # v0.16.1
+        uses: aquasecurity/trivy-action@84384bd6e777ef152729993b8145ea352e9dd3ef # v0.17.0
         with:
           image-ref: ${{ needs.prepare-environment.outputs.name }}:${{ needs.prepare-environment.outputs.version }}
           exit-code: 1
@@ -194,7 +194,7 @@ jobs:
       - name: Scan Image (On SARIF Scan Failure)
         if: failure() && steps.scan_image.outcome == 'failure'
         id: scan_image_on_failure
-        uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca # v0.16.1
+        uses: aquasecurity/trivy-action@84384bd6e777ef152729993b8145ea352e9dd3ef # v0.17.0
         with:
           image-ref: ${{ needs.prepare-environment.outputs.name }}:${{ needs.prepare-environment.outputs.version }}
           exit-code: 1

diff --git a/.github/workflows/reusable-workflow-terraform.yml b/.github/workflows/reusable-workflow-terraform.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Trivy
         if: github.ref != 'refs/heads/main'
         id: terraform_static_analysis_trivy
-        uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca # v0.16.1
+        uses: aquasecurity/trivy-action@84384bd6e777ef152729993b8145ea352e9dd3ef # v0.17.0
         with:
           scan-type: config
           scan-ref: ${{ env.working-directory }}

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: trivy
         id: terraform_static_analysis_trivy
-        uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca # v0.16.1
+        uses: aquasecurity/trivy-action@84384bd6e777ef152729993b8145ea352e9dd3ef # v0.17.0
         with:
           scan-type: config
           ignore-unfixed: true

diff --git a/terraform/aws/analytical-platform-data-engineering-production/10ds/.terraform.lock.hcl b/terraform/aws/analytical-platform-data-engineering-production/10ds/.terraform.lock.hcl
diff --git a/terraform/aws/analytical-platform-data-engineering-production/10ds/terraform.tf b/terraform/aws/analytical-platform-data-engineering-production/10ds/terraform.tf
@@ -10,7 +10,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "5.34.0"
+      version = "5.35.0"
     }
   }
   required_version = "~> 1.5"

diff --git a/...rm/cloud-platform/live/data-platform-production/actions-runners/create-a-derived-table.tf b/...rm/cloud-platform/live/data-platform-production/actions-runners/create-a-derived-table.tf
@@ -17,6 +17,11 @@ resource "helm_release" "create_a_derived_table" {
   chart      = "actions-runner"
   namespace  = "data-platform-production"
 
+  set {
+    name  = "replicaCount"
+    value = 2
+  }
+
   set {
     name  = "github.organisation"
     value = "moj-analytical-services"

diff --git a/terraform/dpat-eks/production/actions-runners/create-a-derived-table.tf b/terraform/dpat-eks/production/actions-runners/create-a-derived-table.tf
@@ -17,6 +17,11 @@ resource "helm_release" "create_a_derived_table" {
   chart      = "actions-runner"
   namespace  = "actions-runners"
 
+  set {
+    name  = "replicaCount"
+    value = 2
+  }
+
   set {
     name  = "github.organisation"
     value = "moj-analytical-services"