Skip to content

Commit 09e50ce

Browse files
DmitriyLewenDmitriyLewen
authoredJun 11, 2024··
feat(sbom): migrate to CycloneDX v1.6 (#6903)
·
v0.62.0v0.53.0
1 parent 6e7f62d commit 09e50ce

File tree

8 files changed

+33
-33
lines changed

8 files changed

+33
-33
lines changed
 

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
1010
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2
1111
github.com/BurntSushi/toml v1.4.0
12-
github.com/CycloneDX/cyclonedx-go v0.8.0
12+
github.com/CycloneDX/cyclonedx-go v0.9.0
1313
github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible
1414
github.com/Masterminds/sprig/v3 v3.2.3
1515
github.com/NYTimes/gziphandler v1.1.1

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
653653
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
654654
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
655655
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
656-
github.com/CycloneDX/cyclonedx-go v0.8.0 h1:FyWVj6x6hoJrui5uRQdYZcSievw3Z32Z88uYzG/0D6M=
657-
github.com/CycloneDX/cyclonedx-go v0.8.0/go.mod h1:K2bA+324+Og0X84fA8HhN2X066K7Bxz4rpMQ4ZhjtSk=
656+
github.com/CycloneDX/cyclonedx-go v0.9.0 h1:inaif7qD8bivyxp7XLgxUYtOXWtDez7+j72qKTMQTb8=
657+
github.com/CycloneDX/cyclonedx-go v0.9.0/go.mod h1:NE/EWvzELOFlG6+ljX/QeMlVt9VKcTwu8u0ccsACEsw=
658658
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
659659
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
660660
github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible h1:juIaKLLVhqzP55d8x4cSVgwyQv76Z55/fRv/UBr2KkQ=

‎integration/testdata/conda-cyclonedx.json.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
2+
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
33
"bomFormat": "CycloneDX",
4-
"specVersion": "1.5",
4+
"specVersion": "1.6",
55
"serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000004",
66
"version": 1,
77
"metadata": {

‎integration/testdata/conda-environment-cyclonedx.json.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
2+
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
33
"bomFormat": "CycloneDX",
4-
"specVersion": "1.5",
4+
"specVersion": "1.6",
55
"serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000004",
66
"version": 1,
77
"metadata": {

‎integration/testdata/fluentd-multiple-lockfiles.cdx.json.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
2+
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
33
"bomFormat": "CycloneDX",
4-
"specVersion": "1.5",
4+
"specVersion": "1.6",
55
"serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000163",
66
"version": 1,
77
"metadata": {

‎integration/testdata/pom-cyclonedx.json.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
2+
"$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
33
"bomFormat": "CycloneDX",
4-
"specVersion": "1.5",
4+
"specVersion": "1.6",
55
"serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000005",
66
"version": 1,
77
"metadata": {

‎pkg/sbom/cyclonedx/marshal_test.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,10 @@ func TestMarshaler_MarshalReport(t *testing.T) {
254254
},
255255
},
256256
want: &cdx.BOM{
257-
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
257+
XMLNS: "http://cyclonedx.org/schema/bom/1.6",
258258
BOMFormat: "CycloneDX",
259-
SpecVersion: cdx.SpecVersion1_5,
260-
JSONSchema: "http://cyclonedx.org/schema/bom-1.5.schema.json",
259+
SpecVersion: cdx.SpecVersion1_6,
260+
JSONSchema: "http://cyclonedx.org/schema/bom-1.6.schema.json",
261261
SerialNumber: "urn:uuid:3ff14136-e09f-4df9-80ea-000000000014",
262262
Version: 1,
263263
Metadata: &cdx.Metadata{
@@ -909,10 +909,10 @@ func TestMarshaler_MarshalReport(t *testing.T) {
909909
},
910910
},
911911
want: &cdx.BOM{
912-
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
912+
XMLNS: "http://cyclonedx.org/schema/bom/1.6",
913913
BOMFormat: "CycloneDX",
914-
SpecVersion: cdx.SpecVersion1_5,
915-
JSONSchema: "http://cyclonedx.org/schema/bom-1.5.schema.json",
914+
SpecVersion: cdx.SpecVersion1_6,
915+
JSONSchema: "http://cyclonedx.org/schema/bom-1.6.schema.json",
916916
SerialNumber: "urn:uuid:3ff14136-e09f-4df9-80ea-000000000007",
917917
Version: 1,
918918
Metadata: &cdx.Metadata{
@@ -1293,10 +1293,10 @@ func TestMarshaler_MarshalReport(t *testing.T) {
12931293
},
12941294
},
12951295
want: &cdx.BOM{
1296-
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
1296+
XMLNS: "http://cyclonedx.org/schema/bom/1.6",
12971297
BOMFormat: "CycloneDX",
1298-
SpecVersion: cdx.SpecVersion1_5,
1299-
JSONSchema: "http://cyclonedx.org/schema/bom-1.5.schema.json",
1298+
SpecVersion: cdx.SpecVersion1_6,
1299+
JSONSchema: "http://cyclonedx.org/schema/bom-1.6.schema.json",
13001300
SerialNumber: "urn:uuid:3ff14136-e09f-4df9-80ea-000000000007",
13011301
Version: 1,
13021302
Metadata: &cdx.Metadata{
@@ -1518,10 +1518,10 @@ func TestMarshaler_MarshalReport(t *testing.T) {
15181518
BOM: testSBOM,
15191519
},
15201520
want: &cdx.BOM{
1521-
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
1521+
XMLNS: "http://cyclonedx.org/schema/bom/1.6",
15221522
BOMFormat: "CycloneDX",
1523-
SpecVersion: cdx.SpecVersion1_5,
1524-
JSONSchema: "http://cyclonedx.org/schema/bom-1.5.schema.json",
1523+
SpecVersion: cdx.SpecVersion1_6,
1524+
JSONSchema: "http://cyclonedx.org/schema/bom-1.6.schema.json",
15251525
SerialNumber: "urn:uuid:3ff14136-e09f-4df9-80ea-000000000002",
15261526
Version: 1,
15271527
Metadata: &cdx.Metadata{
@@ -1770,10 +1770,10 @@ func TestMarshaler_MarshalReport(t *testing.T) {
17701770
},
17711771
},
17721772
want: &cdx.BOM{
1773-
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
1773+
XMLNS: "http://cyclonedx.org/schema/bom/1.6",
17741774
BOMFormat: "CycloneDX",
1775-
SpecVersion: cdx.SpecVersion1_5,
1776-
JSONSchema: "http://cyclonedx.org/schema/bom-1.5.schema.json",
1775+
SpecVersion: cdx.SpecVersion1_6,
1776+
JSONSchema: "http://cyclonedx.org/schema/bom-1.6.schema.json",
17771777
SerialNumber: "urn:uuid:3ff14136-e09f-4df9-80ea-000000000004",
17781778
Version: 1,
17791779
Metadata: &cdx.Metadata{
@@ -1956,10 +1956,10 @@ func TestMarshaler_MarshalReport(t *testing.T) {
19561956
},
19571957
},
19581958
want: &cdx.BOM{
1959-
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
1959+
XMLNS: "http://cyclonedx.org/schema/bom/1.6",
19601960
BOMFormat: "CycloneDX",
1961-
SpecVersion: cdx.SpecVersion1_5,
1962-
JSONSchema: "http://cyclonedx.org/schema/bom-1.5.schema.json",
1961+
SpecVersion: cdx.SpecVersion1_6,
1962+
JSONSchema: "http://cyclonedx.org/schema/bom-1.6.schema.json",
19631963
SerialNumber: "urn:uuid:3ff14136-e09f-4df9-80ea-000000000003",
19641964
Version: 1,
19651965
Metadata: &cdx.Metadata{
@@ -2044,10 +2044,10 @@ func TestMarshaler_MarshalReport(t *testing.T) {
20442044
Results: types.Results{},
20452045
},
20462046
want: &cdx.BOM{
2047-
XMLNS: "http://cyclonedx.org/schema/bom/1.5",
2047+
XMLNS: "http://cyclonedx.org/schema/bom/1.6",
20482048
BOMFormat: "CycloneDX",
2049-
SpecVersion: cdx.SpecVersion1_5,
2050-
JSONSchema: "http://cyclonedx.org/schema/bom-1.5.schema.json",
2049+
SpecVersion: cdx.SpecVersion1_6,
2050+
JSONSchema: "http://cyclonedx.org/schema/bom-1.6.schema.json",
20512051
SerialNumber: "urn:uuid:3ff14136-e09f-4df9-80ea-000000000002",
20522052
Version: 1,
20532053
Metadata: &cdx.Metadata{

‎pkg/sbom/cyclonedx/testdata/happy/bom.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"bomFormat": "CycloneDX",
3-
"specVersion": "1.5",
3+
"specVersion": "1.6",
44
"serialNumber": "urn:uuid:c986ba94-e37d-49c8-9e30-96daccd0415b",
55
"version": 1,
66
"metadata": {

0 commit comments

Comments
 (0)
Please sign in to comment.