oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 08:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add modularitylabel metadata to RPM type records generated by syft (#1148)

Browse Source 
* bump cosign to v1.10.1 (#1144)

Signed-off-by: Daniel Nurmi <nurmi@anchore.com>

* Add modularitylabel metadata to RPM type records generated by syft. Fixes #1145.

Signed-off-by: Daniel Nurmi <nurmi@anchore.com>

* update to address lint failures

Signed-off-by: Daniel Nurmi <nurmi@anchore.com>

* Update syft/pkg/rpmdb_metadata.go

Co-authored-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Daniel Nurmi <nurmi@anchore.com>

* update json schema to match camel case

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

Co-authored-by: Weston Steimel <weston.steimel@anchore.com>
Co-authored-by: Alex Goodman <wagoodman@users.noreply.github.com>
Co-authored-by: Alex Goodman <alex.goodman@anchore.com>
This commit is contained in:
Dan Nurmi 2022-08-08 04:52:32 -07:00 committed by GitHub
parent 4df84d380d
commit 04387301ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1496 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/constants.go
View File

@ -6,5 +6,5 @@ const (
// JSONSchemaVersion is the current schema version output by the JSON encoder // JSONSchemaVersion is the current schema version output by the JSON encoder
// This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment. // This is roughly following the "SchemaVer" guidelines for versioning the JSON schema. Please see schema/json/README.md for details on how to increment.
JSONSchemaVersion = "3.3.1" JSONSchemaVersion = "3.3.2"
) )

4
internal/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden
View File

@ -88,7 +88,7 @@
} }
}, },
"schema": { "schema": {
"version": "3.3.1", "version": "3.3.2",
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.1.json" "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.2.json"
} }
} }

4
internal/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden
View File

@ -184,7 +184,7 @@
} }
}, },
"schema": { "schema": {
"version": "3.3.1", "version": "3.3.2",
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.1.json" "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.2.json"
} }
} }

4
internal/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden
View File

@ -111,7 +111,7 @@
} }
}, },
"schema": { "schema": {
"version": "3.3.1", "version": "3.3.2",
"url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.1.json" "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.3.2.json"
} }
} }

1467
schema/json/schema-3.3.2.json Normal file
View File

File diff suppressed because it is too large Load Diff

21
syft/pkg/cataloger/rpmdb/parse_rpmdb.go
View File

@ -69,16 +69,17 @@ func newPkg(resolver source.FilePathResolver, dbLocation source.Location, entry
} }
metadata := pkg.RpmdbMetadata{ metadata := pkg.RpmdbMetadata{
Name: entry.Name, Name: entry.Name,
Version: entry.Version, Version: entry.Version,
Epoch: entry.Epoch, Epoch: entry.Epoch,
Arch: entry.Arch, Arch: entry.Arch,
Release: entry.Release, Release: entry.Release,
SourceRpm: entry.SourceRpm, SourceRpm: entry.SourceRpm,
Vendor: entry.Vendor, Vendor: entry.Vendor,
License: entry.License, License: entry.License,
Size: entry.Size, Size: entry.Size,
Files: fileRecords, ModularityLabel: entry.Modularitylabel,
Files: fileRecords,
} }
p := pkg.Package{ p := pkg.Package{

21
syft/pkg/rpmdb_metadata.go
View File

@ -26,16 +26,17 @@ var (
// RpmdbMetadata represents all captured data for a RPM DB package entry. // RpmdbMetadata represents all captured data for a RPM DB package entry.
type RpmdbMetadata struct { type RpmdbMetadata struct {
Name string `json:"name"` Name string `json:"name"`
Version string `json:"version"` Version string `json:"version"`
Epoch *int `json:"epoch" cyclonedx:"epoch" jsonschema:"nullable"` Epoch *int `json:"epoch" cyclonedx:"epoch" jsonschema:"nullable"`
Arch string `json:"architecture"` Arch string `json:"architecture"`
Release string `json:"release" cyclonedx:"release"` Release string `json:"release" cyclonedx:"release"`
SourceRpm string `json:"sourceRpm" cyclonedx:"sourceRpm"` SourceRpm string `json:"sourceRpm" cyclonedx:"sourceRpm"`
Size int `json:"size" cyclonedx:"size"` Size int `json:"size" cyclonedx:"size"`
License string `json:"license"` License string `json:"license"`
Vendor string `json:"vendor"` Vendor string `json:"vendor"`
Files []RpmdbFileRecord `json:"files"` ModularityLabel string `json:"modularityLabel"`
Files []RpmdbFileRecord `json:"files"`
} }
// RpmdbFileRecord represents the file metadata for a single file attributed to a RPM package. // RpmdbFileRecord represents the file metadata for a single file attributed to a RPM package.