Skip to content

Commit d298415

Browse files
DmitriyLewenDmitriyLewen
authored
feat(cli): add mage command to update golden integration test files (#4380)
1 parent 1a56295 commit d298415

20 files changed

+120
-79
lines changed

‎integration/client_server_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,9 @@ func TestClientServerWithFormat(t *testing.T) {
402402
}
403403

404404
func TestClientServerWithCycloneDX(t *testing.T) {
405+
if *update {
406+
t.Skipf("This test doesn't use golden files")
407+
}
405408
tests := []struct {
406409
name string
407410
args csArgs

‎integration/docker_engine_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ import (
1818
)
1919

2020
func TestDockerEngine(t *testing.T) {
21+
if *update {
22+
t.Skipf("This test doesn't update golden files")
23+
}
2124
tests := []struct {
2225
name string
2326
imageTag string

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"SchemaVersion": 2,
3-
"ArtifactName": "localhost:63577/alpine:3.10",
3+
"ArtifactName": "localhost:32839/alpine:3.10",
44
"ArtifactType": "container_image",
55
"Metadata": {
66
"OS": {
@@ -13,10 +13,10 @@
1313
"sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0"
1414
],
1515
"RepoTags": [
16-
"localhost:63577/alpine:3.10"
16+
"localhost:32839/alpine:3.10"
1717
],
1818
"RepoDigests": [
19-
"localhost:63577/alpine@sha256:d9b1a0d4fab413443a22e550cb8720de487295cebca3f9b2fcbf8882192a9bf9"
19+
"localhost:32839/alpine@sha256:b1c5a500182b21d0bfa5a584a8526b56d8be316f89e87d951be04abed2446e60"
2020
],
2121
"ImageConfig": {
2222
"architecture": "amd64",
@@ -55,7 +55,7 @@
5555
},
5656
"Results": [
5757
{
58-
"Target": "localhost:63577/alpine:3.10 (alpine 3.10.2)",
58+
"Target": "localhost:32839/alpine:3.10 (alpine 3.10.2)",
5959
"Class": "os-pkgs",
6060
"Type": "alpine",
6161
"Vulnerabilities": [
@@ -66,7 +66,7 @@
6666
"InstalledVersion": "1.1.1c-r0",
6767
"FixedVersion": "1.1.1d-r0",
6868
"Layer": {
69-
"Digest": "sha256:3489774ebf88fb1f0b08e0abb45826a3cbd9d0eb6458d5fc54729197feddffb9",
69+
"Digest": "sha256:9d48c3bd43c520dc2784e868a780e976b207cbf493eaff8c6596eb871cbd9609",
7070
"DiffID": "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0"
7171
},
7272
"SeveritySource": "nvd",
@@ -126,7 +126,7 @@
126126
"InstalledVersion": "1.1.1c-r0",
127127
"FixedVersion": "1.1.1d-r2",
128128
"Layer": {
129-
"Digest": "sha256:3489774ebf88fb1f0b08e0abb45826a3cbd9d0eb6458d5fc54729197feddffb9",
129+
"Digest": "sha256:9d48c3bd43c520dc2784e868a780e976b207cbf493eaff8c6596eb871cbd9609",
130130
"DiffID": "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0"
131131
},
132132
"SeveritySource": "nvd",
@@ -196,7 +196,7 @@
196196
"InstalledVersion": "1.1.1c-r0",
197197
"FixedVersion": "1.1.1d-r0",
198198
"Layer": {
199-
"Digest": "sha256:3489774ebf88fb1f0b08e0abb45826a3cbd9d0eb6458d5fc54729197feddffb9",
199+
"Digest": "sha256:9d48c3bd43c520dc2784e868a780e976b207cbf493eaff8c6596eb871cbd9609",
200200
"DiffID": "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0"
201201
},
202202
"SeveritySource": "nvd",
@@ -256,7 +256,7 @@
256256
"InstalledVersion": "1.1.1c-r0",
257257
"FixedVersion": "1.1.1d-r2",
258258
"Layer": {
259-
"Digest": "sha256:3489774ebf88fb1f0b08e0abb45826a3cbd9d0eb6458d5fc54729197feddffb9",
259+
"Digest": "sha256:9d48c3bd43c520dc2784e868a780e976b207cbf493eaff8c6596eb871cbd9609",
260260
"DiffID": "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0"
261261
},
262262
"SeveritySource": "nvd",
@@ -322,4 +322,4 @@
322322
]
323323
}
324324
]
325-
}
325+
}

‎integration/testdata/busybox-with-lockfile.json.golden

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
"Vulnerabilities": [
5555
{
5656
"VulnerabilityID": "CVE-2019-15542",
57-
"PkgName": "ammonia",
5857
"PkgID": "[email protected]",
58+
"PkgName": "ammonia",
5959
"InstalledVersion": "1.9.0",
6060
"FixedVersion": "\u003e= 2.1.0",
6161
"Layer": {
@@ -92,8 +92,8 @@
9292
},
9393
{
9494
"VulnerabilityID": "CVE-2021-38193",
95-
"PkgName": "ammonia",
9695
"PkgID": "[email protected]",
96+
"PkgName": "ammonia",
9797
"InstalledVersion": "1.9.0",
9898
"FixedVersion": "\u003e= 3.1.0, \u003e= 2.1.3, \u003c 3.0.0",
9999
"Layer": {

‎integration/testdata/centos-7-cyclonedx.json.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"specVersion": "1.4",
44
"version": 1,
55
"metadata": {
6-
"timestamp": "2022-08-14T12:39:11+00:00",
6+
"timestamp": "2023-05-15T09:50:02+00:00",
77
"tools": [
88
{
99
"vendor": "aquasecurity",

‎integration/testdata/cocoapods.json.golden

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,38 @@
2727
"DependsOn": [
2828
"AppCenter/Analytics/4.2.0",
2929
"AppCenter/Crashes/4.2.0"
30-
]
30+
],
31+
"Layer": {}
3132
},
3233
{
3334
"ID": "AppCenter/Analytics/4.2.0",
3435
"Name": "AppCenter/Analytics",
3536
"Version": "4.2.0",
3637
"DependsOn": [
3738
"AppCenter/Core/4.2.0"
38-
]
39+
],
40+
"Layer": {}
3941
},
4042
{
4143
"ID": "AppCenter/Core/4.2.0",
4244
"Name": "AppCenter/Core",
43-
"Version": "4.2.0"
45+
"Version": "4.2.0",
46+
"Layer": {}
4447
},
4548
{
4649
"ID": "AppCenter/Crashes/4.2.0",
4750
"Name": "AppCenter/Crashes",
4851
"Version": "4.2.0",
4952
"DependsOn": [
5053
"AppCenter/Core/4.2.0"
51-
]
54+
],
55+
"Layer": {}
5256
},
5357
{
5458
"ID": "KeychainAccess/4.2.1",
5559
"Name": "KeychainAccess",
56-
"Version": "4.2.1"
60+
"Version": "4.2.1",
61+
"Layer": {}
5762
}
5863
]
5964
}

‎integration/testdata/composer.lock.json.golden

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎integration/testdata/conan.json.golden

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
"SchemaVersion": 2,
33
"ArtifactName": "testdata/fixtures/fs/conan",
44
"ArtifactType": "filesystem",
5+
"Metadata": {
6+
"ImageConfig": {
7+
"architecture": "",
8+
"created": "0001-01-01T00:00:00Z",
9+
"os": "",
10+
"rootfs": {
11+
"type": "",
12+
"diff_ids": null
13+
},
14+
"config": {}
15+
}
16+
},
517
"Results": [
618
{
719
"Target": "conan.lock",
@@ -12,19 +24,22 @@
1224
"ID": "bzip2/1.0.8",
1325
"Name": "bzip2",
1426
"Version": "1.0.8",
15-
"Indirect": true
27+
"Indirect": true,
28+
"Layer": {}
1629
},
1730
{
1831
"ID": "expat/2.4.8",
1932
"Name": "expat",
2033
"Version": "2.4.8",
21-
"Indirect": true
34+
"Indirect": true,
35+
"Layer": {}
2236
},
2337
{
2438
"ID": "openssl/1.1.1q",
2539
"Name": "openssl",
2640
"Version": "1.1.1q",
27-
"Indirect": true
41+
"Indirect": true,
42+
"Layer": {}
2843
},
2944
{
3045
"ID": "pcre/8.43",
@@ -34,7 +49,8 @@
3449
"DependsOn": [
3550
"bzip2/1.0.8",
3651
"zlib/1.2.12"
37-
]
52+
],
53+
"Layer": {}
3854
},
3955
{
4056
"ID": "poco/1.9.4",
@@ -46,19 +62,22 @@
4662
"expat/2.4.8",
4763
"sqlite3/3.39.2",
4864
"openssl/1.1.1q"
49-
]
65+
],
66+
"Layer": {}
5067
},
5168
{
5269
"ID": "sqlite3/3.39.2",
5370
"Name": "sqlite3",
5471
"Version": "3.39.2",
55-
"Indirect": true
72+
"Indirect": true,
73+
"Layer": {}
5674
},
5775
{
5876
"ID": "zlib/1.2.12",
5977
"Name": "zlib",
6078
"Version": "1.2.12",
61-
"Indirect": true
79+
"Indirect": true,
80+
"Layer": {}
6281
}
6382
],
6483
"Vulnerabilities": [
@@ -68,6 +87,7 @@
6887
"PkgName": "pcre",
6988
"InstalledVersion": "8.43",
7089
"FixedVersion": "8.45",
90+
"Layer": {},
7191
"Severity": "UNKNOWN"
7292
}
7393
]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"bomFormat": "CycloneDX",
33
"specVersion": "1.4",
4-
"serialNumber": "urn:uuid:4dd4cf4a-d4de-4ea0-b75f-ad617f31b5a9",
4+
"serialNumber": "urn:uuid:c283a9bb-93f1-49fb-9605-110b5f005a74",
55
"version": 1,
66
"metadata": {
7-
"timestamp": "2023-01-08T23:57:37+00:00",
7+
"timestamp": "2023-05-15T09:49:59+00:00",
88
"tools": [
99
{
1010
"vendor": "aquasecurity",
@@ -13,7 +13,7 @@
1313
}
1414
],
1515
"component": {
16-
"bom-ref": "582a7c6f-b30e-4b65-a911-f3f5034aa003",
16+
"bom-ref": "6497c0eb-7ca3-401e-b1f6-29234b2ec32c",
1717
"type": "application",
1818
"name": "testdata/fixtures/fs/conda",
1919
"properties": [
@@ -72,12 +72,12 @@
7272
],
7373
"dependencies": [
7474
{
75-
"ref": "582a7c6f-b30e-4b65-a911-f3f5034aa003",
75+
"ref": "6497c0eb-7ca3-401e-b1f6-29234b2ec32c",
7676
"dependsOn": [
7777
"pkg:conda/[email protected]?file_path=miniconda3%2Fenvs%2Ftestenv%2Fconda-meta%2Fopenssl-1.1.1q-h7f8727e_0.json",
7878
"pkg:conda/[email protected]?file_path=miniconda3%2Fenvs%2Ftestenv%2Fconda-meta%2Fpip-22.2.2-py38h06a4308_0.json"
7979
]
8080
}
8181
],
8282
"vulnerabilities": []
83-
}
83+
}

0 commit comments

Comments
 (0)