oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-11-01 06:56:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

expand compare testing images

Browse Source 
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
This commit is contained in:
Alex Goodman
2020-10-29 13:52:51 -04:00
parent ab45be98b8
commit a4f22e65fc
4 changed files with 45 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/inline-compare/utils/inline.py
+1 -7
View File
@@ -76,12 +76,6 @@ class InlineScan:
if v in ("", "N/A"):
entry[k] = None
extra = {}
# extra = dict(entry)
# extra.pop('type')
# extra.pop('maven-version')
# extra.pop("origin") # don't include origin as syft does not compact several fields into 1
pkg = utils.package.Package(
name=name,
type=pkg_type,
@@ -90,7 +84,7 @@ class InlineScan:
metadata[pkg.type][pkg] = utils.package.Metadata(
version=entry["maven-version"],
extra=tuple(sorted(extra.items())),
extra=tuple(),
)
return packages, metadata
test/inline-compare/utils/syft.py
+5 -20
View File
@@ -50,29 +50,14 @@ class Syft:
version = entry["version"]
if "java" in pkg_type:
# lets match what inline scan expects to output
# specVersion = dig(entry, "metadata", "manifest", "specificationVersion") or None
# implVersion = dig(entry, "metadata", "manifest", "implementationVersion") or None
virtualPath = dig(entry, "metadata", "virtualPath")
# package = dig(entry, "metadata", "pomProperties", "artifactId")
# if not package:
# package = "%s-%s" % (dig(entry, "name"), dig(entry, "version"))
#
# extra = {
# "implementation-version": implVersion,
# "specification-version": specVersion,
# "location": virtualPath,
# "package": package,
# }
# we need to use the virtual path instead of the name to account for nested dependencies with the same
# package name (but potentially different metadata)
name = virtualPath
name = dig(entry, "metadata", "virtualPath")
elif pkg_type == "apkg":
version = entry["version"].split("-")[0]
# inline scan strips off the release from the version, which should be normalized here
fields = entry["version"].split("-")
version = "-".join(fields[:-1])
pkg = utils.package.Package(
name=name,
@@ -81,6 +66,6 @@ class Syft:
packages.add(pkg)
metadata[pkg.type][pkg] = utils.package.Metadata(version=version, extra=tuple(sorted(extra.items())))
metadata[pkg.type][pkg] = utils.package.Metadata(version=version, extra=tuple())
return utils.package.Info(packages=frozenset(packages), metadata=metadata)