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

merged 2 commits into from
Jan 17, 2024

Commits on Jan 17, 2024

  1. fixes: slsa-framework#642: don't use go-cmp for outputting diff 

    Previously we used the go-cmp's Diff for displaying a human-friendly diff between two structs in an error message.

I had intended to do a json print of the structs and do a line-by-line diff. There is an internal library for calculating text diff, but I don't see any external functions that expose it:
https://pkg.go.dev/golang.org/x/tools/internal/diff

Instead, this we will simply display both structs in their own "actual" and "expected" sections. The user can use their other tools to find a human-friendly diff.

Signed-off-by: Ramon Petgrave <ramon.petgrave64@gmail.com>
    @ramonpetgrave64
    ramonpetgrave64 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e1a8a7e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into ramonpetgrave64-no-go-cmp-in-non-test

    @ramonpetgrave64
    ramonpetgrave64 authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    c78838e View commit details
    Browse the repository at this point in the history