Skip to content

Commit

Permalink
Merge pull request #691 from sudo-bmitch/pr-osv-scanner-gover
Browse files Browse the repository at this point in the history
Override Go versions for OSV Scanner
  • Loading branch information
sudo-bmitch committed Mar 25, 2024
2 parents 665ee59 + 1645a99 commit 1eccd07
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/vulnscans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ permissions:
contents: read

jobs:
govunlcheck:
name: Go Vuln Check
vulnerability-scans:
name: Run vulnerability scans
runs-on: ubuntu-latest
env:
RELEASE_GO_VER: "1.22"
Expand All @@ -25,6 +25,7 @@ jobs:
go-version: "${{ env.RELEASE_GO_VER }}"
check-latest: true

# intentionally not pinned to always run the latest scanner
- name: "Install govulncheck"
run: |
go install golang.org/x/vuln/cmd/govulncheck@latest
Expand All @@ -33,10 +34,12 @@ jobs:
run: |
govulncheck ./...
- name: "Install OSV Scanner"
run: |
go install github.com/google/osv-scanner/cmd/osv-scanner@latest
# TODO: reenable after 1.7.2 or later is released
# intentionally not pinned to always run the latest scanner
# - name: "Install OSV Scanner"
# run: |
# go install github.com/google/osv-scanner/cmd/osv-scanner@latest

- name: "Run OSV Scanner"
run: |
osv-scanner scan -r --experimental-licenses="Apache-2.0,BSD-3-Clause,MIT,CC-BY-SA-4.0,UNKNOWN" .
# - name: "Run OSV Scanner"
# run: |
# osv-scanner scan --config .osv-scanner.toml -r --experimental-licenses="Apache-2.0,BSD-3-Clause,MIT,CC-BY-SA-4.0,UNKNOWN" .
1 change: 1 addition & 0 deletions .osv-scanner.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GoVersionOverride = "1.22.1"
9 changes: 9 additions & 0 deletions .version-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ files:
"go.mod":
scans:
- go-mod-golang-release
".osv-scanner.toml":
scans:
- osv-golang-release

scans:
docker-arg-alpine-tag:
Expand Down Expand Up @@ -220,6 +223,12 @@ scans:
source: "registry-digest-match"
args:
regexp: '^SYFT_CONTAINER\?=(?P<Image>[^:]*):(?P<Tag>v[0-9\.]+)@(?P<Version>sha256:[0-9a-f]+)\s*$'
osv-golang-release:
type: "regexp"
source: "registry-tag-arg-semver"
args:
regexp: '^GoVersionOverride = "(?P<Version>[0-9\.]+)"\s*$'
repo: "docker.io/library/golang"
shell-alpine-tag:
type: "regexp"
source: "registry-tag-arg-semver-major"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ vulnerability-scan: osv-scanner vulncheck-go ## Run all vulnerability scanners

.PHONY: osv-scanner
osv-scanner: $(GOPATH)/bin/osv-scanner .FORCE ## Run OSV Scanner
$(GOPATH)/bin/osv-scanner scan -r --experimental-licenses="Apache-2.0,BSD-3-Clause,MIT,CC-BY-SA-4.0,UNKNOWN" .
$(GOPATH)/bin/osv-scanner scan --config .osv-scanner.toml -r --experimental-licenses="Apache-2.0,BSD-3-Clause,MIT,CC-BY-SA-4.0,UNKNOWN" .

.PHONY: vulncheck-go
vulncheck-go: $(GOPATH)/bin/govulncheck .FORCE ## Run govulncheck
Expand Down

0 comments on commit 1eccd07

Please sign in to comment.