From 4062c7d140093a6a9e282c2912bc0cb6467e69aa Mon Sep 17 00:00:00 2001 From: Rhys Cox Date: Fri, 24 Apr 2026 15:01:40 +0100 Subject: [PATCH] Reverted terraform script changes as these are sourced from another repo --- scripts/config/sonar-scanner.properties | 1 + scripts/terraform/terraform.sh | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/config/sonar-scanner.properties b/scripts/config/sonar-scanner.properties index 52da5eeb..26c95f97 100644 --- a/scripts/config/sonar-scanner.properties +++ b/scripts/config/sonar-scanner.properties @@ -3,6 +3,7 @@ sonar.host.url=https://sonarcloud.io sonar.qualitygate.wait=true sonar.sourceEncoding=UTF-8 +sonar.exclusions=infrastructure/terraform/bin/terraform.sh sonar.terraform.provider.aws.version=5.54.1 sonar.cpd.exclusions=**.test.*, src/models/** sonar.coverage.exclusions=.github/**, docs/**, infrastructure/terraform/**, scripts/**, tests/test-support/**, tests/**, lambdas/**/src/__tests__/**, src/**/src/__tests__/**, src/models/**, tools/**/src/__tests__/**, **/jest.config.*, **/knip.ts, eslint.config.mjs diff --git a/scripts/terraform/terraform.sh b/scripts/terraform/terraform.sh index 0909f97e..73f37c1a 100755 --- a/scripts/terraform/terraform.sh +++ b/scripts/terraform/terraform.sh @@ -27,8 +27,6 @@ function main() { else cmd=$cmd run-terraform-in-docker fi - - return 0 } # Run Terraform natively. @@ -38,8 +36,6 @@ function run-terraform-natively() { # shellcheck disable=SC2086 terraform $cmd - - return 0 } # Run Terraform in a Docker container. @@ -58,16 +54,13 @@ function run-terraform-in-docker() { --workdir /workdir \ "$image" \ $cmd - - return 0 } # ============================================================================== function is-arg-true() { - local arg="$1" - if [[ "$arg" =~ ^(true|yes|y|on|1|TRUE|YES|Y|ON)$ ]]; then + if [[ "$1" =~ ^(true|yes|y|on|1|TRUE|YES|Y|ON)$ ]]; then return 0 else return 1