From a2c4f457de12dd90017db0494fff078689068863 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Tue, 1 Apr 2025 09:11:16 +1300 Subject: [PATCH 1/3] chore: enable `redundant-test-main-exit` rule for `revive` linter --- .golangci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.golangci.yaml b/.golangci.yaml index 87437c333db..07074f9179c 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -96,6 +96,8 @@ linters-settings: disabled: false - name: redefines-builtin-id disabled: false + - name: redundant-test-main-exit + disabled: false - name: superfluous-else disabled: false - name: time-naming From 257905c99a2f27e62be472eeebb0c5fe0dab60df Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Tue, 1 Apr 2025 09:14:45 +1300 Subject: [PATCH 2/3] test: remove unneeded calls to `os.Exit` --- cmd/osv-scanner/fix/testmain_test.go | 5 +---- cmd/osv-scanner/internal/cmd/testmain_test.go | 5 +---- cmd/osv-scanner/scan/image/testmain_test.go | 5 +---- cmd/osv-scanner/scan/testmain_test.go | 5 +---- cmd/osv-scanner/testmain_test.go | 3 +-- cmd/osv-scanner/update/testmain_test.go | 5 +---- internal/ci/testmain_test.go | 5 +---- internal/datasource/testmain_test.go | 5 +---- internal/output/testmain_test.go | 5 +---- internal/remediation/testmain_test.go | 5 +---- internal/resolution/lockfile/testmain_test.go | 5 +---- internal/resolution/manifest/testmain_test.go | 5 +---- internal/resolution/testmain_test.go | 5 +---- internal/sourceanalysis/testmain_test.go | 5 +---- pkg/models/testmain_test.go | 5 +---- pkg/osvscanner/testmain_test.go | 5 +---- 16 files changed, 16 insertions(+), 62 deletions(-) diff --git a/cmd/osv-scanner/fix/testmain_test.go b/cmd/osv-scanner/fix/testmain_test.go index 85018760abe..6e362329a8e 100644 --- a/cmd/osv-scanner/fix/testmain_test.go +++ b/cmd/osv-scanner/fix/testmain_test.go @@ -1,16 +1,13 @@ package fix import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/cmd/osv-scanner/internal/cmd/testmain_test.go b/cmd/osv-scanner/internal/cmd/testmain_test.go index d57be277c18..5a5c66ade98 100644 --- a/cmd/osv-scanner/internal/cmd/testmain_test.go +++ b/cmd/osv-scanner/internal/cmd/testmain_test.go @@ -1,16 +1,13 @@ package cmd import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/cmd/osv-scanner/scan/image/testmain_test.go b/cmd/osv-scanner/scan/image/testmain_test.go index c25a6df304d..bd7db18dd1b 100644 --- a/cmd/osv-scanner/scan/image/testmain_test.go +++ b/cmd/osv-scanner/scan/image/testmain_test.go @@ -1,16 +1,13 @@ package image_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/cmd/osv-scanner/scan/testmain_test.go b/cmd/osv-scanner/scan/testmain_test.go index c8872cc5e74..e5d01f6ed42 100644 --- a/cmd/osv-scanner/scan/testmain_test.go +++ b/cmd/osv-scanner/scan/testmain_test.go @@ -1,16 +1,13 @@ package scan_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/cmd/osv-scanner/testmain_test.go b/cmd/osv-scanner/testmain_test.go index f63d40833f5..ad2e54802b3 100644 --- a/cmd/osv-scanner/testmain_test.go +++ b/cmd/osv-scanner/testmain_test.go @@ -18,10 +18,9 @@ func TestMain(m *testing.M) { if err != nil { panic(err) } - code := m.Run() + m.Run() testutility.CleanSnapshots(m) os.RemoveAll("./fixtures/.git") - os.Exit(code) } diff --git a/cmd/osv-scanner/update/testmain_test.go b/cmd/osv-scanner/update/testmain_test.go index a4ce67da4dd..997ed8b6c7c 100644 --- a/cmd/osv-scanner/update/testmain_test.go +++ b/cmd/osv-scanner/update/testmain_test.go @@ -1,16 +1,13 @@ package update_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/internal/ci/testmain_test.go b/internal/ci/testmain_test.go index 65a33384d70..09680fe71a7 100644 --- a/internal/ci/testmain_test.go +++ b/internal/ci/testmain_test.go @@ -1,16 +1,13 @@ package ci_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/internal/datasource/testmain_test.go b/internal/datasource/testmain_test.go index f7ab6671ecd..b773f09e313 100644 --- a/internal/datasource/testmain_test.go +++ b/internal/datasource/testmain_test.go @@ -1,16 +1,13 @@ package datasource_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/internal/output/testmain_test.go b/internal/output/testmain_test.go index 182268df21f..02fbe36ebc1 100644 --- a/internal/output/testmain_test.go +++ b/internal/output/testmain_test.go @@ -1,16 +1,13 @@ package output_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/internal/remediation/testmain_test.go b/internal/remediation/testmain_test.go index 93f48eedafc..0819f0f7b09 100644 --- a/internal/remediation/testmain_test.go +++ b/internal/remediation/testmain_test.go @@ -1,16 +1,13 @@ package remediation_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/internal/resolution/lockfile/testmain_test.go b/internal/resolution/lockfile/testmain_test.go index dba91cfa186..4a50eeb07f8 100644 --- a/internal/resolution/lockfile/testmain_test.go +++ b/internal/resolution/lockfile/testmain_test.go @@ -1,16 +1,13 @@ package lockfile_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/internal/resolution/manifest/testmain_test.go b/internal/resolution/manifest/testmain_test.go index 1ea40752df6..4c1ff1a9de9 100644 --- a/internal/resolution/manifest/testmain_test.go +++ b/internal/resolution/manifest/testmain_test.go @@ -1,16 +1,13 @@ package manifest_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/internal/resolution/testmain_test.go b/internal/resolution/testmain_test.go index 7f55eb6b698..5721f7aa37e 100644 --- a/internal/resolution/testmain_test.go +++ b/internal/resolution/testmain_test.go @@ -1,16 +1,13 @@ package resolution_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/internal/sourceanalysis/testmain_test.go b/internal/sourceanalysis/testmain_test.go index 0e1f7730a8c..77778a9d3e8 100644 --- a/internal/sourceanalysis/testmain_test.go +++ b/internal/sourceanalysis/testmain_test.go @@ -1,16 +1,13 @@ package sourceanalysis_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/pkg/models/testmain_test.go b/pkg/models/testmain_test.go index 955fd00543a..2142eb0096b 100644 --- a/pkg/models/testmain_test.go +++ b/pkg/models/testmain_test.go @@ -1,16 +1,13 @@ package models_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } diff --git a/pkg/osvscanner/testmain_test.go b/pkg/osvscanner/testmain_test.go index d615ca18dee..a1ffd0b9463 100644 --- a/pkg/osvscanner/testmain_test.go +++ b/pkg/osvscanner/testmain_test.go @@ -1,16 +1,13 @@ package osvscanner_test import ( - "os" "testing" "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { - code := m.Run() + m.Run() testutility.CleanSnapshots(m) - - os.Exit(code) } From 4a8257ee3922ca8866bdd1632c66b20649b2eb96 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Tue, 1 Apr 2025 09:32:53 +1300 Subject: [PATCH 3/3] chore: disable revive rule for now --- .golangci.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 07074f9179c..a0b6705e84b 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -96,8 +96,10 @@ linters-settings: disabled: false - name: redefines-builtin-id disabled: false - - name: redundant-test-main-exit - disabled: false + # todo: enable once we've upgraded to v2, as the validation schema + # used by the github v1 action does not have this rule yet + # - name: redundant-test-main-exit + # disabled: false - name: superfluous-else disabled: false - name: time-naming