chore: simplify PR

Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
anchore · Jun 24, 2024 · 519fd18 · 519fd18
1 parent 6f8ce81
commit 519fd18
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/.github/scripts/update-quality-gate-db.sh b/.github/scripts/update-quality-gate-db.sh
diff --git a/.github/workflows/update-quality-gate-db.yml b/.github/workflows/update-quality-gate-db.yml
@@ -3,7 +3,9 @@ on:
   schedule:
     - cron: "0 16 1 * *" # first day of each month @ 11 AM EST
 
-  workflow-dispatch:
+  push:
+    branches:
+      - workflow-update-test-db
 
 permissions:
   contents: read

diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -104,7 +104,7 @@ tasks:
   update-quality-gate-db:
     desc: Update pinned version of quality gate database
     cmds:
-      - cmd: .github/scripts/update-quality-gate-db.sh
+      - cmd: "go run cmd/grype/main.go db list -o json | jq -r .[0].url > test/quality/test-db-url"
         silent: true
 
   list-tools:

diff --git a/test/quality/Makefile b/test/quality/Makefile
@@ -8,7 +8,7 @@ VULNERABILITY_LABELS = ./vulnerability-labels
 RESULT_SET = pr_vs_latest_via_sbom
 
 # update periodically with values from "grype db list"
-TEST_DB_URL = https://toolbox-data.anchore.io/grype/databases/vulnerability-db_v5_2024-06-24T01:29:58Z_1719202889.tar.gz
+TEST_DB_URL_FILE = ./test-db-url
 TEST_DB = db.tar.gz
 LISTING_FILE = https://toolbox-data.anchore.io/grype/databases/listing.json
 
@@ -43,7 +43,7 @@ check-db:
 	@echo "DB is fresh enough to be used for testing!"
 
 $(TEST_DB):
-	curl -o $(TEST_DB) -SsL $(TEST_DB_URL)
+	@curl -o $(TEST_DB) -SsL `cat $(TEST_DB_URL_FILE)`
 
 .PHONY: sboms
 sboms: $(YARDSTICK_RESULT_DIR) venv clear-results ## Collect and store all syft results (deletes all existing results)

diff --git a/test/quality/test-db-url b/test/quality/test-db-url
@@ -0,0 +1 @@
+https://toolbox-data.anchore.io/grype/databases/vulnerability-db_v5_2024-06-24T01:29:58Z_1719202889.tar.gz