From b3ec7f7aa3739ffb9579a0562d02c999563af407 Mon Sep 17 00:00:00 2001 From: David Sibley Date: Mon, 27 Jan 2025 11:59:34 +0000 Subject: [PATCH 1/2] update templates to use native lockfiles --- .../platform_backend.tf | 2 +- .../modernisation-platform-environments/platform_backend.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/templates/modernisation-platform-environments-isolated/platform_backend.tf b/terraform/templates/modernisation-platform-environments-isolated/platform_backend.tf index 725afa756..65159891e 100644 --- a/terraform/templates/modernisation-platform-environments-isolated/platform_backend.tf +++ b/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 } } diff --git a/terraform/templates/modernisation-platform-environments/platform_backend.tf b/terraform/templates/modernisation-platform-environments/platform_backend.tf index 725afa756..65159891e 100644 --- a/terraform/templates/modernisation-platform-environments/platform_backend.tf +++ b/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 } } From 5484c3a0d5ac0945340e26a9f170ca6d14b4c2e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2025 09:40:20 +0000 Subject: [PATCH 2/2] Bump github/codeql-action from 3.28.5 to 3.28.6 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.5 to 3.28.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4...17a820bf2e43b47be2c72b39cc905417bc1ab6d0) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/code-scanning.yml | 6 +++--- .github/workflows/scorecards.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml index 35055c0d0..2156043e9 100644 --- a/.github/workflows/code-scanning.yml +++ b/.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 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index c4aabe9bb..180265a0e 100644 --- a/.github/workflows/scorecards.yml +++ b/.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