Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: #642: don't use go-cmp for outputting diff #737

Merged
merged 2 commits into from
Jan 17, 2024
Merged

fix: #642: don't use go-cmp for outputting diff #737

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1a8a7e
fixes: #642: don't use go-cmp for outputting diff
ramonpetgrave64 Jan 17, 2024
c78838e
Merge branch 'main' into ramonpetgrave64-no-go-cmp-in-non-test
ramonpetgrave64 Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions verifiers/internal/gcb/provenance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

"golang.org/x/exp/slices"

"github.com/google/go-cmp/cmp"
intoto "github.com/in-toto/in-toto-golang/in_toto"
dsselib "github.com/secure-systems-lab/go-securesystemslib/dsse"

Expand Down Expand Up @@ -173,8 +172,8 @@ func (p *Provenance) VerifyTextProvenance() error {
// they are both taken from a string representation.
// We do not use cmp.Equal() because it *can* panic and is intended for unit tests only.
if !reflect.DeepEqual(unverifiedTextIntotoStatement, p.verifiedStatement) {
return fmt.Errorf("%w: diff '%s'", serrors.ErrorMismatchIntoto,
cmp.Diff(unverifiedTextIntotoStatement, p.verifiedStatement))
return fmt.Errorf("%w: \nunverified: %v, \nverified: %v", serrors.ErrorMismatchIntoto,
unverifiedTextIntotoStatement, p.verifiedStatement)
}

return nil
Expand Down
Loading