Skip to content

Fix osv-scanner command to use custom UA #2904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meterglost wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −0
Open

Fix osv-scanner command to use custom UA #2904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/osv-scanner/fix/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@
}
opts.MavenClient = mc
userAgent := "osv-scanner_fix/" + version.OSVVersion
mc.SetUserAgent(userAgent)

Check failure on line 254 in cmd/osv-scanner/fix/command.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

mc.SetUserAgent undefined (type *datasource.MavenRegistryAPIClient has no field or method SetUserAgent)

Check failure on line 254 in cmd/osv-scanner/fix/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (macos-latest) 

mc.SetUserAgent undefined (type *datasource.MavenRegistryAPIClient has no field or method SetUserAgent)

Check failure on line 254 in cmd/osv-scanner/fix/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (ubuntu-latest) 

mc.SetUserAgent undefined (type *datasource.MavenRegistryAPIClient has no field or method SetUserAgent)

Check failure on line 254 in cmd/osv-scanner/fix/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (windows-latest) 

mc.SetUserAgent undefined (type *datasource.MavenRegistryAPIClient has no field or method SetUserAgent)

switch cmd.String("data-source") {
case "deps.dev":
cl, err := resolution.NewDepsDevClient(depsdev.DepsdevAPI, userAgent)
Expand All @@ -270,6 +272,7 @@
cl, err := resolution.NewCombinedNativeClient(resolution.CombinedNativeClientOptions{
ProjectDir: workDir,
MavenRegistry: cmd.String("maven-registry"),
UserAgent: userAgent,

Check failure on line 275 in cmd/osv-scanner/fix/command.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

unknown field UserAgent in struct literal of type "github.com/google/osv-scalibr/clients/resolution".CombinedNativeClientOptions (typecheck)

Check failure on line 275 in cmd/osv-scanner/fix/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (macos-latest) 

unknown field UserAgent in struct literal of type "github.com/google/osv-scalibr/clients/resolution".CombinedNativeClientOptions

Check failure on line 275 in cmd/osv-scanner/fix/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (ubuntu-latest) 

unknown field UserAgent in struct literal of type "github.com/google/osv-scalibr/clients/resolution".CombinedNativeClientOptions

Check failure on line 275 in cmd/osv-scanner/fix/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (windows-latest) 

unknown field UserAgent in struct literal of type "github.com/google/osv-scalibr/clients/resolution".CombinedNativeClientOptions
})
if err != nil {
return err
Expand Down
3 changes: 3 additions & 0 deletions cmd/osv-scanner/update/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@
opts.MavenClient = mc

userAgent := "osv-scanner_update/" + version.OSVVersion
mc.SetUserAgent(userAgent)

Check failure on line 89 in cmd/osv-scanner/update/command.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

mc.SetUserAgent undefined (type *datasource.MavenRegistryAPIClient has no field or method SetUserAgent)

Check failure on line 89 in cmd/osv-scanner/update/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (macos-latest) 

mc.SetUserAgent undefined (type *datasource.MavenRegistryAPIClient has no field or method SetUserAgent)

Check failure on line 89 in cmd/osv-scanner/update/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (ubuntu-latest) 

mc.SetUserAgent undefined (type *datasource.MavenRegistryAPIClient has no field or method SetUserAgent)

Check failure on line 89 in cmd/osv-scanner/update/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (windows-latest) 

mc.SetUserAgent undefined (type *datasource.MavenRegistryAPIClient has no field or method SetUserAgent)

switch cmd.String("data-source") {
case "deps.dev":
cl, err := resolution.NewDepsDevClient(depsdev.DepsdevAPI, userAgent)
Expand All @@ -97,6 +99,7 @@
cl, err := resolution.NewCombinedNativeClient(resolution.CombinedNativeClientOptions{
ProjectDir: filepath.Dir(opts.Manifest),
MavenClient: mc,
UserAgent: userAgent,

Check failure on line 102 in cmd/osv-scanner/update/command.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

unknown field UserAgent in struct literal of type "github.com/google/osv-scalibr/clients/resolution".CombinedNativeClientOptions (typecheck)

Check failure on line 102 in cmd/osv-scanner/update/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (macos-latest) 

unknown field UserAgent in struct literal of type "github.com/google/osv-scalibr/clients/resolution".CombinedNativeClientOptions

Check failure on line 102 in cmd/osv-scanner/update/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (ubuntu-latest) 

unknown field UserAgent in struct literal of type "github.com/google/osv-scalibr/clients/resolution".CombinedNativeClientOptions

Check failure on line 102 in cmd/osv-scanner/update/command.go

View workflow job for this annotation

GitHub Actions / Run unit tests (windows-latest) 

unknown field UserAgent in struct literal of type "github.com/google/osv-scalibr/clients/resolution".CombinedNativeClientOptions
})
if err != nil {
return err
Expand Down
Loading