Skip to content

Commit fe3e446

Browse files
committed
chore: add platfom context in generate / scan sbom tests.
Signed-off-by: pohanhuangtw <pohan.huang@suse.com>
1 parent e6d143d commit fe3e446

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

internal/handlers/generate_sbom_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,33 +49,33 @@ func generateSBOM(t *testing.T, platform, sha256, expectedSPDXJSON string) {
4949
Build()
5050

5151
spdxData, err := os.ReadFile(expectedSPDXJSON)
52-
require.NoError(t, err)
52+
require.NoError(t, err, "failed to read expected SPDX JSON file %s", expectedSPDXJSON)
5353

5454
expectedSPDX := &spdx.Document{}
5555
err = json.Unmarshal(spdxData, expectedSPDX)
56-
require.NoError(t, err)
56+
require.NoError(t, err, "failed to unmarshal expected SPDX JSON file %s", expectedSPDXJSON)
5757

5858
handler := NewGenerateSBOMHandler(k8sClient, scheme, "/tmp", slog.Default())
5959

6060
err = handler.Handle(&messaging.GenerateSBOM{
6161
ImageName: image.Name,
6262
ImageNamespace: image.Namespace,
6363
})
64-
require.NoError(t, err)
64+
require.NoError(t, err, "failed to generate SBOM, with platform %s", platform)
6565

6666
sbom := &storagev1alpha1.SBOM{}
6767
err = k8sClient.Get(t.Context(), types.NamespacedName{
6868
Name: image.Name,
6969
Namespace: image.Namespace,
7070
}, sbom)
71-
require.NoError(t, err)
71+
require.NoError(t, err, "failed to get SBOM, with platform %s", platform)
7272

7373
assert.Equal(t, image.Spec.ImageMetadata, sbom.Spec.ImageMetadata)
7474
assert.Equal(t, image.UID, sbom.GetOwnerReferences()[0].UID)
7575

7676
generatedSPDX := &spdx.Document{}
7777
err = json.Unmarshal(sbom.Spec.SPDX.Raw, generatedSPDX)
78-
require.NoError(t, err)
78+
require.NoError(t, err, "failed to unmarshal generated SPDX, with platform %s", platform)
7979

8080
// Filter out "DocumentNamespace" and any field named "AnnotationDate" or "Created" regardless of nesting,
8181
// since they contain timestamps and are not deterministic.

internal/handlers/scan_sbom_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
func scanSBOM(t *testing.T, platform, sourceSBOMJSON, expectedReportJSON string) {
2525
spdxData, err := os.ReadFile(sourceSBOMJSON)
26-
require.NoError(t, err)
26+
require.NoError(t, err, "failed to read source SBOM file %s", sourceSBOMJSON)
2727

2828
sbom := &storagev1alpha1.SBOM{
2929
ObjectMeta: metav1.ObjectMeta{
@@ -44,33 +44,33 @@ func scanSBOM(t *testing.T, platform, sourceSBOMJSON, expectedReportJSON string)
4444
Build()
4545

4646
reportData, err := os.ReadFile(expectedReportJSON)
47-
require.NoError(t, err)
47+
require.NoError(t, err, "failed to read expected report file %s", expectedReportJSON)
4848

4949
expectedReport := &sarif.Report{}
5050
err = json.Unmarshal(reportData, expectedReport)
51-
require.NoError(t, err)
51+
require.NoError(t, err, "failed to unmarshal expected report file %s", expectedReportJSON)
5252

5353
handler := NewScanSBOMHandler(k8sClient, scheme, "/tmp", slog.Default())
5454

5555
err = handler.Handle(&messaging.ScanSBOM{
5656
SBOMName: sbom.Name,
5757
SBOMNamespace: sbom.Namespace,
5858
})
59-
require.NoError(t, err)
59+
require.NoError(t, err, "failed to scan SBOM, with platform %s", platform)
6060

6161
vulnerabilityReport := &storagev1alpha1.VulnerabilityReport{}
6262
err = k8sClient.Get(t.Context(), client.ObjectKey{
6363
Name: sbom.Name,
6464
Namespace: sbom.Namespace,
6565
}, vulnerabilityReport)
66-
require.NoError(t, err)
66+
require.NoError(t, err, "failed to get vulnerability report, with platform %s", platform)
6767

6868
assert.Equal(t, sbom.GetImageMetadata(), vulnerabilityReport.GetImageMetadata())
6969
assert.Equal(t, sbom.UID, vulnerabilityReport.GetOwnerReferences()[0].UID)
7070

7171
report := &sarif.Report{}
7272
err = json.Unmarshal(vulnerabilityReport.Spec.SARIF.Raw, report)
73-
require.NoError(t, err)
73+
require.NoError(t, err, "failed to unmarshal vulnerability report, with platform %s", platform)
7474

7575
// Filter out fields containing the file path from the comparison
7676
filter := cmp.FilterPath(func(path cmp.Path) bool {

0 commit comments

Comments
 (0)