-
Notifications
You must be signed in to change notification settings - Fork 142
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.
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
chore(deps): bump golang.org/x/vuln from 0.0.0-20211221130724-9d39a965865f to 0.2.0 #326
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
565c6ac
chore(deps): bump golang.org/x/vuln
dependabot[bot] 7c8ef40
update Entry struct for OSV
DmitriyLewen 1d670e8
Merge branch 'main' of github.com:aquasecurity/trivy-db into dependab…
DmitriyLewen 9bb432b
use original field names for OSV
DmitriyLewen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,74 @@ | ||
package osv | ||
|
||
import "golang.org/x/vuln/osv" | ||
import ( | ||
"time" | ||
) | ||
|
||
// source: https://github.com/golang/vuln/blob/9d39a965865fd1d0030df18602433a01f679fd7d/osv/json.go | ||
type RangeType string | ||
|
||
const RangeTypeGit RangeType = "GIT" | ||
|
||
type Ecosystem string | ||
|
||
type Package struct { | ||
Name string `json:"name"` | ||
Ecosystem Ecosystem `json:"ecosystem"` | ||
} | ||
|
||
type RangeEvent struct { | ||
Introduced string `json:"introduced,omitempty"` | ||
Fixed string `json:"fixed,omitempty"` | ||
} | ||
|
||
type Range struct { | ||
Type RangeType `json:"type"` | ||
Events []RangeEvent `json:"events"` | ||
} | ||
|
||
type ReferenceType string | ||
|
||
type Reference struct { | ||
Type ReferenceType `json:"type"` | ||
URL string `json:"url"` | ||
} | ||
|
||
type Affected struct { | ||
Package Package `json:"package"` | ||
Ranges []Range `json:"ranges,omitempty"` | ||
EcosystemSpecific EcosystemSpecific `json:"ecosystem_specific"` | ||
} | ||
|
||
type Import struct { | ||
Path string `json:"path,omitempty"` | ||
GOOS []string `json:"goos,omitempty"` | ||
GOARCH []string `json:"goarch,omitempty"` | ||
Symbols []string `json:"symbols,omitempty"` | ||
} | ||
|
||
type EcosystemSpecific struct { | ||
Imports []Import `json:"imports,omitempty"` | ||
} | ||
|
||
// source: https://ossf.github.io/osv-schema | ||
type Entry struct { | ||
// According to the specification, "summary" field is missing in the below struct. | ||
// https://ossf.github.io/osv-schema/ | ||
Summary string `json:"summary"` | ||
SchemaVersion string `json:"schema_version,omitempty"` | ||
ID string `json:"id"` | ||
Modified time.Time `json:"modified,omitempty"` | ||
Published time.Time `json:"published,omitempty"` | ||
Withdrawn *time.Time `json:"withdrawn,omitempty"` | ||
Aliases []string `json:"aliases,omitempty"` | ||
Summary string `json:"summary,omitempty"` | ||
Details string `json:"details"` | ||
Affected []Affected `json:"affected"` | ||
References []Reference `json:"references,omitempty"` | ||
Credits []Credit `json:"credits,omitempty"` | ||
DatabaseSpecific *DatabaseSpecific `json:"database_specific,omitempty"` | ||
} | ||
|
||
type Credit struct { | ||
Name string `json:"name"` | ||
} | ||
|
||
osv.Entry | ||
type DatabaseSpecific struct { | ||
URL string `json:"url,omitempty"` | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
golang/vuln
movedEntry
tointernal
folder. We can't import it.I copied this struct.