From edd8fcf71f1b251c467d6bbce6e8a190d4584dda Mon Sep 17 00:00:00 2001
From: Pytgaen <32298455+pytgaen@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:26:44 +0200
Subject: [PATCH] fix: check trivy activity to match new log format
---
templates/gitlab-ci-python.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/gitlab-ci-python.yml b/templates/gitlab-ci-python.yml
index 9a5759a..96783a0 100644
--- a/templates/gitlab-ci-python.yml
+++ b/templates/gitlab-ci-python.yml
@@ -1209,7 +1209,7 @@ py-trivy:
log_warn "The ./requirements.txt file does not match the ./reports/requirements.txt file generated via pip freeze. Make sure to include all dependencies with pinned versions in ./requirements.txt and re-commit the file."
fi
fi
- if [ $($python_trivy fs ${PYTHON_TRIVY_ARGS} --format table --exit-code 0 ./reports/ | grep -c "Number of language-specific files: 0") -eq 1 ]; then
+ if [ $($python_trivy fs ${PYTHON_TRIVY_ARGS} --format table --exit-code 0 ./reports/ 2>&1 | grep -ic "Number of language-specific files[^0-9]*0$" ) -eq 1 ]; then
log_error "Could not find a file listing all dependencies with their versions."
exit 1
fi
--
GitLab