oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-02-12 10:36:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

RPM Epoch should be optional in the json schema (#880)

Browse Source
This commit is contained in:
Alex Goodman 2022-03-09 14:51:43 -05:00 committed by GitHub
parent 003d28ad48
commit 2946813a74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1239 additions and 12 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.0.1" JSONSchemaVersion = "3.1.0"
) )

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

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

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

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

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

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

1229
schema/json/schema-3.1.0.json Normal file
View File

File diff suppressed because it is too large Load Diff

8
syft/pkg/rpmdb_metadata.go
View File

@ -5,12 +5,10 @@ import (
"sort" "sort"
"strconv" "strconv"
"github.com/anchore/syft/syft/file"
"github.com/scylladb/go-set/strset"
"github.com/anchore/packageurl-go" "github.com/anchore/packageurl-go"
"github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/linux" "github.com/anchore/syft/syft/linux"
"github.com/scylladb/go-set/strset"
) )
const RpmDBGlob = "**/var/lib/rpm/Packages" const RpmDBGlob = "**/var/lib/rpm/Packages"
@ -24,7 +22,7 @@ var (
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"` 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"`