Skip to content

Commit 83690f7

Browse files
nikpivkinnikpivkin
authored
ci: install trivy in bump-trivy workflow and update tests (#495)
* ci: install trivy in bump-trivy workflow Signed-off-by: Nikita Pivkin <nikita.pivkin@smartforce.io> * test: diasble list-all-pkgs and remove ReportID Signed-off-by: Nikita Pivkin <nikita.pivkin@smartforce.io> * ci: run tests after updating golden files Signed-off-by: Nikita Pivkin <nikita.pivkin@smartforce.io> * fix BATS_LIB_PATH setting Signed-off-by: Nikita Pivkin <nikita.pivkin@smartforce.io> --------- Signed-off-by: Nikita Pivkin <nikita.pivkin@smartforce.io>
1 parent df65449 commit 83690f7

3 files changed

Lines changed: 19 additions & 8 deletions

File tree

‎.github/workflows/bump-trivy.yaml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,31 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
18-
19-
- name: Set new version from input
20-
run: echo "NEW_VERSION=${{ inputs.trivy_version }}" >> $GITHUB_ENV
2118

2219
- name: Update Trivy versions
20+
env:
21+
NEW_VERSION: ${{ inputs.trivy_version }}
2322
run: make bump-trivy
2423

2524
- name: Setup Bats and bats libs
2625
id: setup-bats
2726
uses: bats-core/bats-action@3.0.1
2827

28+
- name: Install Trivy
29+
run: |
30+
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v${{ inputs.trivy_version }}
31+
trivy --version
32+
2933
- name: Update golden files
3034
env:
3135
BATS_LIB_PATH: ${{ steps.setup-bats.outputs.lib-path }}
3236
run: make update-golden
3337

38+
- name: Run tests
39+
env:
40+
BATS_LIB_PATH: ${{ steps.setup-bats.outputs.lib-path }}
41+
run: make test
42+
3443
- name: Create PR
3544
id: create-pr
3645
uses: peter-evans/create-pull-request@v5

‎Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
OS := $(shell uname)
2-
SED = sed
3-
BATS_LIB_PATH ?= /usr/local/lib/
42

53
ifeq ($(OS), Darwin)
6-
SED = gsed
7-
BATS_LIB_PATH ?= /opt/homebrew/lib
4+
SED = gsed
5+
BATS_LIB_PATH ?= /opt/homebrew/lib
6+
else
7+
SED = sed
8+
BATS_LIB_PATH ?= /usr/local/lib/
89
endif
910

1011
BATS_ENV := BATS_LIB_PATH=$(BATS_LIB_PATH) \

‎test/test.bats‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ setup_file() {
55
export TRIVY_DB_REPOSITORY=ghcr.io/${owner}/trivy-db-act:latest
66
export TRIVY_JAVA_DB_REPOSITORY=ghcr.io/${owner}/trivy-java-db-act:latest
77
export TRIVY_CHECKS_BUNDLE_REPOSITORY=ghcr.io/${owner}/trivy-checks-act:latest
8+
export TRIVY_LIST_ALL_PKGS=false
89
}
910

1011
setup() {
@@ -16,7 +17,7 @@ setup() {
1617
function remove_json_fields() {
1718
local file="$1"
1819
if [[ "$file" == *.json ]]; then
19-
jq 'del(.CreatedAt)' "$file" > tmp && mv tmp "$file"
20+
jq 'del(.CreatedAt, .ReportID)' "$file" > tmp && mv tmp "$file"
2021
fi
2122
}
2223

0 commit comments

Comments
 (0)