Skip to content

update requires to use list; remove field #1234

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

Merged
spiffcs merged 2 commits into from
Sep 30, 2022
Merged

update requires to use list; remove field #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a5106f
update requires to use list; remove field
spiffcs Sep 29, 2022
e947e2e
add empty array to test deserialization for bug
spiffcs Sep 29, 2022
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
17 changes: 8 additions & 9 deletions syft/pkg/cataloger/cpp/parse_conanlock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@ var _ common.ParserFn = parseConanlock
type conanLock struct {
GraphLock struct {
Nodes map[string]struct {
Ref string `json:"ref"`
PackageID string `json:"package_id"`
Context string `json:"context"`
Prev string `json:"prev"`
Requires string `json:"requires"`
BuildRequires string `json:"build_requires"`
PythonRequires string `json:"py_requires"`
Options string `json:"options"`
Path string `json:"path"`
Ref string `json:"ref"`
PackageID string `json:"package_id"`
Context string `json:"context"`
Prev string `json:"prev"`
Requires []string `json:"requires"`
PythonRequires string `json:"py_requires"`
Options string `json:"options"`
Path string `json:"path"`
} `json:"nodes"`
} `json:"graph_lock"`
Version string `json:"version"`
Expand Down
1 change: 1 addition & 0 deletions syft/pkg/cataloger/cpp/test-fixtures/conan.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"0": {
"ref": "zlib/1.2.12",
"options": "fPIC=True\nshared=False",
"requires": [],
"path": "all/conanfile.py",
"context": "host"
}
Expand Down