Skip to content

Commit 4cb8eaf

Browse files
committed
Improve attachment verification failure messages
1 parent dd5615c commit 4cb8eaf

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

evidence/verify/verifiers/attachment_verifier.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ import (
1414
)
1515

1616
const (
17-
attachmentMetadataNotFoundReason = "attachment metadata not found in GraphQL response"
17+
attachmentMetadataNotFoundReason = "attachment not found in Evidence"
18+
attachmentArtifactNotFoundReason = "attachment not found in Artifactory"
19+
checksumMismatchReason = "checksum mismatch"
1820
attachmentMetadataUnavailableReason = "unable to get attachment metadata from GraphQL (query without attachments)"
1921
attachmentVerificationFailedReason = "attachment failed verification"
2022
)
@@ -76,7 +78,7 @@ func (v *attachmentVerifier) verify(evidence *model.SearchEvidenceEdge, result *
7678
fileInfo, fileInfoErr := v.artifactoryClient.FileInfo(actualAttachment.DownloadPath)
7779
if fileInfoErr != nil && isAttachmentNotFoundError(fileInfoErr) {
7880
verification.VerificationStatus = model.Failed
79-
verification.FailureReason = "file not found"
81+
verification.FailureReason = attachmentArtifactNotFoundReason
8082
verifications = append(verifications, verification)
8183
hasFailures = true
8284
continue
@@ -89,7 +91,7 @@ func (v *attachmentVerifier) verify(evidence *model.SearchEvidenceEdge, result *
8991
verification.ActualSha256 = fileInfo.Checksums.Sha256
9092
if verification.ActualSha256 != expected.Sha256 {
9193
verification.VerificationStatus = model.Failed
92-
verification.FailureReason = "checksum mismatch"
94+
verification.FailureReason = checksumMismatchReason
9395
hasFailures = true
9496
}
9597
verifications = append(verifications, verification)

evidence/verify/verifiers/attachment_verifier_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func TestAttachmentVerifier_Verify_FileNotFound404(t *testing.T) {
232232
assert.NoError(t, err)
233233
assert.Equal(t, model.Failed, result.VerificationResult.AttachmentsVerificationStatus)
234234
if assert.Len(t, result.AttachmentsVerification, 1) {
235-
assert.Equal(t, "file not found", result.AttachmentsVerification[0].FailureReason)
235+
assert.Equal(t, attachmentArtifactNotFoundReason, result.AttachmentsVerification[0].FailureReason)
236236
assert.Equal(t, model.Failed, result.AttachmentsVerification[0].VerificationStatus)
237237
}
238238
}

evidence/verify/verifiers/evidence_verifier_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func TestVerify_AttachmentsVerificationFailsWhenMetadataMissing(t *testing.T) {
375375
verification := (*result.EvidenceVerifications)[0]
376376
assert.Equal(t, model.Failed, verification.VerificationResult.AttachmentsVerificationStatus)
377377
assert.Equal(t, "attachment failed verification", verification.VerificationResult.FailureReason)
378-
assert.Equal(t, "attachment metadata not found in GraphQL response", verification.AttachmentsVerification[0].FailureReason)
378+
assert.Equal(t, attachmentMetadataNotFoundReason, verification.AttachmentsVerification[0].FailureReason)
379379
}
380380

381381
func TestVerify_AttachmentsVerificationReturnsErrorWhenMetadataUnavailableViaFallback(t *testing.T) {

0 commit comments

Comments
 (0)