Skip to content

Commit 6fb3fde

Browse files
knqyf263knqyf263
authored
feat(report): switch ReportID from UUIDv4 to UUIDv7 (#9749)
1 parent cb58bf6 commit 6fb3fde

File tree

92 files changed

+157
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+157
-128
lines changed

‎integration/integration_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,8 @@ func runTest(t *testing.T, osArgs []string, wantFile string, format types.Format
364364
if opts.fakeUUID != "" {
365365
uuid.SetFakeUUID(t, opts.fakeUUID)
366366
}
367+
// Set fake UUID v7 for ReportID generation. Format is not configurable.
368+
uuid.SetFakeUUIDV7(t, "017b7d41-e09f-7000-80ea-%012d")
367369

368370
// Set up the output file
369371
outputFile := filepath.Join(t.TempDir(), "output.json")

‎integration/sbom_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ func TestSBOMEquivalence(t *testing.T) {
154154
want.Results[0].Vulnerabilities[1].PkgIdentifier.BOMRef = "pkg:rpm/centos/[email protected]?arch=x86_64&epoch=1&distro=centos-7.6.1810"
155155
want.Results[0].Vulnerabilities[2].PkgIdentifier.BOMRef = "pkg:rpm/centos/[email protected]?arch=x86_64&epoch=1&distro=centos-7.6.1810"
156156

157-
// SBOM parsing consumes UUIDs #1-#4 for components, so ReportID becomes #5
158-
want.ReportID = "3ff14136-e09f-4df9-80ea-000000000005"
157+
// ReportID uses v7 UUID with independent counter from v4 UUIDs used for SBOM components
158+
want.ReportID = "017b7d41-e09f-7000-80ea-000000000001"
159159
},
160160
},
161161
{
@@ -173,8 +173,8 @@ func TestSBOMEquivalence(t *testing.T) {
173173
require.Len(t, got.Results, 1)
174174
want.Results[0].Target = "testdata/fixtures/sbom/centos-7-spdx.txt (centos 7.6.1810)"
175175

176-
// SBOM parsing consumes UUIDs #1-#4 for components, so ReportID becomes #5
177-
want.ReportID = "3ff14136-e09f-4df9-80ea-000000000005"
176+
// ReportID uses v7 UUID with independent counter from v4 UUIDs used for SBOM components
177+
want.ReportID = "017b7d41-e09f-7000-80ea-000000000001"
178178
},
179179
},
180180
{
@@ -192,8 +192,8 @@ func TestSBOMEquivalence(t *testing.T) {
192192
require.Len(t, got.Results, 1)
193193
want.Results[0].Target = "testdata/fixtures/sbom/centos-7-spdx.json (centos 7.6.1810)"
194194

195-
// SBOM parsing consumes UUIDs #1-#4 for components, so ReportID becomes #5
196-
want.ReportID = "3ff14136-e09f-4df9-80ea-000000000005"
195+
// ReportID uses v7 UUID with independent counter from v4 UUIDs used for SBOM components
196+
want.ReportID = "017b7d41-e09f-7000-80ea-000000000001"
197197
},
198198
},
199199
{
@@ -216,8 +216,8 @@ func TestSBOMEquivalence(t *testing.T) {
216216
want.Results[0].Vulnerabilities[1].PkgIdentifier.BOMRef = "pkg:rpm/centos/[email protected]?arch=x86_64&epoch=1&distro=centos-7.6.1810"
217217
want.Results[0].Vulnerabilities[2].PkgIdentifier.BOMRef = "pkg:rpm/centos/[email protected]?arch=x86_64&epoch=1&distro=centos-7.6.1810"
218218

219-
// SBOM parsing consumes UUIDs #1-#4 for components, so ReportID becomes #5
220-
want.ReportID = "3ff14136-e09f-4df9-80ea-000000000005"
219+
// ReportID uses v7 UUID with independent counter from v4 UUIDs used for SBOM components
220+
want.ReportID = "017b7d41-e09f-7000-80ea-000000000001"
221221
},
222222
},
223223
}

‎integration/testdata/almalinux-8.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ReportID": "3ff14136-e09f-4df9-80ea-000000000001",
3+
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
44
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
55
"ArtifactID": "sha256:fb75459277a4cbcf98182b48c789cfbd4b34414e05898e1231ae8b2ca099f4e7",
66
"ArtifactName": "testdata/fixtures/images/almalinux-8.tar.gz",

‎integration/testdata/alpine-310.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ReportID": "3ff14136-e09f-4df9-80ea-000000000001",
3+
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
44
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
55
"ArtifactID": "sha256:39549bf49d696f172a6513103cdc8f53717024ad1fbce62d680a8e7ddde1a612",
66
"ArtifactName": "testdata/fixtures/images/alpine-310.tar.gz",

‎integration/testdata/alpine-39-high-critical.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ReportID": "3ff14136-e09f-4df9-80ea-000000000001",
3+
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
44
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
55
"ArtifactID": "sha256:988a8e3eb049d90c20fafb183d0e792c99b8ba28433be1d1e4447a8b5a1adbdf",
66
"ArtifactName": "testdata/fixtures/images/alpine-39.tar.gz",

‎integration/testdata/alpine-39-ignore-cveids.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ReportID": "3ff14136-e09f-4df9-80ea-000000000001",
3+
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
44
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
55
"ArtifactID": "sha256:988a8e3eb049d90c20fafb183d0e792c99b8ba28433be1d1e4447a8b5a1adbdf",
66
"ArtifactName": "testdata/fixtures/images/alpine-39.tar.gz",

‎integration/testdata/alpine-39-skip.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ReportID": "3ff14136-e09f-4df9-80ea-000000000001",
3+
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
44
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
55
"ArtifactID": "sha256:988a8e3eb049d90c20fafb183d0e792c99b8ba28433be1d1e4447a8b5a1adbdf",
66
"ArtifactName": "testdata/fixtures/images/alpine-39.tar.gz",

‎integration/testdata/alpine-39.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ReportID": "3ff14136-e09f-4df9-80ea-000000000001",
3+
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
44
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
55
"ArtifactID": "sha256:988a8e3eb049d90c20fafb183d0e792c99b8ba28433be1d1e4447a8b5a1adbdf",
66
"ArtifactName": "testdata/fixtures/images/alpine-39.tar.gz",

‎integration/testdata/alpine-distroless.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ReportID": "3ff14136-e09f-4df9-80ea-000000000001",
3+
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
44
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
55
"ArtifactID": "sha256:0edd1906378dca3abc435f47f2e4b91059e9950e55cd82c76089d60b9ca68f90",
66
"ArtifactName": "testdata/fixtures/images/alpine-distroless.tar.gz",

‎integration/testdata/amazon-1.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ReportID": "3ff14136-e09f-4df9-80ea-000000000001",
3+
"ReportID": "017b7d41-e09f-7000-80ea-000000000001",
44
"CreatedAt": "2021-08-25T12:20:30.000000005Z",
55
"ArtifactID": "sha256:5a0fd7bb415c9b52d1bb909e40b9f498a89a5572724bd107d26ead4a25f203e1",
66
"ArtifactName": "testdata/fixtures/images/amazon-1.tar.gz",

0 commit comments

Comments
 (0)