diff --git a/.golangci.yaml b/.golangci.yaml index 825e230fa55..537ea882f7e 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -37,10 +37,10 @@ linters-settings: settings: printf: funcs: - - (github.com/google/osv-scanner/pkg/reporter.Reporter).Errorf - - (github.com/google/osv-scanner/pkg/reporter.Reporter).Warnf - - (github.com/google/osv-scanner/pkg/reporter.Reporter).Verbosef - - (github.com/google/osv-scanner/pkg/reporter.Reporter).Infof + - (github.com/google/osv-scanner/v2/pkg/reporter.Reporter).Errorf + - (github.com/google/osv-scanner/v2/pkg/reporter.Reporter).Warnf + - (github.com/google/osv-scanner/v2/pkg/reporter.Reporter).Verbosef + - (github.com/google/osv-scanner/v2/pkg/reporter.Reporter).Infof depguard: rules: regexp: @@ -49,7 +49,7 @@ linters-settings: - "!**/main_test.go" deny: - pkg: "regexp" - desc: "Use github.com/google/osv-scanner/internal/cachedregexp instead" + desc: "Use github.com/google/osv-scanner/v2/internal/cachedregexp instead" gocritic: disabled-checks: - ifElseChain diff --git a/.goreleaser.yml b/.goreleaser.yml index cbc306f63de..2375c48a7d1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -18,7 +18,7 @@ builds: - -trimpath ldflags: # prettier-ignore - - '-s -w -X github.com/google/osv-scanner/internal/version.OSVVersion={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}}' + - '-s -w -X github.com/google/osv-scanner/v2/internal/version.OSVVersion={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}}' goos: # Further testing before supporting freebsd # - freebsd @@ -46,7 +46,7 @@ builds: - -trimpath ldflags: # prettier-ignore - - '-s -w -X github.com/google/osv-scanner/internal/version.OSVVersion={{.Version}}_GHAction -X main.commit={{.Commit}} -X main.date={{.CommitDate}}' + - '-s -w -X github.com/google/osv-scanner/v2/internal/version.OSVVersion={{.Version}}_GHAction -X main.commit={{.Commit}} -X main.date={{.CommitDate}}' goos: - linux goarch: @@ -62,7 +62,7 @@ builds: - -trimpath ldflags: # prettier-ignore - - '-s -w -X github.com/google/osv-scanner/internal/version.OSVVersion={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}}' + - '-s -w -X github.com/google/osv-scanner/v2/internal/version.OSVVersion={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}}' goos: - linux goarch: diff --git a/README.md b/README.md index 47ece1aeb00..0d2d1577f32 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ The above all results in accurate and actionable vulnerability notifications, wh ## Basic installation To install OSV-Scanner, please refer to the [installation section](https://google.github.io/osv-scanner/installation) of our documentation. OSV-Scanner releases can be found on the [releases page](https://github.com/google/osv-scanner/releases) of the GitHub repository. The recommended method is to download a prebuilt binary for your platform. Alternatively, you can use -`go install github.com/google/osv-scanner/cmd/osv-scanner@v2.0.0-beta1`. +`go install github.com/google/osv-scanner/v2/cmd/osv-scanner@v2.0.0-beta1`. ## Key Features diff --git a/cmd/osv-reporter/main.go b/cmd/osv-reporter/main.go index 83e368f2949..e96800cbb21 100644 --- a/cmd/osv-reporter/main.go +++ b/cmd/osv-reporter/main.go @@ -7,11 +7,11 @@ import ( "os" "strings" - "github.com/google/osv-scanner/internal/ci" - "github.com/google/osv-scanner/internal/version" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/osvscanner" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/ci" + "github.com/google/osv-scanner/v2/internal/version" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/osvscanner" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/urfave/cli/v2" "golang.org/x/term" ) diff --git a/cmd/osv-scanner/fix/interactive.go b/cmd/osv-scanner/fix/interactive.go index 4fe208bdbb5..befd81b8d2e 100644 --- a/cmd/osv-scanner/fix/interactive.go +++ b/cmd/osv-scanner/fix/interactive.go @@ -5,7 +5,7 @@ import ( "errors" tea "github.com/charmbracelet/bubbletea" - "github.com/google/osv-scanner/internal/remediation" + "github.com/google/osv-scanner/v2/internal/remediation" ) // TODO: currently, it's impossible to undo commands diff --git a/cmd/osv-scanner/fix/main.go b/cmd/osv-scanner/fix/main.go index e946b38676c..37e0a73ae27 100644 --- a/cmd/osv-scanner/fix/main.go +++ b/cmd/osv-scanner/fix/main.go @@ -11,20 +11,20 @@ import ( "time" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/clients/clientimpl/localmatcher" - "github.com/google/osv-scanner/internal/clients/clientimpl/osvmatcher" - "github.com/google/osv-scanner/internal/depsdev" - "github.com/google/osv-scanner/internal/imodels/ecosystem" - "github.com/google/osv-scanner/internal/osvdev" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/resolution/lockfile" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/resolution/util" - "github.com/google/osv-scanner/internal/version" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/localmatcher" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/osvmatcher" + "github.com/google/osv-scanner/v2/internal/depsdev" + "github.com/google/osv-scanner/v2/internal/imodels/ecosystem" + "github.com/google/osv-scanner/v2/internal/osvdev" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/resolution/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/resolution/util" + "github.com/google/osv-scanner/v2/internal/version" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/ossf/osv-schema/bindings/go/osvschema" "github.com/urfave/cli/v2" "golang.org/x/term" diff --git a/cmd/osv-scanner/fix/main_test.go b/cmd/osv-scanner/fix/main_test.go index db5382ce08f..616d75dff33 100644 --- a/cmd/osv-scanner/fix/main_test.go +++ b/cmd/osv-scanner/fix/main_test.go @@ -4,8 +4,8 @@ import ( "slices" "testing" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/urfave/cli/v2" ) diff --git a/cmd/osv-scanner/fix/model.go b/cmd/osv-scanner/fix/model.go index 92ea862e8c1..cb9beffff2f 100644 --- a/cmd/osv-scanner/fix/model.go +++ b/cmd/osv-scanner/fix/model.go @@ -11,12 +11,12 @@ import ( "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - manif "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/tui" - osvLockfile "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + manif "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/tui" + osvLockfile "github.com/google/osv-scanner/v2/pkg/lockfile" "golang.org/x/term" ) diff --git a/cmd/osv-scanner/fix/noninteractive.go b/cmd/osv-scanner/fix/noninteractive.go index 6c5a02cd889..9e08c2b806d 100644 --- a/cmd/osv-scanner/fix/noninteractive.go +++ b/cmd/osv-scanner/fix/noninteractive.go @@ -9,14 +9,14 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - lf "github.com/google/osv-scanner/internal/resolution/lockfile" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/resolution/util" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + lf "github.com/google/osv-scanner/v2/internal/resolution/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/resolution/util" + "github.com/google/osv-scanner/v2/pkg/lockfile" "golang.org/x/exp/maps" ) diff --git a/cmd/osv-scanner/fix/output.go b/cmd/osv-scanner/fix/output.go index 7a5bf4eaaaf..ffc5947bbbc 100644 --- a/cmd/osv-scanner/fix/output.go +++ b/cmd/osv-scanner/fix/output.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) // fixOutput is a description of changes made by guided remediation to a manifest/lockfile. diff --git a/cmd/osv-scanner/fix/state-choose-in-place-patches.go b/cmd/osv-scanner/fix/state-choose-in-place-patches.go index ea574067b34..a43bc8073b8 100644 --- a/cmd/osv-scanner/fix/state-choose-in-place-patches.go +++ b/cmd/osv-scanner/fix/state-choose-in-place-patches.go @@ -8,7 +8,7 @@ import ( "github.com/charmbracelet/bubbles/table" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/tui" + "github.com/google/osv-scanner/v2/internal/tui" ) type stateChooseInPlacePatches struct { diff --git a/cmd/osv-scanner/fix/state-choose-strategy.go b/cmd/osv-scanner/fix/state-choose-strategy.go index 9f84cb66c34..f34542d92f0 100644 --- a/cmd/osv-scanner/fix/state-choose-strategy.go +++ b/cmd/osv-scanner/fix/state-choose-strategy.go @@ -8,9 +8,9 @@ import ( "github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/textinput" tea "github.com/charmbracelet/bubbletea" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/tui" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/tui" "golang.org/x/exp/slices" ) diff --git a/cmd/osv-scanner/fix/state-in-place-result.go b/cmd/osv-scanner/fix/state-in-place-result.go index 6930b1e3c1f..13b02ee439d 100644 --- a/cmd/osv-scanner/fix/state-in-place-result.go +++ b/cmd/osv-scanner/fix/state-in-place-result.go @@ -6,10 +6,10 @@ import ( "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/resolution" - lockf "github.com/google/osv-scanner/internal/resolution/lockfile" - "github.com/google/osv-scanner/internal/tui" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/resolution" + lockf "github.com/google/osv-scanner/v2/internal/resolution/lockfile" + "github.com/google/osv-scanner/v2/internal/tui" "golang.org/x/exp/slices" ) diff --git a/cmd/osv-scanner/fix/state-initialize.go b/cmd/osv-scanner/fix/state-initialize.go index a50986ebb0d..cd670dc2fdd 100644 --- a/cmd/osv-scanner/fix/state-initialize.go +++ b/cmd/osv-scanner/fix/state-initialize.go @@ -6,7 +6,7 @@ import ( "github.com/charmbracelet/bubbles/spinner" tea "github.com/charmbracelet/bubbletea" - "github.com/google/osv-scanner/internal/tui" + "github.com/google/osv-scanner/v2/internal/tui" ) type stateInitialize struct { diff --git a/cmd/osv-scanner/fix/state-relock-result.go b/cmd/osv-scanner/fix/state-relock-result.go index 1c9143e18a1..6c16f33fb0b 100644 --- a/cmd/osv-scanner/fix/state-relock-result.go +++ b/cmd/osv-scanner/fix/state-relock-result.go @@ -9,11 +9,11 @@ import ( "github.com/charmbracelet/bubbles/spinner" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - manif "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/tui" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + manif "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/tui" "golang.org/x/exp/maps" ) diff --git a/cmd/osv-scanner/fix_test.go b/cmd/osv-scanner/fix_test.go index d27dfc5d24a..5fb6c980413 100644 --- a/cmd/osv-scanner/fix_test.go +++ b/cmd/osv-scanner/fix_test.go @@ -6,7 +6,7 @@ import ( "slices" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func copyFileTo(t *testing.T, file, dir string) string { diff --git a/cmd/osv-scanner/internal/helper/helper.go b/cmd/osv-scanner/internal/helper/helper.go index c068d26dc79..5e7d0edac61 100644 --- a/cmd/osv-scanner/internal/helper/helper.go +++ b/cmd/osv-scanner/internal/helper/helper.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/urfave/cli/v2" ) diff --git a/cmd/osv-scanner/main.go b/cmd/osv-scanner/main.go index 1b48da6cc54..e2339ace4c1 100644 --- a/cmd/osv-scanner/main.go +++ b/cmd/osv-scanner/main.go @@ -6,12 +6,12 @@ import ( "os" "slices" - "github.com/google/osv-scanner/cmd/osv-scanner/fix" - "github.com/google/osv-scanner/cmd/osv-scanner/scan" - "github.com/google/osv-scanner/cmd/osv-scanner/update" - "github.com/google/osv-scanner/internal/version" - "github.com/google/osv-scanner/pkg/osvscanner" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/cmd/osv-scanner/fix" + "github.com/google/osv-scanner/v2/cmd/osv-scanner/scan" + "github.com/google/osv-scanner/v2/cmd/osv-scanner/update" + "github.com/google/osv-scanner/v2/internal/version" + "github.com/google/osv-scanner/v2/pkg/osvscanner" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/urfave/cli/v2" ) diff --git a/cmd/osv-scanner/main_test.go b/cmd/osv-scanner/main_test.go index 97fae88c74c..5f01412566a 100644 --- a/cmd/osv-scanner/main_test.go +++ b/cmd/osv-scanner/main_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/internal/cachedregexp" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/testutility" "github.com/urfave/cli/v2" ) diff --git a/cmd/osv-scanner/scan/image/main.go b/cmd/osv-scanner/scan/image/main.go index 7a90817d7a2..d1d10d85adb 100644 --- a/cmd/osv-scanner/scan/image/main.go +++ b/cmd/osv-scanner/scan/image/main.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" - "github.com/google/osv-scanner/cmd/osv-scanner/internal/helper" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/osvscanner" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/cmd/osv-scanner/internal/helper" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/osvscanner" + "github.com/google/osv-scanner/v2/pkg/reporter" "golang.org/x/term" "github.com/urfave/cli/v2" diff --git a/cmd/osv-scanner/scan/main.go b/cmd/osv-scanner/scan/main.go index 9f0e7ebeca2..6bcfa3bb005 100644 --- a/cmd/osv-scanner/scan/main.go +++ b/cmd/osv-scanner/scan/main.go @@ -3,9 +3,9 @@ package scan import ( "io" - "github.com/google/osv-scanner/cmd/osv-scanner/scan/image" - "github.com/google/osv-scanner/cmd/osv-scanner/scan/source" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/cmd/osv-scanner/scan/image" + "github.com/google/osv-scanner/v2/cmd/osv-scanner/scan/source" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/urfave/cli/v2" ) diff --git a/cmd/osv-scanner/scan/source/main.go b/cmd/osv-scanner/scan/source/main.go index c708101504a..6131ccc5da4 100644 --- a/cmd/osv-scanner/scan/source/main.go +++ b/cmd/osv-scanner/scan/source/main.go @@ -8,11 +8,11 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/cmd/osv-scanner/internal/helper" - "github.com/google/osv-scanner/internal/spdx" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/osvscanner" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/cmd/osv-scanner/internal/helper" + "github.com/google/osv-scanner/v2/internal/spdx" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/osvscanner" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/urfave/cli/v2" "golang.org/x/term" ) diff --git a/cmd/osv-scanner/testmain_test.go b/cmd/osv-scanner/testmain_test.go index d0c300d65ea..f63d40833f5 100644 --- a/cmd/osv-scanner/testmain_test.go +++ b/cmd/osv-scanner/testmain_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/go-git/go-git/v5" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/cmd/osv-scanner/update/main.go b/cmd/osv-scanner/update/main.go index d60cc9a81f4..48e63e75e36 100644 --- a/cmd/osv-scanner/update/main.go +++ b/cmd/osv-scanner/update/main.go @@ -6,13 +6,13 @@ import ( "io" "os" - "github.com/google/osv-scanner/internal/depsdev" - "github.com/google/osv-scanner/internal/remediation/suggest" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/version" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/depsdev" + "github.com/google/osv-scanner/v2/internal/remediation/suggest" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/version" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/urfave/cli/v2" ) diff --git a/cmd/osv-scanner/update_test.go b/cmd/osv-scanner/update_test.go index 74c5bf3d212..2d5efe3cbe4 100644 --- a/cmd/osv-scanner/update_test.go +++ b/cmd/osv-scanner/update_test.go @@ -5,7 +5,7 @@ import ( "slices" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestRun_Update(t *testing.T) { diff --git a/docs/installation.md b/docs/installation.md index be420fbba2e..e5b921998ff 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -74,7 +74,7 @@ pkg_add osv-scanner Alternatively, you can install this from source by running: ```bash -go install github.com/google/osv-scanner/cmd/osv-scanner@v1 +go install github.com/google/osv-scanner/v2/cmd/osv-scanner@v2.0.0-beta1 ``` This requires Go 1.23.5+ to be installed. diff --git a/go.mod b/go.mod index cddbd16378a..65a2fab992b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/google/osv-scanner +module github.com/google/osv-scanner/v2 go 1.23.5 diff --git a/go.sum b/go.sum index d01d3267529..7884037e511 100644 --- a/go.sum +++ b/go.sum @@ -182,8 +182,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= -github.com/google/osv-scalibr v0.1.6-0.20250123155336-85f39dea4c05 h1:47dObbqXVFPmg39yLeRWfKZYw2xR6O2BJVLmgC6Zygw= -github.com/google/osv-scalibr v0.1.6-0.20250123155336-85f39dea4c05/go.mod h1:nikSO3CqGGRQY05sGgzsgf4+84p5xCmPWOiaSomkuAU= github.com/google/osv-scalibr v0.1.6-0.20250128013153-34aef7c77adf h1:s6PZEjcMocRehGjuHIFN7Chy8VlMw4XheLgLaWRx21U= github.com/google/osv-scalibr v0.1.6-0.20250128013153-34aef7c77adf/go.mod h1:jKAptk1dYWBO91ODkI5XYKDDvZEbLKQH9DSXcTtUDSw= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/internal/ci/testmain_test.go b/internal/ci/testmain_test.go index d3b0ee6a22a..65a33384d70 100644 --- a/internal/ci/testmain_test.go +++ b/internal/ci/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/internal/ci/utility.go b/internal/ci/utility.go index 24ee2bb613c..6bb8534b579 100644 --- a/internal/ci/utility.go +++ b/internal/ci/utility.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func LoadVulnResults(path string) (models.VulnerabilityResults, error) { diff --git a/internal/ci/vulnerability_result_diff.go b/internal/ci/vulnerability_result_diff.go index 77436e400a7..b9593b58fba 100644 --- a/internal/ci/vulnerability_result_diff.go +++ b/internal/ci/vulnerability_result_diff.go @@ -1,9 +1,9 @@ package ci import ( - "github.com/google/osv-scanner/internal/grouper" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/grouper" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/models" ) // DiffVulnerabilityResults will return any new vulnerabilities that are in `newRes` diff --git a/internal/ci/vulnerability_result_diff_test.go b/internal/ci/vulnerability_result_diff_test.go index 12a2abd035e..e84688d7df6 100644 --- a/internal/ci/vulnerability_result_diff_test.go +++ b/internal/ci/vulnerability_result_diff_test.go @@ -3,9 +3,9 @@ package ci_test import ( "testing" - "github.com/google/osv-scanner/internal/ci" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/ci" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestDiffVulnerabilityResults(t *testing.T) { diff --git a/internal/clients/clientimpl/baseimagematcher/baseimagematcher.go b/internal/clients/clientimpl/baseimagematcher/baseimagematcher.go index 62f2e09a9f9..971be61a56e 100644 --- a/internal/clients/clientimpl/baseimagematcher/baseimagematcher.go +++ b/internal/clients/clientimpl/baseimagematcher/baseimagematcher.go @@ -12,8 +12,8 @@ import ( "slices" "time" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/opencontainers/go-digest" "golang.org/x/sync/errgroup" ) diff --git a/internal/clients/clientimpl/baseimagematcher/config.go b/internal/clients/clientimpl/baseimagematcher/config.go index 9c124335ccf..0b7f4f27da9 100644 --- a/internal/clients/clientimpl/baseimagematcher/config.go +++ b/internal/clients/clientimpl/baseimagematcher/config.go @@ -1,6 +1,6 @@ package baseimagematcher -import "github.com/google/osv-scanner/internal/version" +import "github.com/google/osv-scanner/v2/internal/version" type ClientConfig struct { MaxConcurrentBatchRequests int diff --git a/internal/clients/clientimpl/licensematcher/licensematcher.go b/internal/clients/clientimpl/licensematcher/licensematcher.go index a77d18018a9..2ade202696a 100644 --- a/internal/clients/clientimpl/licensematcher/licensematcher.go +++ b/internal/clients/clientimpl/licensematcher/licensematcher.go @@ -4,10 +4,10 @@ import ( "context" depsdevpb "deps.dev/api/v3" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/depsdev" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/depsdev" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/pkg/models" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/clients/clientimpl/localmatcher/localmatcher.go b/internal/clients/clientimpl/localmatcher/localmatcher.go index e90452e5a67..dd59c9b728b 100644 --- a/internal/clients/clientimpl/localmatcher/localmatcher.go +++ b/internal/clients/clientimpl/localmatcher/localmatcher.go @@ -8,10 +8,10 @@ import ( "path" "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/imodels/ecosystem" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/imodels/ecosystem" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/ossf/osv-schema/bindings/go/osvschema" ) diff --git a/internal/clients/clientimpl/localmatcher/zip.go b/internal/clients/clientimpl/localmatcher/zip.go index 46424f86ec8..f8317bb5c06 100644 --- a/internal/clients/clientimpl/localmatcher/zip.go +++ b/internal/clients/clientimpl/localmatcher/zip.go @@ -16,10 +16,10 @@ import ( "path" "strings" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/utility/vulns" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/utility/vulns" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" ) type ZipDB struct { diff --git a/internal/clients/clientimpl/localmatcher/zip_test.go b/internal/clients/clientimpl/localmatcher/zip_test.go index 50e42b488d2..45daf65a882 100644 --- a/internal/clients/clientimpl/localmatcher/zip_test.go +++ b/internal/clients/clientimpl/localmatcher/zip_test.go @@ -17,10 +17,10 @@ import ( "sort" "testing" - "github.com/google/osv-scanner/internal/clients/clientimpl/localmatcher" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/internal/version" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/localmatcher" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/internal/version" + "github.com/google/osv-scanner/v2/pkg/models" ) const userAgent = "osv-scanner_test/" + version.OSVVersion diff --git a/internal/clients/clientimpl/osvmatcher/cachedosvmatcher.go b/internal/clients/clientimpl/osvmatcher/cachedosvmatcher.go index 7061b6e0193..c4e6fa51a57 100644 --- a/internal/clients/clientimpl/osvmatcher/cachedosvmatcher.go +++ b/internal/clients/clientimpl/osvmatcher/cachedosvmatcher.go @@ -9,10 +9,10 @@ import ( "time" "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/internal/clients/clientimpl/localmatcher" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/osvdev" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/localmatcher" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/osvdev" + "github.com/google/osv-scanner/v2/pkg/models" "golang.org/x/sync/errgroup" ) diff --git a/internal/clients/clientimpl/osvmatcher/osvmatcher.go b/internal/clients/clientimpl/osvmatcher/osvmatcher.go index 81258c1f5c5..d7e2372d016 100644 --- a/internal/clients/clientimpl/osvmatcher/osvmatcher.go +++ b/internal/clients/clientimpl/osvmatcher/osvmatcher.go @@ -8,11 +8,11 @@ import ( "github.com/google/osv-scalibr/extractor" "github.com/google/osv-scalibr/log" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/imodels/ecosystem" - "github.com/google/osv-scanner/internal/osvdev" - "github.com/google/osv-scanner/internal/semantic" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/imodels/ecosystem" + "github.com/google/osv-scanner/v2/internal/osvdev" + "github.com/google/osv-scanner/v2/internal/semantic" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/ossf/osv-schema/bindings/go/osvschema" "golang.org/x/sync/errgroup" ) diff --git a/internal/clients/clientinterfaces/baseimagematcher.go b/internal/clients/clientinterfaces/baseimagematcher.go index f38b56e132c..31e2aad70ba 100644 --- a/internal/clients/clientinterfaces/baseimagematcher.go +++ b/internal/clients/clientinterfaces/baseimagematcher.go @@ -3,7 +3,7 @@ package clientinterfaces import ( "context" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) type BaseImageMatcher interface { diff --git a/internal/clients/clientinterfaces/licensematcher.go b/internal/clients/clientinterfaces/licensematcher.go index 94f4bb2650a..a7a787f3f76 100644 --- a/internal/clients/clientinterfaces/licensematcher.go +++ b/internal/clients/clientinterfaces/licensematcher.go @@ -3,7 +3,7 @@ package clientinterfaces import ( "context" - "github.com/google/osv-scanner/internal/imodels" + "github.com/google/osv-scanner/v2/internal/imodels" ) type LicenseMatcher interface { diff --git a/internal/clients/clientinterfaces/vulnerabilitymatcher.go b/internal/clients/clientinterfaces/vulnerabilitymatcher.go index 300cb56a9e0..bf1c7d6fb4b 100644 --- a/internal/clients/clientinterfaces/vulnerabilitymatcher.go +++ b/internal/clients/clientinterfaces/vulnerabilitymatcher.go @@ -4,7 +4,7 @@ import ( "context" "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) type VulnerabilityMatcher interface { diff --git a/internal/config/config.go b/internal/config/config.go index c889b37dc7a..63338a80e68 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -10,8 +10,8 @@ import ( "time" "github.com/BurntSushi/toml" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/pkg/reporter" ) const osvScannerConfigName = "osv-scanner.toml" diff --git a/internal/config/config_internal_test.go b/internal/config/config_internal_test.go index 61d4cacefbb..e6708110abb 100644 --- a/internal/config/config_internal_test.go +++ b/internal/config/config_internal_test.go @@ -11,9 +11,9 @@ import ( "github.com/google/osv-scalibr/extractor" "github.com/google/osv-scalibr/extractor/filesystem/osv" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/scalibrextract/ecosystemmock" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/scalibrextract/ecosystemmock" + "github.com/google/osv-scanner/v2/pkg/reporter" ) // Attempts to normalize any file paths in the given `output` so that they can diff --git a/internal/customgitignore/dir_test.go b/internal/customgitignore/dir_test.go index 268e678479b..c08175ce6ee 100644 --- a/internal/customgitignore/dir_test.go +++ b/internal/customgitignore/dir_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/internal/customgitignore" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/customgitignore" + "github.com/google/osv-scanner/v2/internal/testutility" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/format/gitignore" diff --git a/internal/datasource/cache_test.go b/internal/datasource/cache_test.go index c4c8279cb42..1862f25a43a 100644 --- a/internal/datasource/cache_test.go +++ b/internal/datasource/cache_test.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "testing" - "github.com/google/osv-scanner/internal/datasource" + "github.com/google/osv-scanner/v2/internal/datasource" ) func TestRequestCache(t *testing.T) { diff --git a/internal/datasource/http_auth_test.go b/internal/datasource/http_auth_test.go index 8ffe7a3da51..f7449c27608 100644 --- a/internal/datasource/http_auth_test.go +++ b/internal/datasource/http_auth_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/google/osv-scanner/internal/datasource" + "github.com/google/osv-scanner/v2/internal/datasource" ) // mockTransport is used to inspect the requests being made by HTTPAuthentications diff --git a/internal/datasource/maven_registry_test.go b/internal/datasource/maven_registry_test.go index a19994052c1..5e439aa6d75 100644 --- a/internal/datasource/maven_registry_test.go +++ b/internal/datasource/maven_registry_test.go @@ -7,7 +7,7 @@ import ( "testing" "deps.dev/util/maven" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestGetProject(t *testing.T) { diff --git a/internal/datasource/maven_settings.go b/internal/datasource/maven_settings.go index 5545e1425de..2af3ccfda9b 100644 --- a/internal/datasource/maven_settings.go +++ b/internal/datasource/maven_settings.go @@ -9,7 +9,7 @@ import ( "strings" "unicode" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) // Maven settings.xml file parsing for registry authentication. diff --git a/internal/datasource/maven_settings_test.go b/internal/datasource/maven_settings_test.go index f014ab51f5f..7dd6fbc97f0 100644 --- a/internal/datasource/maven_settings_test.go +++ b/internal/datasource/maven_settings_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/google/osv-scanner/internal/datasource" + "github.com/google/osv-scanner/v2/internal/datasource" ) func TestParseMavenSettings(t *testing.T) { diff --git a/internal/datasource/npm_registry_test.go b/internal/datasource/npm_registry_test.go index 40f72ef9ee4..b3d48d17b2c 100644 --- a/internal/datasource/npm_registry_test.go +++ b/internal/datasource/npm_registry_test.go @@ -9,8 +9,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/testutility" "github.com/tidwall/gjson" ) diff --git a/internal/datasource/npmrc.go b/internal/datasource/npmrc.go index 56fd487434e..9e15b4e87e1 100644 --- a/internal/datasource/npmrc.go +++ b/internal/datasource/npmrc.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" "gopkg.in/ini.v1" ) diff --git a/internal/datasource/npmrc_test.go b/internal/datasource/npmrc_test.go index a988478332d..23eae786034 100644 --- a/internal/datasource/npmrc_test.go +++ b/internal/datasource/npmrc_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/testutility" ) // These tests rely on using 'globalconfig' and 'userconfig' in the package .npmrc to override their default locations. diff --git a/internal/datasource/testmain_test.go b/internal/datasource/testmain_test.go index 74169755d45..f7ab6671ecd 100644 --- a/internal/datasource/testmain_test.go +++ b/internal/datasource/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/internal/grouper/grouper.go b/internal/grouper/grouper.go index b21edaae761..e4fdfea6fed 100644 --- a/internal/grouper/grouper.go +++ b/internal/grouper/grouper.go @@ -6,8 +6,8 @@ import ( "golang.org/x/exp/maps" - "github.com/google/osv-scanner/internal/identifiers" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/identifiers" + "github.com/google/osv-scanner/v2/pkg/models" ) func hasAliasIntersection(v1, v2 IDAliases) bool { diff --git a/internal/grouper/grouper_models.go b/internal/grouper/grouper_models.go index b713aafaa16..fb846116ed8 100644 --- a/internal/grouper/grouper_models.go +++ b/internal/grouper/grouper_models.go @@ -3,7 +3,7 @@ package grouper import ( "strings" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) type IDAliases struct { diff --git a/internal/grouper/grouper_test.go b/internal/grouper/grouper_test.go index 17d4b2ddb0e..623f4d82175 100644 --- a/internal/grouper/grouper_test.go +++ b/internal/grouper/grouper_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/osv-scanner/internal/grouper" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/grouper" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestGroup(t *testing.T) { diff --git a/internal/imodels/ecosystem/ecosystem_test.go b/internal/imodels/ecosystem/ecosystem_test.go index e39505c07d4..20a958ce3fe 100644 --- a/internal/imodels/ecosystem/ecosystem_test.go +++ b/internal/imodels/ecosystem/ecosystem_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/google/osv-scanner/internal/imodels/ecosystem" + "github.com/google/osv-scanner/v2/internal/imodels/ecosystem" "github.com/ossf/osv-schema/bindings/go/osvschema" ) diff --git a/internal/imodels/imodels.go b/internal/imodels/imodels.go index f4d45eda1c8..5d93dcacbe5 100644 --- a/internal/imodels/imodels.go +++ b/internal/imodels/imodels.go @@ -13,11 +13,11 @@ import ( "github.com/google/osv-scalibr/extractor/filesystem/os/rpm" "github.com/google/osv-scalibr/extractor/filesystem/sbom/cdx" "github.com/google/osv-scalibr/extractor/filesystem/sbom/spdx" - "github.com/google/osv-scanner/internal/cachedregexp" - "github.com/google/osv-scanner/internal/imodels/ecosystem" - "github.com/google/osv-scanner/internal/scalibrextract/language/javascript/nodemodules" - "github.com/google/osv-scanner/internal/scalibrextract/vcs/gitrepo" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/imodels/ecosystem" + "github.com/google/osv-scanner/v2/internal/scalibrextract/language/javascript/nodemodules" + "github.com/google/osv-scanner/v2/internal/scalibrextract/vcs/gitrepo" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/ossf/osv-schema/bindings/go/osvschema" scalibrosv "github.com/google/osv-scalibr/extractor/filesystem/osv" diff --git a/internal/imodels/results/scanresults.go b/internal/imodels/results/scanresults.go index 86f5a813186..3e241e0636a 100644 --- a/internal/imodels/results/scanresults.go +++ b/internal/imodels/results/scanresults.go @@ -1,9 +1,9 @@ package results import ( - "github.com/google/osv-scanner/internal/config" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/config" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/pkg/models" ) // ScanResults represents the complete results of a scan. diff --git a/internal/osvdev/config.go b/internal/osvdev/config.go index 5b7d7fc60b4..506e0e45475 100644 --- a/internal/osvdev/config.go +++ b/internal/osvdev/config.go @@ -1,6 +1,6 @@ package osvdev -import "github.com/google/osv-scanner/internal/version" +import "github.com/google/osv-scanner/v2/internal/version" type ClientConfig struct { MaxConcurrentBatchRequests int diff --git a/internal/osvdev/models.go b/internal/osvdev/models.go index 5839a9ef189..afa8540ec70 100644 --- a/internal/osvdev/models.go +++ b/internal/osvdev/models.go @@ -1,6 +1,6 @@ package osvdev -import "github.com/google/osv-scanner/pkg/models" +import "github.com/google/osv-scanner/v2/pkg/models" // Package represents a package identifier for OSV. type Package struct { diff --git a/internal/osvdev/osvdev.go b/internal/osvdev/osvdev.go index cfed5f92b81..6db01d658ce 100644 --- a/internal/osvdev/osvdev.go +++ b/internal/osvdev/osvdev.go @@ -12,7 +12,7 @@ import ( "net/http" "time" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" "golang.org/x/sync/errgroup" ) diff --git a/internal/osvdev/osvdev_test.go b/internal/osvdev/osvdev_test.go index 0cb7059a800..e9700667c26 100644 --- a/internal/osvdev/osvdev_test.go +++ b/internal/osvdev/osvdev_test.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/osv-scalibr/testing/extracttest" - "github.com/google/osv-scanner/internal/osvdev" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/osvdev" + "github.com/google/osv-scanner/v2/internal/testutility" "github.com/ossf/osv-schema/bindings/go/osvschema" ) diff --git a/internal/output/cyclonedx.go b/internal/output/cyclonedx.go index cd857193300..9077a28b3ac 100644 --- a/internal/output/cyclonedx.go +++ b/internal/output/cyclonedx.go @@ -5,9 +5,9 @@ import ( "io" "github.com/CycloneDX/cyclonedx-go" - "github.com/google/osv-scanner/internal/output/sbom" - "github.com/google/osv-scanner/internal/utility/purl" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output/sbom" + "github.com/google/osv-scanner/v2/internal/utility/purl" + "github.com/google/osv-scanner/v2/pkg/models" ) // PrintCycloneDXResults writes results to the provided writer in CycloneDX format diff --git a/internal/output/cyclonedx_test.go b/internal/output/cyclonedx_test.go index 10aa35932e6..48fc48db371 100644 --- a/internal/output/cyclonedx_test.go +++ b/internal/output/cyclonedx_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestPrintCycloneDX14Results_WithVulnerabilities(t *testing.T) { diff --git a/internal/output/form_test.go b/internal/output/form_test.go index 78310acabd0..db1e630d4a8 100644 --- a/internal/output/form_test.go +++ b/internal/output/form_test.go @@ -3,7 +3,7 @@ package output_test import ( "testing" - "github.com/google/osv-scanner/internal/output" + "github.com/google/osv-scanner/v2/internal/output" ) func TestForm(t *testing.T) { diff --git a/internal/output/githubannotation.go b/internal/output/githubannotation.go index fda54bda0c0..f40585c6496 100644 --- a/internal/output/githubannotation.go +++ b/internal/output/githubannotation.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/jedib0t/go-pretty/v6/table" ) diff --git a/internal/output/githubannotation_test.go b/internal/output/githubannotation_test.go index 568426b1036..a8c6c1773b8 100644 --- a/internal/output/githubannotation_test.go +++ b/internal/output/githubannotation_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestPrintGHAnnotationReport_WithVulnerabilities(t *testing.T) { diff --git a/internal/output/helpers_test.go b/internal/output/helpers_test.go index ff4276e1d7e..2e3d9423f76 100644 --- a/internal/output/helpers_test.go +++ b/internal/output/helpers_test.go @@ -3,7 +3,7 @@ package output_test import ( "testing" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) type outputTestCaseArgs struct { diff --git a/internal/output/html.go b/internal/output/html.go index f94ad16084b..e848a2cc626 100644 --- a/internal/output/html.go +++ b/internal/output/html.go @@ -6,8 +6,8 @@ import ( "io" "strings" - "github.com/google/osv-scanner/internal/utility/severity" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/utility/severity" + "github.com/google/osv-scanner/v2/pkg/models" ) // HTML templates directory diff --git a/internal/output/html_test.go b/internal/output/html_test.go index 2e2c9421cc2..1f6e4749383 100644 --- a/internal/output/html_test.go +++ b/internal/output/html_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" + "github.com/google/osv-scanner/v2/internal/output" ) func TestPrintHTMLResults_WithVulnerabilities(t *testing.T) { diff --git a/internal/output/machinejson.go b/internal/output/machinejson.go index 2d7c72c2c3b..5ea586f2be4 100644 --- a/internal/output/machinejson.go +++ b/internal/output/machinejson.go @@ -4,7 +4,7 @@ import ( "encoding/json" "io" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) // PrintJSONResults writes results to the provided writer in JSON format diff --git a/internal/output/machinejson_test.go b/internal/output/machinejson_test.go index c0225ead7bb..3f6ddd38232 100644 --- a/internal/output/machinejson_test.go +++ b/internal/output/machinejson_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestPrintJSONResults_WithVulnerabilities(t *testing.T) { diff --git a/internal/output/markdowntable.go b/internal/output/markdowntable.go index 34d7550023d..dae7899d38b 100644 --- a/internal/output/markdowntable.go +++ b/internal/output/markdowntable.go @@ -3,7 +3,7 @@ package output import ( "io" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/internal/output/markdowntable_test.go b/internal/output/markdowntable_test.go index 046fc94d019..8e4b25e545e 100644 --- a/internal/output/markdowntable_test.go +++ b/internal/output/markdowntable_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestPrintMarkdownTableResults_WithVulnerabilities(t *testing.T) { diff --git a/internal/output/output_result.go b/internal/output/output_result.go index e1e7abc17e6..bb68ff41d5b 100644 --- a/internal/output/output_result.go +++ b/internal/output/output_result.go @@ -9,11 +9,11 @@ import ( "strings" "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/internal/cachedregexp" - "github.com/google/osv-scanner/internal/identifiers" - "github.com/google/osv-scanner/internal/semantic" - "github.com/google/osv-scanner/internal/utility/severity" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/identifiers" + "github.com/google/osv-scanner/v2/internal/semantic" + "github.com/google/osv-scanner/v2/internal/utility/severity" + "github.com/google/osv-scanner/v2/pkg/models" ) // Result represents the vulnerability scanning results for output report. diff --git a/internal/output/output_result_test.go b/internal/output/output_result_test.go index 9faf5cef03f..b8d22afdae9 100644 --- a/internal/output/output_result_test.go +++ b/internal/output/output_result_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestPrintOutputResults_WithVulnerabilities(t *testing.T) { diff --git a/internal/output/result.go b/internal/output/result.go index 907187d789f..bb32f897f61 100644 --- a/internal/output/result.go +++ b/internal/output/result.go @@ -7,8 +7,8 @@ import ( "slices" "strings" - "github.com/google/osv-scanner/internal/identifiers" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/identifiers" + "github.com/google/osv-scanner/v2/pkg/models" "golang.org/x/exp/maps" ) diff --git a/internal/output/result_test.go b/internal/output/result_test.go index 48aaa25a86d..1e4f7f34b7f 100644 --- a/internal/output/result_test.go +++ b/internal/output/result_test.go @@ -3,8 +3,8 @@ package output import ( "testing" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" ) func Test_groupFixedVersions(t *testing.T) { diff --git a/internal/output/sarif.go b/internal/output/sarif.go index d1a97c5d9c1..bf19925fa30 100644 --- a/internal/output/sarif.go +++ b/internal/output/sarif.go @@ -9,11 +9,11 @@ import ( "strings" "text/template" - "github.com/google/osv-scanner/internal/identifiers" - "github.com/google/osv-scanner/internal/url" - "github.com/google/osv-scanner/internal/utility/results" - "github.com/google/osv-scanner/internal/version" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/identifiers" + "github.com/google/osv-scanner/v2/internal/url" + "github.com/google/osv-scanner/v2/internal/utility/results" + "github.com/google/osv-scanner/v2/internal/version" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/jedib0t/go-pretty/v6/table" "github.com/owenrumney/go-sarif/v2/sarif" ) diff --git a/internal/output/sarif_internal_test.go b/internal/output/sarif_internal_test.go index 3f05c440bc6..f5697758af5 100644 --- a/internal/output/sarif_internal_test.go +++ b/internal/output/sarif_internal_test.go @@ -3,7 +3,7 @@ package output import ( "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func Test_createSARIFHelpText(t *testing.T) { diff --git a/internal/output/sarif_test.go b/internal/output/sarif_test.go index d8cb29262a2..e3f751f4c20 100644 --- a/internal/output/sarif_test.go +++ b/internal/output/sarif_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestGroupFixedVersions(t *testing.T) { diff --git a/internal/output/sbom/cyclonedx_1_4.go b/internal/output/sbom/cyclonedx_1_4.go index b280b93a57d..2cb944374dd 100644 --- a/internal/output/sbom/cyclonedx_1_4.go +++ b/internal/output/sbom/cyclonedx_1_4.go @@ -1,7 +1,7 @@ package sbom import ( - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/CycloneDX/cyclonedx-go" ) diff --git a/internal/output/sbom/cyclonedx_1_5.go b/internal/output/sbom/cyclonedx_1_5.go index 8f29bb96f79..4899b297126 100644 --- a/internal/output/sbom/cyclonedx_1_5.go +++ b/internal/output/sbom/cyclonedx_1_5.go @@ -2,7 +2,7 @@ package sbom import ( "github.com/CycloneDX/cyclonedx-go" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func ToCycloneDX15Bom(uniquePackages map[string]models.PackageVulns) *cyclonedx.BOM { diff --git a/internal/output/sbom/cyclonedx_common.go b/internal/output/sbom/cyclonedx_common.go index 2b57aa18c74..458acce2619 100644 --- a/internal/output/sbom/cyclonedx_common.go +++ b/internal/output/sbom/cyclonedx_common.go @@ -6,7 +6,7 @@ import ( "time" "github.com/CycloneDX/cyclonedx-go" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func buildCycloneDXBom(uniquePackages map[string]models.PackageVulns) *cyclonedx.BOM { diff --git a/internal/output/sbom/models.go b/internal/output/sbom/models.go index 1259ca6a7fe..224d8f1b3ad 100644 --- a/internal/output/sbom/models.go +++ b/internal/output/sbom/models.go @@ -1,7 +1,7 @@ package sbom import ( - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/CycloneDX/cyclonedx-go" ) diff --git a/internal/output/table.go b/internal/output/table.go index e61b26d9910..06f36234500 100644 --- a/internal/output/table.go +++ b/internal/output/table.go @@ -9,10 +9,10 @@ import ( "golang.org/x/exp/maps" - "github.com/google/osv-scanner/internal/utility/results" - "github.com/google/osv-scanner/internal/utility/severity" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/utility/results" + "github.com/google/osv-scanner/v2/internal/utility/severity" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" diff --git a/internal/output/table_test.go b/internal/output/table_test.go index 45774bc08b2..dd45ccf776b 100644 --- a/internal/output/table_test.go +++ b/internal/output/table_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/testutility" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/internal/output/testmain_test.go b/internal/output/testmain_test.go index de767d552ef..182268df21f 100644 --- a/internal/output/testmain_test.go +++ b/internal/output/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/internal/output/vertical.go b/internal/output/vertical.go index 427b2e2c9fc..8410cd0c340 100644 --- a/internal/output/vertical.go +++ b/internal/output/vertical.go @@ -6,7 +6,7 @@ import ( "strings" "unicode" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/internal/output/vertical_test.go b/internal/output/vertical_test.go index 22fe1a9bce0..299439b10cd 100644 --- a/internal/output/vertical_test.go +++ b/internal/output/vertical_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/testutility" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/internal/remediation/in_place.go b/internal/remediation/in_place.go index 16d2a5fa7d0..f520eb5d271 100644 --- a/internal/remediation/in_place.go +++ b/internal/remediation/in_place.go @@ -9,14 +9,14 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" "deps.dev/util/semver" - "github.com/google/osv-scanner/internal/clients/clientinterfaces" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - lf "github.com/google/osv-scanner/internal/resolution/lockfile" - "github.com/google/osv-scanner/internal/resolution/util" - "github.com/google/osv-scanner/internal/utility/vulns" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/clients/clientinterfaces" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + lf "github.com/google/osv-scanner/v2/internal/resolution/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution/util" + "github.com/google/osv-scanner/v2/internal/utility/vulns" + "github.com/google/osv-scanner/v2/pkg/models" "golang.org/x/exp/maps" ) diff --git a/internal/remediation/in_place_test.go b/internal/remediation/in_place_test.go index 63da07c9f18..2bf4e0a897f 100644 --- a/internal/remediation/in_place_test.go +++ b/internal/remediation/in_place_test.go @@ -7,14 +7,14 @@ import ( "testing" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/resolution/clienttest" - "github.com/google/osv-scanner/internal/resolution/lockfile" - "github.com/google/osv-scanner/internal/testutility" - lf "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/resolution/clienttest" + "github.com/google/osv-scanner/v2/internal/resolution/lockfile" + "github.com/google/osv-scanner/v2/internal/testutility" + lf "github.com/google/osv-scanner/v2/pkg/lockfile" "golang.org/x/exp/maps" ) diff --git a/internal/remediation/override.go b/internal/remediation/override.go index 56e6581d305..b24613e3657 100644 --- a/internal/remediation/override.go +++ b/internal/remediation/override.go @@ -9,13 +9,13 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/resolution/util" - "github.com/google/osv-scanner/internal/utility/maven" - "github.com/google/osv-scanner/internal/utility/vulns" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/resolution/util" + "github.com/google/osv-scanner/v2/internal/utility/maven" + "github.com/google/osv-scanner/v2/internal/utility/vulns" ) type overridePatch struct { diff --git a/internal/remediation/override_test.go b/internal/remediation/override_test.go index cb280315df3..7e7f828bb1f 100644 --- a/internal/remediation/override_test.go +++ b/internal/remediation/override_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/internal/resolution" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/resolution" ) func TestComputeOverridePatches(t *testing.T) { diff --git a/internal/remediation/relax.go b/internal/remediation/relax.go index 299de782245..99bbba80ef8 100644 --- a/internal/remediation/relax.go +++ b/internal/remediation/relax.go @@ -6,10 +6,10 @@ import ( "slices" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/remediation/relax" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/remediation/relax" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" ) // ComputeRelaxPatches attempts to resolve each vulnerability found in result independently, returning the list of unique possible patches diff --git a/internal/remediation/relax/npm.go b/internal/remediation/relax/npm.go index 6d335e9647a..4338cc6f8e6 100644 --- a/internal/remediation/relax/npm.go +++ b/internal/remediation/relax/npm.go @@ -6,7 +6,7 @@ import ( "deps.dev/util/resolve" "deps.dev/util/semver" - "github.com/google/osv-scanner/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" ) type NpmRelaxer struct{} diff --git a/internal/remediation/relax/npm_test.go b/internal/remediation/relax/npm_test.go index 83713ddea40..c79173e804f 100644 --- a/internal/remediation/relax/npm_test.go +++ b/internal/remediation/relax/npm_test.go @@ -5,8 +5,8 @@ import ( "testing" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/remediation/relax" - "github.com/google/osv-scanner/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/remediation/relax" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" ) func TestRelaxNpm(t *testing.T) { diff --git a/internal/remediation/relax/relax.go b/internal/remediation/relax/relax.go index a2f0d9c1b0f..738bc21f9c3 100644 --- a/internal/remediation/relax/relax.go +++ b/internal/remediation/relax/relax.go @@ -5,7 +5,7 @@ import ( "errors" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" ) // A RequirementRelaxer provides an ecosystem-specific method for 'relaxing' the diff --git a/internal/remediation/relax_test.go b/internal/remediation/relax_test.go index 1504dc4a367..d6453a34e51 100644 --- a/internal/remediation/relax_test.go +++ b/internal/remediation/relax_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" ) func TestComputeRelaxPatches(t *testing.T) { diff --git a/internal/remediation/remediation.go b/internal/remediation/remediation.go index 887a11433c8..810fb1e8f7e 100644 --- a/internal/remediation/remediation.go +++ b/internal/remediation/remediation.go @@ -4,11 +4,11 @@ import ( "math" "slices" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/lockfile" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/utility/severity" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/utility/severity" ) // TODO: Supported strategies should be part of the manifest/lockfile ReadWriter directly diff --git a/internal/remediation/remediation_test.go b/internal/remediation/remediation_test.go index 584b7c690e4..2116a1c9349 100644 --- a/internal/remediation/remediation_test.go +++ b/internal/remediation/remediation_test.go @@ -4,9 +4,9 @@ import ( "testing" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestMatchVuln(t *testing.T) { diff --git a/internal/remediation/suggest/maven.go b/internal/remediation/suggest/maven.go index e3873e6abf1..0fec1c1c3ba 100644 --- a/internal/remediation/suggest/maven.go +++ b/internal/remediation/suggest/maven.go @@ -8,8 +8,8 @@ import ( "deps.dev/util/resolve" "deps.dev/util/semver" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/pkg/lockfile" "golang.org/x/exp/slices" ) diff --git a/internal/remediation/suggest/maven_test.go b/internal/remediation/suggest/maven_test.go index 085df9bbc5f..7c33035a670 100644 --- a/internal/remediation/suggest/maven_test.go +++ b/internal/remediation/suggest/maven_test.go @@ -9,7 +9,7 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" ) var ( diff --git a/internal/remediation/suggest/suggest.go b/internal/remediation/suggest/suggest.go index ce04f17365a..16caf28765f 100644 --- a/internal/remediation/suggest/suggest.go +++ b/internal/remediation/suggest/suggest.go @@ -6,7 +6,7 @@ import ( "fmt" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" ) type Options struct { diff --git a/internal/remediation/testhelpers_test.go b/internal/remediation/testhelpers_test.go index 4518bd455dd..a70f68bd71e 100644 --- a/internal/remediation/testhelpers_test.go +++ b/internal/remediation/testhelpers_test.go @@ -7,12 +7,12 @@ import ( "testing" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/resolution/clienttest" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/testutility" - lf "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/resolution/clienttest" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/testutility" + lf "github.com/google/osv-scanner/v2/pkg/lockfile" "golang.org/x/exp/maps" ) diff --git a/internal/remediation/testmain_test.go b/internal/remediation/testmain_test.go index 0c7e84709d7..93f48eedafc 100644 --- a/internal/remediation/testmain_test.go +++ b/internal/remediation/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/internal/remediation/upgrade/config_test.go b/internal/remediation/upgrade/config_test.go index 67c56059ab2..a3dae0ae8a6 100644 --- a/internal/remediation/upgrade/config_test.go +++ b/internal/remediation/upgrade/config_test.go @@ -3,7 +3,7 @@ package upgrade_test import ( "testing" - "github.com/google/osv-scanner/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" ) func configSetExpect(t *testing.T, config upgrade.Config, pkg string, level upgrade.Level, want bool) { diff --git a/internal/remediation/upgrade/level_test.go b/internal/remediation/upgrade/level_test.go index 7b24493db6a..9532980a33c 100644 --- a/internal/remediation/upgrade/level_test.go +++ b/internal/remediation/upgrade/level_test.go @@ -5,7 +5,7 @@ import ( "testing" "deps.dev/util/semver" - "github.com/google/osv-scanner/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" ) func TestLevelAllows(t *testing.T) { diff --git a/internal/resolution/client/client.go b/internal/resolution/client/client.go index 63620990aea..fb8f14f0272 100644 --- a/internal/resolution/client/client.go +++ b/internal/resolution/client/client.go @@ -8,9 +8,9 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" "deps.dev/util/semver" - "github.com/google/osv-scanner/internal/clients/clientinterfaces" - "github.com/google/osv-scanner/internal/depsdev" - "github.com/google/osv-scanner/pkg/osv" + "github.com/google/osv-scanner/v2/internal/clients/clientinterfaces" + "github.com/google/osv-scanner/v2/internal/depsdev" + "github.com/google/osv-scanner/v2/pkg/osv" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/internal/resolution/client/depsdev_client.go b/internal/resolution/client/depsdev_client.go index 1a5fe9b85a9..6feefad2efa 100644 --- a/internal/resolution/client/depsdev_client.go +++ b/internal/resolution/client/depsdev_client.go @@ -5,7 +5,7 @@ import ( "os" "deps.dev/util/resolve" - "github.com/google/osv-scanner/internal/datasource" + "github.com/google/osv-scanner/v2/internal/datasource" ) const depsDevCacheExt = ".resolve.deps" diff --git a/internal/resolution/client/maven_registry_client.go b/internal/resolution/client/maven_registry_client.go index f280da8052e..7ef7bcb4423 100644 --- a/internal/resolution/client/maven_registry_client.go +++ b/internal/resolution/client/maven_registry_client.go @@ -11,8 +11,8 @@ import ( "deps.dev/util/maven" "deps.dev/util/resolve" "deps.dev/util/resolve/version" - "github.com/google/osv-scanner/internal/datasource" - mavenutil "github.com/google/osv-scanner/internal/utility/maven" + "github.com/google/osv-scanner/v2/internal/datasource" + mavenutil "github.com/google/osv-scanner/v2/internal/utility/maven" ) const mavenRegistryCacheExt = ".resolve.maven" diff --git a/internal/resolution/client/npm_registry_client.go b/internal/resolution/client/npm_registry_client.go index b3f570da51b..0bd02266b83 100644 --- a/internal/resolution/client/npm_registry_client.go +++ b/internal/resolution/client/npm_registry_client.go @@ -13,9 +13,9 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" "deps.dev/util/semver" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/depsdev" - "github.com/google/osv-scanner/pkg/osv" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/depsdev" + "github.com/google/osv-scanner/v2/pkg/osv" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/internal/resolution/clienttest/mock_resolution_client.go b/internal/resolution/clienttest/mock_resolution_client.go index 87243b19226..d823a5df535 100644 --- a/internal/resolution/clienttest/mock_resolution_client.go +++ b/internal/resolution/clienttest/mock_resolution_client.go @@ -9,10 +9,10 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/schema" "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/internal/clients/clientimpl/localmatcher" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/localmatcher" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/pkg/models" "gopkg.in/yaml.v3" ) diff --git a/internal/resolution/dependency_chain.go b/internal/resolution/dependency_chain.go index 0b89ab19e9e..2703215daa8 100644 --- a/internal/resolution/dependency_chain.go +++ b/internal/resolution/dependency_chain.go @@ -6,11 +6,11 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/resolution/util" - vulnUtil "github.com/google/osv-scanner/internal/utility/vulns" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/resolution/util" + vulnUtil "github.com/google/osv-scanner/v2/internal/utility/vulns" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" ) type DependencyChain struct { diff --git a/internal/resolution/lockfile/lockfile.go b/internal/resolution/lockfile/lockfile.go index 9d356e82f18..02b6d173084 100644 --- a/internal/resolution/lockfile/lockfile.go +++ b/internal/resolution/lockfile/lockfile.go @@ -8,7 +8,7 @@ import ( "path/filepath" "deps.dev/util/resolve" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) type DependencyPatch struct { diff --git a/internal/resolution/lockfile/npm.go b/internal/resolution/lockfile/npm.go index 30ad191766d..e65de3d1172 100644 --- a/internal/resolution/lockfile/npm.go +++ b/internal/resolution/lockfile/npm.go @@ -10,9 +10,9 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) type NpmReadWriter struct{} diff --git a/internal/resolution/lockfile/npm_test.go b/internal/resolution/lockfile/npm_test.go index 1c30b732f32..f7086aa322f 100644 --- a/internal/resolution/lockfile/npm_test.go +++ b/internal/resolution/lockfile/npm_test.go @@ -9,9 +9,9 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/schema" "github.com/google/go-cmp/cmp" - "github.com/google/osv-scanner/internal/resolution/lockfile" - "github.com/google/osv-scanner/internal/testutility" - lf "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution/lockfile" + "github.com/google/osv-scanner/v2/internal/testutility" + lf "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestNpmReadV2(t *testing.T) { diff --git a/internal/resolution/lockfile/npm_v1.go b/internal/resolution/lockfile/npm_v1.go index f83ff755a3f..4b1780bd4ba 100644 --- a/internal/resolution/lockfile/npm_v1.go +++ b/internal/resolution/lockfile/npm_v1.go @@ -9,9 +9,9 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/pkg/lockfile" "github.com/tidwall/gjson" "github.com/tidwall/sjson" ) diff --git a/internal/resolution/lockfile/npm_v2.go b/internal/resolution/lockfile/npm_v2.go index cf8ee5378c6..0b095291ebb 100644 --- a/internal/resolution/lockfile/npm_v2.go +++ b/internal/resolution/lockfile/npm_v2.go @@ -10,8 +10,8 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/pkg/lockfile" "github.com/tidwall/gjson" "github.com/tidwall/pretty" "github.com/tidwall/sjson" diff --git a/internal/resolution/lockfile/testmain_test.go b/internal/resolution/lockfile/testmain_test.go index a283a039bba..dba91cfa186 100644 --- a/internal/resolution/lockfile/testmain_test.go +++ b/internal/resolution/lockfile/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/internal/resolution/manifest/manifest.go b/internal/resolution/manifest/manifest.go index 4df28c141b4..794c280be65 100644 --- a/internal/resolution/manifest/manifest.go +++ b/internal/resolution/manifest/manifest.go @@ -11,7 +11,7 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) type Manifest struct { diff --git a/internal/resolution/manifest/maven.go b/internal/resolution/manifest/maven.go index b3401d821ad..1b17f338125 100644 --- a/internal/resolution/manifest/maven.go +++ b/internal/resolution/manifest/maven.go @@ -14,10 +14,10 @@ import ( "deps.dev/util/maven" "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/datasource" - internalxml "github.com/google/osv-scanner/internal/thirdparty/xml" - mavenutil "github.com/google/osv-scanner/internal/utility/maven" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/datasource" + internalxml "github.com/google/osv-scanner/v2/internal/thirdparty/xml" + mavenutil "github.com/google/osv-scanner/v2/internal/utility/maven" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func mavenRequirementKey(requirement resolve.RequirementVersion) RequirementKey { diff --git a/internal/resolution/manifest/maven_test.go b/internal/resolution/manifest/maven_test.go index d804e8d5b5b..fdee41f2e56 100644 --- a/internal/resolution/manifest/maven_test.go +++ b/internal/resolution/manifest/maven_test.go @@ -12,9 +12,9 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" "github.com/google/go-cmp/cmp" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) var ( diff --git a/internal/resolution/manifest/npm.go b/internal/resolution/manifest/npm.go index ca31f155401..97c479ca400 100644 --- a/internal/resolution/manifest/npm.go +++ b/internal/resolution/manifest/npm.go @@ -10,7 +10,7 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" "github.com/tidwall/gjson" "github.com/tidwall/sjson" ) diff --git a/internal/resolution/manifest/npm_test.go b/internal/resolution/manifest/npm_test.go index f35a144cd1b..a200b8c7514 100644 --- a/internal/resolution/manifest/npm_test.go +++ b/internal/resolution/manifest/npm_test.go @@ -8,9 +8,9 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func aliasType(t *testing.T, aliasedName string) dep.Type { diff --git a/internal/resolution/manifest/testmain_test.go b/internal/resolution/manifest/testmain_test.go index 59786f0fc89..1ea40752df6 100644 --- a/internal/resolution/manifest/testmain_test.go +++ b/internal/resolution/manifest/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/internal/resolution/resolve.go b/internal/resolution/resolve.go index 5ba2b167dc8..120fa85943a 100644 --- a/internal/resolution/resolve.go +++ b/internal/resolution/resolve.go @@ -11,10 +11,10 @@ import ( "deps.dev/util/resolve/dep" "deps.dev/util/resolve/maven" "deps.dev/util/resolve/npm" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/resolution/manifest" - mavenutil "github.com/google/osv-scanner/internal/utility/maven" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + mavenutil "github.com/google/osv-scanner/v2/internal/utility/maven" + "github.com/google/osv-scanner/v2/pkg/models" ) type Vulnerability struct { diff --git a/internal/resolution/resolve_test.go b/internal/resolution/resolve_test.go index 5cff161ea39..28083090d62 100644 --- a/internal/resolution/resolve_test.go +++ b/internal/resolution/resolve_test.go @@ -8,10 +8,10 @@ import ( "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/clienttest" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/clienttest" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/testutility" ) func checkResult(t *testing.T, result *resolution.Result) { diff --git a/internal/resolution/testmain_test.go b/internal/resolution/testmain_test.go index 0f6d1b756ef..7f55eb6b698 100644 --- a/internal/resolution/testmain_test.go +++ b/internal/resolution/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/internal/resolution/util/depsdev.go b/internal/resolution/util/depsdev.go index 6068492e651..0099208c7dc 100644 --- a/internal/resolution/util/depsdev.go +++ b/internal/resolution/util/depsdev.go @@ -2,8 +2,8 @@ package util import ( "deps.dev/util/resolve" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" ) // TODO: use osvschema.Ecosystem or imodel's ecosystem.Parsed diff --git a/internal/scalibrextract/filesystem/vendored/vendored.go b/internal/scalibrextract/filesystem/vendored/vendored.go index 9ba40d6694c..e567deddc52 100644 --- a/internal/scalibrextract/filesystem/vendored/vendored.go +++ b/internal/scalibrextract/filesystem/vendored/vendored.go @@ -20,7 +20,7 @@ import ( scalibrfs "github.com/google/osv-scalibr/fs" "github.com/google/osv-scalibr/plugin" "github.com/google/osv-scalibr/purl" - "github.com/google/osv-scanner/internal/osvdev" + "github.com/google/osv-scanner/v2/internal/osvdev" ) var ( diff --git a/internal/scalibrextract/filesystem/vendored/vendored_test.go b/internal/scalibrextract/filesystem/vendored/vendored_test.go index 922c565f59f..134529878b4 100644 --- a/internal/scalibrextract/filesystem/vendored/vendored_test.go +++ b/internal/scalibrextract/filesystem/vendored/vendored_test.go @@ -14,9 +14,9 @@ import ( "github.com/google/osv-scalibr/extractor/filesystem/simplefileapi" "github.com/google/osv-scalibr/testing/extracttest" "github.com/google/osv-scalibr/testing/fakefs" - "github.com/google/osv-scanner/internal/osvdev" - "github.com/google/osv-scanner/internal/scalibrextract/filesystem/vendored" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/osvdev" + "github.com/google/osv-scanner/v2/internal/scalibrextract/filesystem/vendored" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestExtractor_FileRequired(t *testing.T) { diff --git a/internal/scalibrextract/language/java/pomxmlnet/extractor.go b/internal/scalibrextract/language/java/pomxmlnet/extractor.go index 933c0d11ae5..4e1224e772d 100644 --- a/internal/scalibrextract/language/java/pomxmlnet/extractor.go +++ b/internal/scalibrextract/language/java/pomxmlnet/extractor.go @@ -9,7 +9,7 @@ import ( "golang.org/x/exp/maps" mavenresolve "deps.dev/util/resolve/maven" - mavenutil "github.com/google/osv-scanner/internal/utility/maven" + mavenutil "github.com/google/osv-scanner/v2/internal/utility/maven" "deps.dev/util/maven" "deps.dev/util/resolve" @@ -19,8 +19,8 @@ import ( "github.com/google/osv-scalibr/extractor/filesystem/osv" "github.com/google/osv-scalibr/plugin" "github.com/google/osv-scalibr/purl" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/resolution/client" ) // Extractor extracts Maven packages with transitive dependency resolution. diff --git a/internal/scalibrextract/language/java/pomxmlnet/extractor_test.go b/internal/scalibrextract/language/java/pomxmlnet/extractor_test.go index 43febdbb2bd..8c1e7c4c51e 100644 --- a/internal/scalibrextract/language/java/pomxmlnet/extractor_test.go +++ b/internal/scalibrextract/language/java/pomxmlnet/extractor_test.go @@ -10,10 +10,10 @@ import ( "github.com/google/osv-scalibr/extractor/filesystem/osv" "github.com/google/osv-scalibr/extractor/filesystem/simplefileapi" "github.com/google/osv-scalibr/testing/extracttest" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/resolution/clienttest" - "github.com/google/osv-scanner/internal/scalibrextract/language/java/pomxmlnet" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/resolution/clienttest" + "github.com/google/osv-scanner/v2/internal/scalibrextract/language/java/pomxmlnet" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMavenResolverExtractor_FileRequired(t *testing.T) { diff --git a/internal/scalibrextract/language/osv/osvscannerjson/extractor.go b/internal/scalibrextract/language/osv/osvscannerjson/extractor.go index b884fa5501b..67a701b803a 100644 --- a/internal/scalibrextract/language/osv/osvscannerjson/extractor.go +++ b/internal/scalibrextract/language/osv/osvscannerjson/extractor.go @@ -10,7 +10,7 @@ import ( "github.com/google/osv-scalibr/extractor/filesystem" "github.com/google/osv-scalibr/plugin" "github.com/google/osv-scalibr/purl" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) // Extractor extracts osv packages from osv-scanner json output. diff --git a/internal/scalibrextract/language/osv/osvscannerjson/extractor_test.go b/internal/scalibrextract/language/osv/osvscannerjson/extractor_test.go index 9868ae6f568..11302d0401d 100644 --- a/internal/scalibrextract/language/osv/osvscannerjson/extractor_test.go +++ b/internal/scalibrextract/language/osv/osvscannerjson/extractor_test.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/osv-scalibr/extractor" "github.com/google/osv-scalibr/testing/extracttest" - "github.com/google/osv-scanner/internal/scalibrextract/language/osv/osvscannerjson" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/scalibrextract/language/osv/osvscannerjson" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestExtractor_Extract(t *testing.T) { diff --git a/internal/scalibrextract/language/osv/osvscannerjson/metadata.go b/internal/scalibrextract/language/osv/osvscannerjson/metadata.go index 45c9e2c9664..26943fe92f3 100644 --- a/internal/scalibrextract/language/osv/osvscannerjson/metadata.go +++ b/internal/scalibrextract/language/osv/osvscannerjson/metadata.go @@ -1,6 +1,6 @@ package osvscannerjson -import "github.com/google/osv-scanner/pkg/models" +import "github.com/google/osv-scanner/v2/pkg/models" // Metadata holds the metadata for osvscanner.json type Metadata struct { diff --git a/internal/scalibrextract/vcs/gitrepo/extractor_test.go b/internal/scalibrextract/vcs/gitrepo/extractor_test.go index a3aefc889b7..2b18e5c96b9 100644 --- a/internal/scalibrextract/vcs/gitrepo/extractor_test.go +++ b/internal/scalibrextract/vcs/gitrepo/extractor_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/osv-scalibr/extractor" "github.com/google/osv-scalibr/testing/extracttest" - "github.com/google/osv-scanner/internal/scalibrextract/vcs/gitrepo" + "github.com/google/osv-scanner/v2/internal/scalibrextract/vcs/gitrepo" ) func TestExtractor_Extract(t *testing.T) { diff --git a/internal/semantic/compare_test.go b/internal/semantic/compare_test.go index b99f5774bb9..73b85087ee4 100644 --- a/internal/semantic/compare_test.go +++ b/internal/semantic/compare_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/internal/semantic" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/semantic" + "github.com/google/osv-scanner/v2/pkg/models" ) func expectedResult(t *testing.T, comparator string) int { diff --git a/internal/semantic/parse.go b/internal/semantic/parse.go index b774bf4a70a..eb804923623 100644 --- a/internal/semantic/parse.go +++ b/internal/semantic/parse.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) var ErrUnsupportedEcosystem = errors.New("unsupported ecosystem") diff --git a/internal/semantic/parse_test.go b/internal/semantic/parse_test.go index 99f8083ce78..4af605f5cca 100644 --- a/internal/semantic/parse_test.go +++ b/internal/semantic/parse_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "github.com/google/osv-scanner/internal/semantic" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/semantic" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestParse(t *testing.T) { diff --git a/internal/semantic/version-alpine.go b/internal/semantic/version-alpine.go index 9030e518123..82e64513b69 100644 --- a/internal/semantic/version-alpine.go +++ b/internal/semantic/version-alpine.go @@ -4,7 +4,7 @@ import ( "math/big" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) type alpineNumberComponent struct { diff --git a/internal/semantic/version-maven.go b/internal/semantic/version-maven.go index 9c86c1b7465..04636bffd48 100644 --- a/internal/semantic/version-maven.go +++ b/internal/semantic/version-maven.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) type mavenVersionToken struct { diff --git a/internal/semantic/version-packagist.go b/internal/semantic/version-packagist.go index ae0b21ee2da..a9820972303 100644 --- a/internal/semantic/version-packagist.go +++ b/internal/semantic/version-packagist.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) func canonicalizePackagistVersion(v string) string { diff --git a/internal/semantic/version-pypi.go b/internal/semantic/version-pypi.go index 8363a1e3c4a..b4994260542 100644 --- a/internal/semantic/version-pypi.go +++ b/internal/semantic/version-pypi.go @@ -5,7 +5,7 @@ import ( "math/big" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) type PyPIVersion struct { diff --git a/internal/semantic/version-semver-like.go b/internal/semantic/version-semver-like.go index 3ccfe91846c..e00a89e625c 100644 --- a/internal/semantic/version-semver-like.go +++ b/internal/semantic/version-semver-like.go @@ -5,7 +5,7 @@ import ( "math/big" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) // SemverLikeVersion is a version that is _like_ a version as defined by the diff --git a/internal/sourceanalysis/go.go b/internal/sourceanalysis/go.go index db31d33e3c2..1cde1dcec96 100644 --- a/internal/sourceanalysis/go.go +++ b/internal/sourceanalysis/go.go @@ -10,10 +10,10 @@ import ( "os/exec" "path/filepath" - "github.com/google/osv-scanner/internal/sourceanalysis/govulncheck" - "github.com/google/osv-scanner/internal/url" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/sourceanalysis/govulncheck" + "github.com/google/osv-scanner/v2/internal/url" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" "golang.org/x/vuln/scan" ) diff --git a/internal/sourceanalysis/go_test.go b/internal/sourceanalysis/go_test.go index 197c0988689..cc9c27ee4d4 100644 --- a/internal/sourceanalysis/go_test.go +++ b/internal/sourceanalysis/go_test.go @@ -3,9 +3,9 @@ package sourceanalysis import ( "testing" - "github.com/google/osv-scanner/internal/sourceanalysis/govulncheck" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/sourceanalysis/govulncheck" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" ) func Test_matchAnalysisWithPackageVulns(t *testing.T) { diff --git a/internal/sourceanalysis/integration_test.go b/internal/sourceanalysis/integration_test.go index d3cbb150689..59eb4312345 100644 --- a/internal/sourceanalysis/integration_test.go +++ b/internal/sourceanalysis/integration_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" ) var fixturesDir = "integration/fixtures-go" diff --git a/internal/sourceanalysis/rust.go b/internal/sourceanalysis/rust.go index 376841aa6f8..ec12451ea6b 100644 --- a/internal/sourceanalysis/rust.go +++ b/internal/sourceanalysis/rust.go @@ -13,10 +13,10 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" - "github.com/google/osv-scanner/internal/thirdparty/ar" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/thirdparty/ar" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/ianlancetaylor/demangle" ) diff --git a/internal/sourceanalysis/rust_test.go b/internal/sourceanalysis/rust_test.go index a9fd8dabdd5..d9ed9361c8b 100644 --- a/internal/sourceanalysis/rust_test.go +++ b/internal/sourceanalysis/rust_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func Test_extractRlibArchive(t *testing.T) { diff --git a/internal/sourceanalysis/sourceanalysis.go b/internal/sourceanalysis/sourceanalysis.go index 1c9f5d8c6dc..abf3f344e5c 100644 --- a/internal/sourceanalysis/sourceanalysis.go +++ b/internal/sourceanalysis/sourceanalysis.go @@ -3,8 +3,8 @@ package sourceanalysis import ( "path/filepath" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" ) // vulnsFromAllPkgs returns the flattened list of unique vulnerabilities diff --git a/internal/sourceanalysis/testmain_test.go b/internal/sourceanalysis/testmain_test.go index 8a02fb8d0e1..0e1f7730a8c 100644 --- a/internal/sourceanalysis/testmain_test.go +++ b/internal/sourceanalysis/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/internal/spdx/satisfies.go b/internal/spdx/satisfies.go index 10bf78b4bb6..831cd07e582 100644 --- a/internal/spdx/satisfies.go +++ b/internal/spdx/satisfies.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) type node interface { diff --git a/internal/spdx/satisfies_test.go b/internal/spdx/satisfies_test.go index 5d1044e7d27..c9269c41992 100644 --- a/internal/spdx/satisfies_test.go +++ b/internal/spdx/satisfies_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/internal/spdx" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/spdx" + "github.com/google/osv-scanner/v2/pkg/models" ) func namer(t *testing.T, license models.License, licenses []string, expected bool) string { diff --git a/internal/tui/dependency-graph.go b/internal/tui/dependency-graph.go index 151c97dded5..2520ea1fc79 100644 --- a/internal/tui/dependency-graph.go +++ b/internal/tui/dependency-graph.go @@ -6,7 +6,7 @@ import ( "deps.dev/util/resolve" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution" "golang.org/x/exp/slices" ) diff --git a/internal/tui/in-place-info.go b/internal/tui/in-place-info.go index 86e1e549321..866d89d4d1b 100644 --- a/internal/tui/in-place-info.go +++ b/internal/tui/in-place-info.go @@ -7,8 +7,8 @@ import ( "github.com/charmbracelet/bubbles/table" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/resolution" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/resolution" ) // A ViewModel showing the table of package upgrades and fixed vulnerabilities, for in-place upgrades. diff --git a/internal/tui/relock-info.go b/internal/tui/relock-info.go index 9c6257164ec..f5dab364407 100644 --- a/internal/tui/relock-info.go +++ b/internal/tui/relock-info.go @@ -7,7 +7,7 @@ import ( "github.com/charmbracelet/bubbles/key" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution" ) // A ViewModel showing the dependency changes, the removed, and added vulnerabilities diff --git a/internal/tui/severity.go b/internal/tui/severity.go index f669ca40ae1..37585400209 100644 --- a/internal/tui/severity.go +++ b/internal/tui/severity.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/utility/severity" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/utility/severity" + "github.com/google/osv-scanner/v2/pkg/models" ) var ( diff --git a/internal/tui/vuln-info.go b/internal/tui/vuln-info.go index d1e6de50445..07405e4f611 100644 --- a/internal/tui/vuln-info.go +++ b/internal/tui/vuln-info.go @@ -12,7 +12,7 @@ import ( "github.com/charmbracelet/glamour/ansi" "github.com/charmbracelet/glamour/styles" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution" "github.com/muesli/reflow/wordwrap" ) diff --git a/internal/tui/vuln-list.go b/internal/tui/vuln-list.go index 4798bc816a9..4b9c849b6ff 100644 --- a/internal/tui/vuln-list.go +++ b/internal/tui/vuln-list.go @@ -10,8 +10,8 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/utility/severity" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/utility/severity" "github.com/muesli/reflow/truncate" ) diff --git a/internal/utility/maven/maven.go b/internal/utility/maven/maven.go index 39680db1426..b5d81db6865 100644 --- a/internal/utility/maven/maven.go +++ b/internal/utility/maven/maven.go @@ -8,7 +8,7 @@ import ( "path/filepath" "deps.dev/util/maven" - "github.com/google/osv-scanner/internal/datasource" + "github.com/google/osv-scanner/v2/internal/datasource" ) const ( diff --git a/internal/utility/maven/maven_test.go b/internal/utility/maven/maven_test.go index 45bfc4ad664..8f1c642f481 100644 --- a/internal/utility/maven/maven_test.go +++ b/internal/utility/maven/maven_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/google/osv-scanner/internal/utility/maven" + "github.com/google/osv-scanner/v2/internal/utility/maven" ) func TestParentPOMPath(t *testing.T) { diff --git a/internal/utility/purl/composer.go b/internal/utility/purl/composer.go index d30bb82cb88..070f8d42b29 100644 --- a/internal/utility/purl/composer.go +++ b/internal/utility/purl/composer.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func FromComposer(packageInfo models.PackageInfo) (namespace string, name string, err error) { diff --git a/internal/utility/purl/composer_test.go b/internal/utility/purl/composer_test.go index 65139f75501..5a7040bfc90 100644 --- a/internal/utility/purl/composer_test.go +++ b/internal/utility/purl/composer_test.go @@ -3,9 +3,9 @@ package purl_test import ( "testing" - "github.com/google/osv-scanner/internal/utility/purl" + "github.com/google/osv-scanner/v2/internal/utility/purl" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestComposerExtraction_shouldExtractPackages(t *testing.T) { diff --git a/internal/utility/purl/golang.go b/internal/utility/purl/golang.go index c7475aae0c0..a210ef6bdee 100644 --- a/internal/utility/purl/golang.go +++ b/internal/utility/purl/golang.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func FromGo(packageInfo models.PackageInfo) (namespace string, name string, err error) { diff --git a/internal/utility/purl/golang_test.go b/internal/utility/purl/golang_test.go index 65d8ce6e930..0e02178e09c 100644 --- a/internal/utility/purl/golang_test.go +++ b/internal/utility/purl/golang_test.go @@ -3,9 +3,9 @@ package purl_test import ( "testing" - "github.com/google/osv-scanner/internal/utility/purl" + "github.com/google/osv-scanner/v2/internal/utility/purl" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestGolangExtraction_shouldExtractPackages(t *testing.T) { diff --git a/internal/utility/purl/maven.go b/internal/utility/purl/maven.go index 78c3d19bb96..f3fe318b328 100644 --- a/internal/utility/purl/maven.go +++ b/internal/utility/purl/maven.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func FromMaven(packageInfo models.PackageInfo) (namespace string, name string, err error) { diff --git a/internal/utility/purl/maven_test.go b/internal/utility/purl/maven_test.go index fbc2dae94be..fbde9284698 100644 --- a/internal/utility/purl/maven_test.go +++ b/internal/utility/purl/maven_test.go @@ -3,9 +3,9 @@ package purl_test import ( "testing" - "github.com/google/osv-scanner/internal/utility/purl" + "github.com/google/osv-scanner/v2/internal/utility/purl" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestMavenExtraction_shouldExtractPackages(t *testing.T) { diff --git a/internal/utility/purl/package_grouper.go b/internal/utility/purl/package_grouper.go index 2e96920ca4a..f48de1077c9 100644 --- a/internal/utility/purl/package_grouper.go +++ b/internal/utility/purl/package_grouper.go @@ -3,7 +3,7 @@ package purl import ( "slices" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) // Group takes a list of packages, and group them in a map using their PURL diff --git a/internal/utility/purl/package_grouper_test.go b/internal/utility/purl/package_grouper_test.go index 5d9042662e7..4b7de9b0948 100644 --- a/internal/utility/purl/package_grouper_test.go +++ b/internal/utility/purl/package_grouper_test.go @@ -4,10 +4,10 @@ import ( "reflect" "testing" - "github.com/google/osv-scanner/internal/utility/purl" + "github.com/google/osv-scanner/v2/internal/utility/purl" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestGroupPackageByPURL_ShouldUnifyPackages(t *testing.T) { diff --git a/internal/utility/purl/purl.go b/internal/utility/purl/purl.go index c6fef57860a..aa5c85e630c 100644 --- a/internal/utility/purl/purl.go +++ b/internal/utility/purl/purl.go @@ -3,7 +3,7 @@ package purl import ( "fmt" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/package-url/packageurl-go" ) diff --git a/internal/utility/results/results.go b/internal/utility/results/results.go index 131be970acb..22cd6bea22c 100644 --- a/internal/utility/results/results.go +++ b/internal/utility/results/results.go @@ -3,7 +3,7 @@ package results import ( "fmt" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) // Number of characters to display a git commit diff --git a/internal/utility/severity/severity.go b/internal/utility/severity/severity.go index 4d17697e9a9..3f428b73e46 100644 --- a/internal/utility/severity/severity.go +++ b/internal/utility/severity/severity.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" gocvss20 "github.com/pandatix/go-cvss/20" gocvss30 "github.com/pandatix/go-cvss/30" gocvss31 "github.com/pandatix/go-cvss/31" diff --git a/internal/utility/severity/severity_test.go b/internal/utility/severity/severity_test.go index 006d098741b..ac9a87e1c8e 100644 --- a/internal/utility/severity/severity_test.go +++ b/internal/utility/severity/severity_test.go @@ -4,8 +4,8 @@ import ( "math" "testing" - "github.com/google/osv-scanner/internal/utility/severity" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/utility/severity" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestSeverity_CalculateScore(t *testing.T) { diff --git a/internal/utility/vulns/vulnerabilities.go b/internal/utility/vulns/vulnerabilities.go index 0c9539e6b86..b3ecbbe4ea2 100644 --- a/internal/utility/vulns/vulnerabilities.go +++ b/internal/utility/vulns/vulnerabilities.go @@ -1,6 +1,6 @@ package vulns -import "github.com/google/osv-scanner/pkg/models" +import "github.com/google/osv-scanner/v2/pkg/models" func Include(vs []*models.Vulnerability, vulnerability models.Vulnerability) bool { for _, vuln := range vs { diff --git a/internal/utility/vulns/vulnerabilities_test.go b/internal/utility/vulns/vulnerabilities_test.go index 39ebbea4241..5397eb751d5 100644 --- a/internal/utility/vulns/vulnerabilities_test.go +++ b/internal/utility/vulns/vulnerabilities_test.go @@ -3,8 +3,8 @@ package vulns_test import ( "testing" - "github.com/google/osv-scanner/internal/utility/vulns" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/utility/vulns" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestVulnerabilities_Includes(t *testing.T) { diff --git a/internal/utility/vulns/vulnerability.go b/internal/utility/vulns/vulnerability.go index 3ce29db09d0..48516e01a6e 100644 --- a/internal/utility/vulns/vulnerability.go +++ b/internal/utility/vulns/vulnerability.go @@ -7,9 +7,9 @@ import ( "sort" "strings" - "github.com/google/osv-scanner/internal/semantic" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/semantic" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" ) func eventVersion(e models.Event) string { diff --git a/internal/utility/vulns/vulnerability_test.go b/internal/utility/vulns/vulnerability_test.go index e942c4337fd..ae3ce57c43e 100644 --- a/internal/utility/vulns/vulnerability_test.go +++ b/internal/utility/vulns/vulnerability_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/google/osv-scanner/internal/utility/vulns" - "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/utility/vulns" + "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" ) func expectIsAffected(t *testing.T, vuln models.Vulnerability, version string, expectAffected bool) { diff --git a/pkg/lockfile/apk-installed_test.go b/pkg/lockfile/apk-installed_test.go index 852d2e4d562..f9c26e4949c 100644 --- a/pkg/lockfile/apk-installed_test.go +++ b/pkg/lockfile/apk-installed_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) const alpineEcosystem = lockfile.AlpineEcosystem + ":" + lockfile.AlpineFallbackVersion diff --git a/pkg/lockfile/csv_test.go b/pkg/lockfile/csv_test.go index e0af55a2bfd..8f149eb79e0 100644 --- a/pkg/lockfile/csv_test.go +++ b/pkg/lockfile/csv_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestFromCSVRows(t *testing.T) { diff --git a/pkg/lockfile/dpkg-status.go b/pkg/lockfile/dpkg-status.go index 8c2a11a4a32..d46257d241e 100644 --- a/pkg/lockfile/dpkg-status.go +++ b/pkg/lockfile/dpkg-status.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) const DebianEcosystem Ecosystem = "Debian" diff --git a/pkg/lockfile/dpkg-status_test.go b/pkg/lockfile/dpkg-status_test.go index 4cf60cdd256..faf04f6a648 100644 --- a/pkg/lockfile/dpkg-status_test.go +++ b/pkg/lockfile/dpkg-status_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseDpkgStatus_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/ecosystems_test.go b/pkg/lockfile/ecosystems_test.go index 7c0c99ec2cf..d5b33beef68 100644 --- a/pkg/lockfile/ecosystems_test.go +++ b/pkg/lockfile/ecosystems_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func numberOfLockfileParsers(t *testing.T) int { diff --git a/pkg/lockfile/extract_test.go b/pkg/lockfile/extract_test.go index 9300c244fe3..e989abf9920 100644 --- a/pkg/lockfile/extract_test.go +++ b/pkg/lockfile/extract_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) type TestDepFile struct { diff --git a/pkg/lockfile/go-binary_test.go b/pkg/lockfile/go-binary_test.go index ed3e2e96826..63843cbe697 100644 --- a/pkg/lockfile/go-binary_test.go +++ b/pkg/lockfile/go-binary_test.go @@ -3,8 +3,8 @@ package lockfile_test import ( "testing" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestGoBinaryExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/helpers_test.go b/pkg/lockfile/helpers_test.go index 6c7103302bc..591f745240c 100644 --- a/pkg/lockfile/helpers_test.go +++ b/pkg/lockfile/helpers_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func expectErrContaining(t *testing.T, err error, str string) { diff --git a/pkg/lockfile/node-modules-npm-v1_test.go b/pkg/lockfile/node-modules-npm-v1_test.go index 7054f0c82e0..748a3cab4a3 100644 --- a/pkg/lockfile/node-modules-npm-v1_test.go +++ b/pkg/lockfile/node-modules-npm-v1_test.go @@ -3,7 +3,7 @@ package lockfile_test import ( "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestNodeModulesExtractor_Extract_npm_v1_InvalidJson(t *testing.T) { diff --git a/pkg/lockfile/node-modules-npm-v2_test.go b/pkg/lockfile/node-modules-npm-v2_test.go index e1ad77d7f80..f3407e703c1 100644 --- a/pkg/lockfile/node-modules-npm-v2_test.go +++ b/pkg/lockfile/node-modules-npm-v2_test.go @@ -3,7 +3,7 @@ package lockfile_test import ( "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestNodeModulesExtractor_Extract_npm_v2_InvalidJson(t *testing.T) { diff --git a/pkg/lockfile/node-modules_test.go b/pkg/lockfile/node-modules_test.go index d576db2f81a..6ac0a76aeff 100644 --- a/pkg/lockfile/node-modules_test.go +++ b/pkg/lockfile/node-modules_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func createTestDirWithNodeModulesDir(t *testing.T) (string, func()) { diff --git a/pkg/lockfile/osv-vuln-result_test.go b/pkg/lockfile/osv-vuln-result_test.go index be69443b0df..16dd80f37da 100644 --- a/pkg/lockfile/osv-vuln-result_test.go +++ b/pkg/lockfile/osv-vuln-result_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseOSVScannerResults_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/osv-vuln-results.go b/pkg/lockfile/osv-vuln-results.go index b9d461d7728..e395d2029ff 100644 --- a/pkg/lockfile/osv-vuln-results.go +++ b/pkg/lockfile/osv-vuln-results.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) // Deprecated: use OSVScannerResultsExtractor.Extract instead diff --git a/pkg/lockfile/parse-cargo-lock_test.go b/pkg/lockfile/parse-cargo-lock_test.go index 6952cb3109f..7cff6ff8fb0 100644 --- a/pkg/lockfile/parse-cargo-lock_test.go +++ b/pkg/lockfile/parse-cargo-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestCargoLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-composer-lock_test.go b/pkg/lockfile/parse-composer-lock_test.go index e2e1f3ee0c2..764b5b5149c 100644 --- a/pkg/lockfile/parse-composer-lock_test.go +++ b/pkg/lockfile/parse-composer-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestComposerLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-conan-lock-v1-revisions_test.go b/pkg/lockfile/parse-conan-lock-v1-revisions_test.go index e20101a3dd0..da29ead38b5 100644 --- a/pkg/lockfile/parse-conan-lock-v1-revisions_test.go +++ b/pkg/lockfile/parse-conan-lock-v1-revisions_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseConanLock_v1_revisions_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-conan-lock-v1_test.go b/pkg/lockfile/parse-conan-lock-v1_test.go index 390232aa2e1..76d2f0bdc2f 100644 --- a/pkg/lockfile/parse-conan-lock-v1_test.go +++ b/pkg/lockfile/parse-conan-lock-v1_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseConanLock_v1_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-conan-lock-v2_test.go b/pkg/lockfile/parse-conan-lock-v2_test.go index 58dbb6e37e6..161a4bb7905 100644 --- a/pkg/lockfile/parse-conan-lock-v2_test.go +++ b/pkg/lockfile/parse-conan-lock-v2_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseConanLock_v2_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-conan-lock_test.go b/pkg/lockfile/parse-conan-lock_test.go index b72f9d34a23..bb50a83b6fe 100644 --- a/pkg/lockfile/parse-conan-lock_test.go +++ b/pkg/lockfile/parse-conan-lock_test.go @@ -3,7 +3,7 @@ package lockfile_test import ( "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestConanLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-gemfile-lock.go b/pkg/lockfile/parse-gemfile-lock.go index c2c3fe64c89..2b17b7e279f 100644 --- a/pkg/lockfile/parse-gemfile-lock.go +++ b/pkg/lockfile/parse-gemfile-lock.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) const BundlerEcosystem Ecosystem = "RubyGems" diff --git a/pkg/lockfile/parse-gemfile-lock_test.go b/pkg/lockfile/parse-gemfile-lock_test.go index 2cf3c24d2a7..0f28baebad0 100644 --- a/pkg/lockfile/parse-gemfile-lock_test.go +++ b/pkg/lockfile/parse-gemfile-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestGemfileLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-go-lock_test.go b/pkg/lockfile/parse-go-lock_test.go index 14ccd66e954..a7d3e7fc5ea 100644 --- a/pkg/lockfile/parse-go-lock_test.go +++ b/pkg/lockfile/parse-go-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestGoLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-gradle-lock_test.go b/pkg/lockfile/parse-gradle-lock_test.go index 34d3b3e19f0..1009c55e8ca 100644 --- a/pkg/lockfile/parse-gradle-lock_test.go +++ b/pkg/lockfile/parse-gradle-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestGradleLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-gradle-verification-metadata_test.go b/pkg/lockfile/parse-gradle-verification-metadata_test.go index 68c5768bc9f..f8b071f1534 100644 --- a/pkg/lockfile/parse-gradle-verification-metadata_test.go +++ b/pkg/lockfile/parse-gradle-verification-metadata_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestGradleVerificationMetadataExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-maven-lock.go b/pkg/lockfile/parse-maven-lock.go index 0d64422dc45..1f4b4e0e068 100644 --- a/pkg/lockfile/parse-maven-lock.go +++ b/pkg/lockfile/parse-maven-lock.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" "golang.org/x/exp/maps" ) diff --git a/pkg/lockfile/parse-maven-lock_test.go b/pkg/lockfile/parse-maven-lock_test.go index b49064e7123..4f2e1c4dcd8 100644 --- a/pkg/lockfile/parse-maven-lock_test.go +++ b/pkg/lockfile/parse-maven-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestMavenLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-mix-lock.go b/pkg/lockfile/parse-mix-lock.go index 06d917a5769..462f80ce554 100644 --- a/pkg/lockfile/parse-mix-lock.go +++ b/pkg/lockfile/parse-mix-lock.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) const MixEcosystem Ecosystem = "Hex" diff --git a/pkg/lockfile/parse-mix-lock_test.go b/pkg/lockfile/parse-mix-lock_test.go index 534f6e707fd..bc6e342205d 100644 --- a/pkg/lockfile/parse-mix-lock_test.go +++ b/pkg/lockfile/parse-mix-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestMixLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-npm-lock-v1_test.go b/pkg/lockfile/parse-npm-lock-v1_test.go index 8c07224f535..61c6db4cc8b 100644 --- a/pkg/lockfile/parse-npm-lock-v1_test.go +++ b/pkg/lockfile/parse-npm-lock-v1_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseNpmLock_v1_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-npm-lock-v2_test.go b/pkg/lockfile/parse-npm-lock-v2_test.go index 13a62ee5bd6..954ed4a7fe2 100644 --- a/pkg/lockfile/parse-npm-lock-v2_test.go +++ b/pkg/lockfile/parse-npm-lock-v2_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseNpmLock_v2_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-npm-lock_test.go b/pkg/lockfile/parse-npm-lock_test.go index 83d19a014c8..99d35e0d3ea 100644 --- a/pkg/lockfile/parse-npm-lock_test.go +++ b/pkg/lockfile/parse-npm-lock_test.go @@ -3,7 +3,7 @@ package lockfile_test import ( "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestNpmLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-nuget-lock-v1_test.go b/pkg/lockfile/parse-nuget-lock-v1_test.go index 0397720abed..247e336f6f1 100644 --- a/pkg/lockfile/parse-nuget-lock-v1_test.go +++ b/pkg/lockfile/parse-nuget-lock-v1_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseNuGetLock_v1_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-nuget-lock_test.go b/pkg/lockfile/parse-nuget-lock_test.go index 2bb1c236e03..933044d0bce 100644 --- a/pkg/lockfile/parse-nuget-lock_test.go +++ b/pkg/lockfile/parse-nuget-lock_test.go @@ -3,7 +3,7 @@ package lockfile_test import ( "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestNuGetLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-pdm-lock_test.go b/pkg/lockfile/parse-pdm-lock_test.go index c595f3c3fae..07b846b5072 100644 --- a/pkg/lockfile/parse-pdm-lock_test.go +++ b/pkg/lockfile/parse-pdm-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestPdmExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-pipenv-lock_test.go b/pkg/lockfile/parse-pipenv-lock_test.go index 0da3ac930e0..f58fbb14fd5 100644 --- a/pkg/lockfile/parse-pipenv-lock_test.go +++ b/pkg/lockfile/parse-pipenv-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestPipenvLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-pnpm-lock-v9_test.go b/pkg/lockfile/parse-pnpm-lock-v9_test.go index b0763860b2a..b06b00ba3c5 100644 --- a/pkg/lockfile/parse-pnpm-lock-v9_test.go +++ b/pkg/lockfile/parse-pnpm-lock-v9_test.go @@ -3,7 +3,7 @@ package lockfile_test import ( "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParsePnpmLock_v9_NoPackages(t *testing.T) { diff --git a/pkg/lockfile/parse-pnpm-lock.go b/pkg/lockfile/parse-pnpm-lock.go index 545450fa5da..75ecd0ae31a 100644 --- a/pkg/lockfile/parse-pnpm-lock.go +++ b/pkg/lockfile/parse-pnpm-lock.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" "gopkg.in/yaml.v3" ) diff --git a/pkg/lockfile/parse-pnpm-lock_test.go b/pkg/lockfile/parse-pnpm-lock_test.go index bee7c6b4aaf..f21f9efdebf 100644 --- a/pkg/lockfile/parse-pnpm-lock_test.go +++ b/pkg/lockfile/parse-pnpm-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestPnpmLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-poetry-lock_test.go b/pkg/lockfile/parse-poetry-lock_test.go index 4b719e5d19e..0a4d6dfaf90 100644 --- a/pkg/lockfile/parse-poetry-lock_test.go +++ b/pkg/lockfile/parse-poetry-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestPoetryLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-pubspec-lock_test.go b/pkg/lockfile/parse-pubspec-lock_test.go index 4f20df34fba..a8e31f8d0c2 100644 --- a/pkg/lockfile/parse-pubspec-lock_test.go +++ b/pkg/lockfile/parse-pubspec-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestPubspecLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-renv-lock_test.go b/pkg/lockfile/parse-renv-lock_test.go index a4f8eecb538..e8598421341 100644 --- a/pkg/lockfile/parse-renv-lock_test.go +++ b/pkg/lockfile/parse-renv-lock_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseRenvLock_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-requirements-txt.go b/pkg/lockfile/parse-requirements-txt.go index f4a0f88a2fa..c8af24c6edd 100644 --- a/pkg/lockfile/parse-requirements-txt.go +++ b/pkg/lockfile/parse-requirements-txt.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" "golang.org/x/exp/maps" ) diff --git a/pkg/lockfile/parse-requirements-txt_test.go b/pkg/lockfile/parse-requirements-txt_test.go index 341e976957f..05b0344d94c 100644 --- a/pkg/lockfile/parse-requirements-txt_test.go +++ b/pkg/lockfile/parse-requirements-txt_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestRequirementsTxtExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse-yarn-lock-v1_test.go b/pkg/lockfile/parse-yarn-lock-v1_test.go index 459672fd28c..6bc1456eb17 100644 --- a/pkg/lockfile/parse-yarn-lock-v1_test.go +++ b/pkg/lockfile/parse-yarn-lock-v1_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseYarnLock_v1_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-yarn-lock-v2_test.go b/pkg/lockfile/parse-yarn-lock-v2_test.go index 64cde52719e..a610abd899b 100644 --- a/pkg/lockfile/parse-yarn-lock-v2_test.go +++ b/pkg/lockfile/parse-yarn-lock-v2_test.go @@ -4,7 +4,7 @@ import ( "io/fs" "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestParseYarnLock_v2_FileDoesNotExist(t *testing.T) { diff --git a/pkg/lockfile/parse-yarn-lock.go b/pkg/lockfile/parse-yarn-lock.go index 1534e3ace34..79c6a3d930c 100644 --- a/pkg/lockfile/parse-yarn-lock.go +++ b/pkg/lockfile/parse-yarn-lock.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/google/osv-scanner/internal/cachedregexp" + "github.com/google/osv-scanner/v2/internal/cachedregexp" ) const YarnEcosystem = NpmEcosystem diff --git a/pkg/lockfile/parse-yarn-lock_test.go b/pkg/lockfile/parse-yarn-lock_test.go index 854436d47e8..7bff88e7849 100644 --- a/pkg/lockfile/parse-yarn-lock_test.go +++ b/pkg/lockfile/parse-yarn-lock_test.go @@ -3,7 +3,7 @@ package lockfile_test import ( "testing" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func TestYarnLockExtractor_ShouldExtract(t *testing.T) { diff --git a/pkg/lockfile/parse_test.go b/pkg/lockfile/parse_test.go index a13d02310c2..33acf6d68d0 100644 --- a/pkg/lockfile/parse_test.go +++ b/pkg/lockfile/parse_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/lockfile" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/lockfile" ) func expectNumberOfParsersCalled(t *testing.T, numberOfParsersCalled int) { diff --git a/pkg/lockfile/types.go b/pkg/lockfile/types.go index 89122f006b7..0a132209083 100644 --- a/pkg/lockfile/types.go +++ b/pkg/lockfile/types.go @@ -1,6 +1,6 @@ package lockfile -import "github.com/google/osv-scanner/pkg/models" +import "github.com/google/osv-scanner/v2/pkg/models" // TODO(v2): Remove completely // TODO(v2): These fields do not need JSON tags I believe diff --git a/pkg/models/purl_to_package_test.go b/pkg/models/purl_to_package_test.go index a14c7153782..1a4d13a6a84 100644 --- a/pkg/models/purl_to_package_test.go +++ b/pkg/models/purl_to_package_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestPURLToPackage(t *testing.T) { diff --git a/pkg/models/results_test.go b/pkg/models/results_test.go index ed2738d1c71..641d649bde6 100644 --- a/pkg/models/results_test.go +++ b/pkg/models/results_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestFlatten(t *testing.T) { diff --git a/pkg/models/testmain_test.go b/pkg/models/testmain_test.go index 47da142403f..955fd00543a 100644 --- a/pkg/models/testmain_test.go +++ b/pkg/models/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/pkg/models/vulnerabilities_test.go b/pkg/models/vulnerabilities_test.go index d966d189b92..08d7366035b 100644 --- a/pkg/models/vulnerabilities_test.go +++ b/pkg/models/vulnerabilities_test.go @@ -3,8 +3,8 @@ package models_test import ( "testing" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" ) func TestVulnerabilities_MarshalJSON(t *testing.T) { diff --git a/pkg/models/vulnerability_test.go b/pkg/models/vulnerability_test.go index 107024d9e1b..f8294b961eb 100644 --- a/pkg/models/vulnerability_test.go +++ b/pkg/models/vulnerability_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" "gopkg.in/yaml.v3" ) diff --git a/pkg/osv/osv.go b/pkg/osv/osv.go index 56fdd74b6a9..1a762a593dc 100644 --- a/pkg/osv/osv.go +++ b/pkg/osv/osv.go @@ -10,8 +10,8 @@ import ( "net/http" "time" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/pkg/models" "golang.org/x/sync/errgroup" ) diff --git a/pkg/osv/osv_test.go b/pkg/osv/osv_test.go index d6dd985c868..91184ff3ede 100644 --- a/pkg/osv/osv_test.go +++ b/pkg/osv/osv_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMakeRetryRequest(t *testing.T) { diff --git a/pkg/osvscanner/filter.go b/pkg/osvscanner/filter.go index 4dd98562e46..d8cdbc91f1f 100644 --- a/pkg/osvscanner/filter.go +++ b/pkg/osvscanner/filter.go @@ -3,11 +3,11 @@ package osvscanner import ( "fmt" - "github.com/google/osv-scanner/internal/config" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/imodels/results" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/config" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/imodels/results" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/ossf/osv-schema/bindings/go/osvschema" ) diff --git a/pkg/osvscanner/filter_internal_test.go b/pkg/osvscanner/filter_internal_test.go index 9d705fa8306..61f4189e95c 100644 --- a/pkg/osvscanner/filter_internal_test.go +++ b/pkg/osvscanner/filter_internal_test.go @@ -4,10 +4,10 @@ import ( "path/filepath" "testing" - "github.com/google/osv-scanner/internal/config" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/config" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func Test_filterResults(t *testing.T) { diff --git a/pkg/osvscanner/internal/imagehelpers/imagehelpers.go b/pkg/osvscanner/internal/imagehelpers/imagehelpers.go index 89132288dae..05753718f4d 100644 --- a/pkg/osvscanner/internal/imagehelpers/imagehelpers.go +++ b/pkg/osvscanner/internal/imagehelpers/imagehelpers.go @@ -10,9 +10,9 @@ import ( "github.com/google/osv-scalibr/artifact/image/layerscanning/image" "github.com/google/osv-scalibr/extractor/filesystem/os/osrelease" - "github.com/google/osv-scanner/internal/clients/clientinterfaces" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/clients/clientinterfaces" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func BuildImageMetadata(img *image.Image, baseImageMatcher clientinterfaces.BaseImageMatcher) (*models.ImageMetadata, error) { diff --git a/pkg/osvscanner/internal/scanners/extractorbuilder.go b/pkg/osvscanner/internal/scanners/extractorbuilder.go index 9d2e4cce787..66dfa422754 100644 --- a/pkg/osvscanner/internal/scanners/extractorbuilder.go +++ b/pkg/osvscanner/internal/scanners/extractorbuilder.go @@ -32,13 +32,13 @@ import ( "github.com/google/osv-scalibr/extractor/filesystem/os/dpkg" "github.com/google/osv-scalibr/extractor/filesystem/sbom/cdx" "github.com/google/osv-scalibr/extractor/filesystem/sbom/spdx" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/osvdev" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/scalibrextract/filesystem/vendored" - "github.com/google/osv-scanner/internal/scalibrextract/language/java/pomxmlnet" - "github.com/google/osv-scanner/internal/scalibrextract/language/javascript/nodemodules" - "github.com/google/osv-scanner/internal/scalibrextract/vcs/gitrepo" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/osvdev" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/scalibrextract/filesystem/vendored" + "github.com/google/osv-scanner/v2/internal/scalibrextract/language/java/pomxmlnet" + "github.com/google/osv-scanner/v2/internal/scalibrextract/language/javascript/nodemodules" + "github.com/google/osv-scanner/v2/internal/scalibrextract/vcs/gitrepo" "github.com/ossf/osv-schema/bindings/go/osvschema" ) diff --git a/pkg/osvscanner/internal/scanners/lockfile.go b/pkg/osvscanner/internal/scanners/lockfile.go index 20dbb1feabe..211bcd4886a 100644 --- a/pkg/osvscanner/internal/scanners/lockfile.go +++ b/pkg/osvscanner/internal/scanners/lockfile.go @@ -10,10 +10,10 @@ import ( "github.com/google/osv-scalibr/extractor/filesystem" "github.com/google/osv-scalibr/extractor/filesystem/os/apk" "github.com/google/osv-scalibr/extractor/filesystem/os/dpkg" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/scalibrextract" - "github.com/google/osv-scanner/internal/scalibrextract/language/osv/osvscannerjson" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/scalibrextract" + "github.com/google/osv-scanner/v2/internal/scalibrextract/language/osv/osvscannerjson" + "github.com/google/osv-scanner/v2/pkg/reporter" ) var lockfileExtractorMapping = map[string]string{ diff --git a/pkg/osvscanner/internal/scanners/walker.go b/pkg/osvscanner/internal/scanners/walker.go index a44241eaa87..aa6afaab8c3 100644 --- a/pkg/osvscanner/internal/scanners/walker.go +++ b/pkg/osvscanner/internal/scanners/walker.go @@ -10,10 +10,10 @@ import ( "github.com/go-git/go-git/v5/plumbing/format/gitignore" "github.com/google/osv-scalibr/extractor" "github.com/google/osv-scalibr/extractor/filesystem" - "github.com/google/osv-scanner/internal/customgitignore" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/scalibrextract" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/customgitignore" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/scalibrextract" + "github.com/google/osv-scanner/v2/pkg/reporter" ) // ScanDir walks through the given directory to try to find any relevant files diff --git a/pkg/osvscanner/osvscanner.go b/pkg/osvscanner/osvscanner.go index 7b07038cf7e..fb9d99a335e 100644 --- a/pkg/osvscanner/osvscanner.go +++ b/pkg/osvscanner/osvscanner.go @@ -12,24 +12,24 @@ import ( scalibr "github.com/google/osv-scalibr" "github.com/google/osv-scalibr/artifact/image/layerscanning/image" "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/internal/clients/clientimpl/baseimagematcher" - "github.com/google/osv-scanner/internal/clients/clientimpl/licensematcher" - "github.com/google/osv-scanner/internal/clients/clientimpl/localmatcher" - "github.com/google/osv-scanner/internal/clients/clientimpl/osvmatcher" - "github.com/google/osv-scanner/internal/clients/clientinterfaces" - "github.com/google/osv-scanner/internal/config" - "github.com/google/osv-scanner/internal/datasource" - "github.com/google/osv-scanner/internal/depsdev" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/imodels/results" - "github.com/google/osv-scanner/internal/osvdev" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/version" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/osvscanner/internal/imagehelpers" - "github.com/google/osv-scanner/pkg/osvscanner/internal/scanners" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/baseimagematcher" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/licensematcher" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/localmatcher" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/osvmatcher" + "github.com/google/osv-scanner/v2/internal/clients/clientinterfaces" + "github.com/google/osv-scanner/v2/internal/config" + "github.com/google/osv-scanner/v2/internal/datasource" + "github.com/google/osv-scanner/v2/internal/depsdev" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/imodels/results" + "github.com/google/osv-scanner/v2/internal/osvdev" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/version" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/osvscanner/internal/imagehelpers" + "github.com/google/osv-scanner/v2/pkg/osvscanner/internal/scanners" + "github.com/google/osv-scanner/v2/pkg/reporter" "github.com/ossf/osv-schema/bindings/go/osvschema" ) diff --git a/pkg/osvscanner/purl_to_package.go b/pkg/osvscanner/purl_to_package.go index 0a33dba9362..7f735f8ca14 100644 --- a/pkg/osvscanner/purl_to_package.go +++ b/pkg/osvscanner/purl_to_package.go @@ -1,7 +1,7 @@ package osvscanner import ( - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) // PURLToPackage converts a Package URL string to models.PackageInfo diff --git a/pkg/osvscanner/scan.go b/pkg/osvscanner/scan.go index 34c482a47c2..10588e26763 100644 --- a/pkg/osvscanner/scan.go +++ b/pkg/osvscanner/scan.go @@ -2,10 +2,10 @@ package osvscanner import ( "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/scalibrextract/ecosystemmock" - "github.com/google/osv-scanner/pkg/osvscanner/internal/scanners" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/scalibrextract/ecosystemmock" + "github.com/google/osv-scanner/v2/pkg/osvscanner/internal/scanners" + "github.com/google/osv-scanner/v2/pkg/reporter" ) // scan essentially converts ScannerActions into PackageScanResult by performing the extractions diff --git a/pkg/osvscanner/testmain_test.go b/pkg/osvscanner/testmain_test.go index 3cc49baa591..d615ca18dee 100644 --- a/pkg/osvscanner/testmain_test.go +++ b/pkg/osvscanner/testmain_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/google/osv-scanner/internal/testutility" + "github.com/google/osv-scanner/v2/internal/testutility" ) func TestMain(m *testing.M) { diff --git a/pkg/osvscanner/vulnerability_result.go b/pkg/osvscanner/vulnerability_result.go index 2e7fc716bd4..650fdf722a9 100644 --- a/pkg/osvscanner/vulnerability_result.go +++ b/pkg/osvscanner/vulnerability_result.go @@ -6,14 +6,14 @@ import ( "strings" "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/internal/grouper" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/imodels/results" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/internal/sourceanalysis" - "github.com/google/osv-scanner/internal/spdx" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/grouper" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/imodels/results" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/internal/sourceanalysis" + "github.com/google/osv-scanner/v2/internal/spdx" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" ) // buildVulnerabilityResults takes the responses from the OSV API and the deps.dev API diff --git a/pkg/osvscanner/vulnerability_result_internal_test.go b/pkg/osvscanner/vulnerability_result_internal_test.go index dcd79fb088b..267b9ad10f9 100644 --- a/pkg/osvscanner/vulnerability_result_internal_test.go +++ b/pkg/osvscanner/vulnerability_result_internal_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/google/osv-scalibr/extractor" - "github.com/google/osv-scanner/internal/config" - "github.com/google/osv-scanner/internal/imodels" - "github.com/google/osv-scanner/internal/imodels/results" - "github.com/google/osv-scanner/internal/scalibrextract/ecosystemmock" - "github.com/google/osv-scanner/internal/testutility" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/internal/config" + "github.com/google/osv-scanner/v2/internal/imodels" + "github.com/google/osv-scanner/v2/internal/imodels/results" + "github.com/google/osv-scanner/v2/internal/scalibrextract/ecosystemmock" + "github.com/google/osv-scanner/v2/internal/testutility" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func Test_assembleResult(t *testing.T) { diff --git a/pkg/reporter/cyclonedx.go b/pkg/reporter/cyclonedx.go index f517eccfbae..13b30eba0c0 100644 --- a/pkg/reporter/cyclonedx.go +++ b/pkg/reporter/cyclonedx.go @@ -5,9 +5,9 @@ import ( "io" "strings" - "github.com/google/osv-scanner/internal/output" + "github.com/google/osv-scanner/v2/internal/output" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) type CycloneDXReporter struct { diff --git a/pkg/reporter/cyclonedx_test.go b/pkg/reporter/cyclonedx_test.go index ab675759256..3252906a889 100644 --- a/pkg/reporter/cyclonedx_test.go +++ b/pkg/reporter/cyclonedx_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func TestCycloneDXReporter_Errorf(t *testing.T) { diff --git a/pkg/reporter/format.go b/pkg/reporter/format.go index 2178b0738c6..69490cb0ddc 100644 --- a/pkg/reporter/format.go +++ b/pkg/reporter/format.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) var format = []string{"table", "html", "vertical", "json", "markdown", "sarif", "gh-annotations", "cyclonedx-1-4", "cyclonedx-1-5"} diff --git a/pkg/reporter/format_test.go b/pkg/reporter/format_test.go index eec141b424a..766f18f37b6 100644 --- a/pkg/reporter/format_test.go +++ b/pkg/reporter/format_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func TestNew(t *testing.T) { diff --git a/pkg/reporter/gh-annotations_reporter.go b/pkg/reporter/gh-annotations_reporter.go index 7c813513a3a..ade66d56dba 100644 --- a/pkg/reporter/gh-annotations_reporter.go +++ b/pkg/reporter/gh-annotations_reporter.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/models" ) type GHAnnotationsReporter struct { diff --git a/pkg/reporter/gh-annotations_reporter_test.go b/pkg/reporter/gh-annotations_reporter_test.go index d95e4c3aea5..70eb3ee7ec9 100644 --- a/pkg/reporter/gh-annotations_reporter_test.go +++ b/pkg/reporter/gh-annotations_reporter_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func TestGHAnnotationsReporter_Errorf(t *testing.T) { diff --git a/pkg/reporter/html_reporter.go b/pkg/reporter/html_reporter.go index a886be292ff..c6900cc6166 100644 --- a/pkg/reporter/html_reporter.go +++ b/pkg/reporter/html_reporter.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/models" ) type HTMLReporter struct { diff --git a/pkg/reporter/json_reporter.go b/pkg/reporter/json_reporter.go index b21a9b62831..07a404739ab 100644 --- a/pkg/reporter/json_reporter.go +++ b/pkg/reporter/json_reporter.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/models" ) // JSONReporter prints vulnerability results in JSON format to stdout. Runtime information diff --git a/pkg/reporter/json_reporter_test.go b/pkg/reporter/json_reporter_test.go index 868f530ebbe..659b710cacf 100644 --- a/pkg/reporter/json_reporter_test.go +++ b/pkg/reporter/json_reporter_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func TestJSONReporter_Errorf(t *testing.T) { diff --git a/pkg/reporter/reporter.go b/pkg/reporter/reporter.go index 7b17b232282..b421c3134c4 100644 --- a/pkg/reporter/reporter.go +++ b/pkg/reporter/reporter.go @@ -1,7 +1,7 @@ package reporter import ( - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) // Reporter provides printing operations for vulnerability results and for runtime information (depending on the verbosity diff --git a/pkg/reporter/sarif_reporter.go b/pkg/reporter/sarif_reporter.go index 332d76bc3ee..f8394ab2684 100644 --- a/pkg/reporter/sarif_reporter.go +++ b/pkg/reporter/sarif_reporter.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/models" ) type SARIFReporter struct { diff --git a/pkg/reporter/sarif_reporter_test.go b/pkg/reporter/sarif_reporter_test.go index 443bf3fcbfb..d5c75e84350 100644 --- a/pkg/reporter/sarif_reporter_test.go +++ b/pkg/reporter/sarif_reporter_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func TestSarifReporter_Errorf(t *testing.T) { diff --git a/pkg/reporter/table_reporter.go b/pkg/reporter/table_reporter.go index e4b5afb0f81..08691722838 100644 --- a/pkg/reporter/table_reporter.go +++ b/pkg/reporter/table_reporter.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/models" ) type TableReporter struct { diff --git a/pkg/reporter/table_reporter_test.go b/pkg/reporter/table_reporter_test.go index af07ab61857..2fd37c7242a 100644 --- a/pkg/reporter/table_reporter_test.go +++ b/pkg/reporter/table_reporter_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func TestTableReporter_Errorf(t *testing.T) { diff --git a/pkg/reporter/verbosity_test.go b/pkg/reporter/verbosity_test.go index 0dfe96f0843..0f70482a95b 100644 --- a/pkg/reporter/verbosity_test.go +++ b/pkg/reporter/verbosity_test.go @@ -3,7 +3,7 @@ package reporter_test import ( "testing" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func TestParseVerbosityLevel_GivenValidLevels(t *testing.T) { diff --git a/pkg/reporter/vertical_reporter.go b/pkg/reporter/vertical_reporter.go index 755c9809f70..979c74af998 100644 --- a/pkg/reporter/vertical_reporter.go +++ b/pkg/reporter/vertical_reporter.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/google/osv-scanner/internal/output" - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/internal/output" + "github.com/google/osv-scanner/v2/pkg/models" "github.com/jedib0t/go-pretty/v6/text" ) diff --git a/pkg/reporter/vertical_reporter_test.go b/pkg/reporter/vertical_reporter_test.go index 2c2c4ae4b9c..22cb34b755d 100644 --- a/pkg/reporter/vertical_reporter_test.go +++ b/pkg/reporter/vertical_reporter_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/google/osv-scanner/pkg/reporter" + "github.com/google/osv-scanner/v2/pkg/reporter" ) func TestVerticalReporter_Errorf(t *testing.T) { diff --git a/pkg/reporter/void_reporter.go b/pkg/reporter/void_reporter.go index cdad2130fc5..e9845da4b03 100644 --- a/pkg/reporter/void_reporter.go +++ b/pkg/reporter/void_reporter.go @@ -1,7 +1,7 @@ package reporter import ( - "github.com/google/osv-scanner/pkg/models" + "github.com/google/osv-scanner/v2/pkg/models" ) type VoidReporter struct { diff --git a/scripts/generate_mock_resolution_universe/main.go b/scripts/generate_mock_resolution_universe/main.go index b45b2fe979e..b504f91521e 100644 --- a/scripts/generate_mock_resolution_universe/main.go +++ b/scripts/generate_mock_resolution_universe/main.go @@ -23,22 +23,22 @@ import ( pb "deps.dev/api/v3" "deps.dev/util/resolve" "deps.dev/util/resolve/dep" - "github.com/google/osv-scanner/internal/clients/clientimpl/osvmatcher" - "github.com/google/osv-scanner/internal/clients/clientinterfaces" - "github.com/google/osv-scanner/internal/depsdev" - "github.com/google/osv-scanner/internal/osvdev" - "github.com/google/osv-scanner/internal/remediation" - "github.com/google/osv-scanner/internal/remediation/upgrade" - "github.com/google/osv-scanner/internal/resolution" - "github.com/google/osv-scanner/internal/resolution/client" - "github.com/google/osv-scanner/internal/resolution/clienttest" - "github.com/google/osv-scanner/internal/resolution/lockfile" - "github.com/google/osv-scanner/internal/resolution/manifest" - "github.com/google/osv-scanner/internal/resolution/util" - "github.com/google/osv-scanner/internal/version" - lf "github.com/google/osv-scanner/pkg/lockfile" - "github.com/google/osv-scanner/pkg/models" - "github.com/google/osv-scanner/pkg/osv" + "github.com/google/osv-scanner/v2/internal/clients/clientimpl/osvmatcher" + "github.com/google/osv-scanner/v2/internal/clients/clientinterfaces" + "github.com/google/osv-scanner/v2/internal/depsdev" + "github.com/google/osv-scanner/v2/internal/osvdev" + "github.com/google/osv-scanner/v2/internal/remediation" + "github.com/google/osv-scanner/v2/internal/remediation/upgrade" + "github.com/google/osv-scanner/v2/internal/resolution" + "github.com/google/osv-scanner/v2/internal/resolution/client" + "github.com/google/osv-scanner/v2/internal/resolution/clienttest" + "github.com/google/osv-scanner/v2/internal/resolution/lockfile" + "github.com/google/osv-scanner/v2/internal/resolution/manifest" + "github.com/google/osv-scanner/v2/internal/resolution/util" + "github.com/google/osv-scanner/v2/internal/version" + lf "github.com/google/osv-scanner/v2/pkg/lockfile" + "github.com/google/osv-scanner/v2/pkg/models" + "github.com/google/osv-scanner/v2/pkg/osv" "golang.org/x/exp/maps" "golang.org/x/sync/errgroup" "gopkg.in/yaml.v3"