From 1a5106fec02be1eee8c31b111b4d35bd38d4b054 Mon Sep 17 00:00:00 2001 From: Christopher Phillips Date: Thu, 29 Sep 2022 16:48:38 -0400 Subject: [PATCH 1/2] update requires to use list; remove field Signed-off-by: Christopher Phillips --- syft/pkg/cataloger/cpp/parse_conanlock.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/syft/pkg/cataloger/cpp/parse_conanlock.go b/syft/pkg/cataloger/cpp/parse_conanlock.go index 85fcf1c035f..b49bf5f113a 100644 --- a/syft/pkg/cataloger/cpp/parse_conanlock.go +++ b/syft/pkg/cataloger/cpp/parse_conanlock.go @@ -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"` From e947e2e647ab7245a2726ae1e09b74b44ff066c0 Mon Sep 17 00:00:00 2001 From: Christopher Phillips Date: Thu, 29 Sep 2022 17:11:20 -0400 Subject: [PATCH 2/2] add empty array to test deserialization for bug Signed-off-by: Christopher Phillips --- syft/pkg/cataloger/cpp/test-fixtures/conan.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/syft/pkg/cataloger/cpp/test-fixtures/conan.lock b/syft/pkg/cataloger/cpp/test-fixtures/conan.lock index b63008d90bb..cbae840d949 100644 --- a/syft/pkg/cataloger/cpp/test-fixtures/conan.lock +++ b/syft/pkg/cataloger/cpp/test-fixtures/conan.lock @@ -4,6 +4,7 @@ "0": { "ref": "zlib/1.2.12", "options": "fPIC=True\nshared=False", + "requires": [], "path": "all/conanfile.py", "context": "host" }