Skip to content

Commit 47df0a8

Browse files
authored
CCM-15551: Removing Trivi Observabilty (#51)
1 parent 6b81211 commit 47df0a8

3 files changed

Lines changed: 6 additions & 23 deletions

File tree

.github/workflows/stage-1-commit.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,6 @@ jobs:
135135
uses: actions/checkout@v4
136136
- name: "Lint Terraform"
137137
uses: ./.github/actions/lint-terraform
138-
trivy:
139-
name: "Trivy Scan"
140-
runs-on: ubuntu-latest
141-
timeout-minutes: 5
142-
needs: detect-terraform-changes
143-
if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
144-
steps:
145-
- name: "Checkout code"
146-
uses: actions/checkout@v4
147-
- name: "Setup ASDF"
148-
uses: asdf-vm/actions/setup@v4
149-
- name: "Perform Setup"
150-
uses: ./.github/actions/setup
151-
- name: "Trivy Scan"
152-
uses: ./.github/actions/trivy
153138
count-lines-of-code:
154139
name: "Count lines of code"
155140
runs-on: ubuntu-latest

.tool-versions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ nodejs 22.11.0
55
pre-commit 3.6.0
66
terraform 1.9.2
77
terraform-docs 0.19.0
8-
trivy 0.61.0
8+
# TODO - Re-visit Trivy usage https://nhsd-jira.digital.nhs.uk/browse/CCM-15549
9+
# trivy 0.61.0
910
vale 3.6.0
1011
python 3.13.2
1112

scripts/terraform/terraform.mk

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,10 @@ terraform-shellscript-lint: # Lint all Terraform module shell scripts @Quality
5555
file=$${file} scripts/shellscript-linter.sh
5656
done
5757

58-
terraform-sec: # TFSEC check against Terraform files - optional: terraform_dir|dir=[path to a directory where the command will be executed, relative to the project's top-level directory, default is one of the module variables or the example directory, if not set], terraform_opts|opts=[options to pass to the Terraform fmt command, default is '-recursive'] @Quality
59-
tfsec infrastructure/terraform \
60-
--force-all-dirs \
61-
--exclude-downloaded-modules \
62-
--tfvars-file infrastructure/terraform/etc/global.tfvars \
63-
--tfvars-file infrastructure/terraform/etc/env_eu-west-2_main.tfvars \
64-
--config-file scripts/config/tfsec.yaml
58+
# TODO - Re-visit Trivy usage https://nhsd-jira.digital.nhs.uk/browse/CCM-15549
59+
# terraform-sec: # Run Trivy IaC security scanning on Terraform code @Quality
60+
# # Example: make terraform-sec
61+
# ./scripts/terraform/trivy-scan.sh --mode iac infrastructure/terraform
6562

6663
terraform-docs: # Terraform-docs check against Terraform files - optional: terraform_dir|dir=[path to a directory where the command will be executed, relative to the project's top-level directory, default is one of the module variables or the example directory, if not set], terraform_opts|opts=[options to pass to the Terraform fmt command, default is '-recursive'] @Quality
6764
for dir in ./infrastructure/terraform/components/* ./infrastructure/terraform/modules/*; do \

0 commit comments

Comments
 (0)