Skip to content

Commit 859a933

Browse files
eran132claude
andauthored
fix: correct format verbs in diagnostic messages (aquasecurity#10805)
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 47b7ba4 commit 859a933

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

pkg/sbom/spdx/marshal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ func (m *Marshaler) spdxChecksums(digests []digest.Digest) []common.Checksum {
523523
case digest.MD5:
524524
alg = spdx.MD5
525525
default:
526-
m.logger.Warn("Unsupported hash algorithm", log.String("algorithm", string(alg)))
526+
m.logger.Warn("Unsupported hash algorithm", log.String("algorithm", d.Algorithm().String()))
527527
continue
528528
}
529529
checksums = append(checksums, spdx.Checksum{

pkg/vex/sbomref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func retrieveExternalVEXDocument(ctx context.Context, vexUrl *url.URL, report *t
8484
defer res.Body.Close()
8585

8686
if res.StatusCode != http.StatusOK {
87-
return nil, xerrors.Errorf("did not receive 2xx status code: %w", res.StatusCode)
87+
return nil, xerrors.Errorf("unexpected status code %d from %s", res.StatusCode, vexUrl.Redacted())
8888
}
8989

9090
val, err := io.ReadAll(res.Body)

pkg/vex/sbomref_test.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,37 +82,35 @@ func TestRetrieveExternalVEXDocuments(t *testing.T) {
8282
name string
8383
input *types.Report
8484
wantVEXes int
85-
wantErr bool
85+
wantErr string
8686
}{
8787
{
8888
name: "external vex retrieval",
8989
input: setupTestReport(s, vexExternalRef),
9090
wantVEXes: 1,
91-
wantErr: false,
9291
},
9392
{
9493
name: "incompatible external vex",
9594
input: setupTestReport(s, vexUnknown),
96-
wantErr: true,
95+
wantErr: "unable to load VEX from external reference",
9796
},
9897
{
9998
name: "vex not found",
10099
input: setupTestReport(s, vexNotFound),
101-
wantErr: true,
100+
wantErr: "unexpected status code 404",
102101
},
103102
{
104103
name: "no external reference",
105104
input: setupEmptyTestReport(),
106105
wantVEXes: 0,
107-
wantErr: false,
108106
},
109107
}
110108

111109
for _, tt := range tests {
112110
t.Run(tt.name, func(t *testing.T) {
113111
got, err := vex.NewSBOMReferenceSet(tt.input)
114-
if tt.wantErr {
115-
require.Error(t, err)
112+
if tt.wantErr != "" {
113+
require.ErrorContains(t, err, tt.wantErr)
116114
return
117115
}
118116
require.NoError(t, err)

0 commit comments

Comments
 (0)