Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions .github/actions/trivy/action.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: "Trivy Scan"
runs:
using: "composite"
steps:
- name: "Trivy Terraform IAC Scan"
shell: bash
run: |
components_exit_code=0
modules_exit_code=0
#TODO - Re-visit Trivy usage https://nhsd-jira.digital.nhs.uk/browse/CCM-15549
# name: "Trivy Scan"
# runs:
# using: "composite"
# steps:
# - name: "Trivy Terraform IAC Scan"
# shell: bash
# run: |
# components_exit_code=0
# modules_exit_code=0

./scripts/terraform/trivy.sh ./infrastructure/terraform/components || components_exit_code=$?
./scripts/terraform/trivy.sh ./infrastructure/terraform/modules || modules_exit_code=$?
# ./scripts/terraform/trivy.sh ./infrastructure/terraform/components || components_exit_code=$?
# ./scripts/terraform/trivy.sh ./infrastructure/terraform/modules || modules_exit_code=$?

if [ $components_exit_code -ne 0 ] || [ $modules_exit_code -ne 0 ]; then
echo "Trivy misconfigurations detected."
exit 1
fi
# if [ $components_exit_code -ne 0 ] || [ $modules_exit_code -ne 0 ]; then
# echo "Trivy misconfigurations detected."
# exit 1
# fi
31 changes: 16 additions & 15 deletions .github/workflows/stage-1-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,22 @@ jobs:
uses: actions/checkout@v5
- name: "Lint Terraform"
uses: ./.github/actions/lint-terraform
trivy:
name: "Trivy Scan"
runs-on: ubuntu-latest
timeout-minutes: 5
needs: detect-terraform-changes
if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
steps:
- name: "Checkout code"
uses: actions/checkout@v5
- name: "Setup ASDF"
uses: asdf-vm/actions/setup@v4
- name: "Perform Setup"
uses: ./.github/actions/setup
- name: "Trivy Scan"
uses: ./.github/actions/trivy
#TODO - Re-visit Trivy usage https://nhsd-jira.digital.nhs.uk/browse/CCM-15549
# trivy:
# name: "Trivy Scan"
# runs-on: ubuntu-latest
# timeout-minutes: 5
# needs: detect-terraform-changes
# if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
# steps:
# - name: "Checkout code"
# uses: actions/checkout@v5
# - name: "Setup ASDF"
# uses: asdf-vm/actions/setup@v4
# - name: "Perform Setup"
# uses: ./.github/actions/setup
# - name: "Trivy Scan"
# uses: ./.github/actions/trivy
count-lines-of-code:
name: "Count lines of code"
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ nodejs 22.12.0
pre-commit 3.6.0
terraform 1.9.2
terraform-docs 0.19.0
trivy 0.61.0
vale 3.6.0
python 3.13.2
# trivy 0.61.0 - TODO - Re-visit Trivy usage https://nhsd-jira.digital.nhs.uk/browse/CCM-15549

# ==============================================================================
# The section below is reserved for Docker image versions.
Expand Down
Loading