Skip to content

fix: Standarize/disambiguate return from Parse #77

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Standarize/disambiguate return from Parse #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions digest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ var (
// be returned if the format is invalid.
func Parse(s string) (Digest, error) {
d := Digest(s)
return d, d.Validate()
if err := d.Validate(); err != nil {
return "", err
}
return d, nil
}

// FromReader consumes the content of rd until io.EOF, returning canonical digest.
Expand Down Expand Up @@ -137,7 +140,7 @@ func (d Digest) Encoded() string {
return string(d[d.sepIndex()+1:])
}

// Hex is deprecated. Please use Digest.Encoded.
// Deprecated: Hex has been deprecated in favor of Digest.Encoded
func (d Digest) Hex() string {
return d.Encoded()
}
Expand Down
10 changes: 6 additions & 4 deletions digestset/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,17 @@ func (dst *Set) Lookup(d string) (digest.Digest, error) {
searchFunc func(int) bool
alg digest.Algorithm
hex string
dgst digest.Digest
)
dgst, err := digest.Parse(d)
if err == digest.ErrDigestInvalidFormat {

dgst = digest.Digest(d)
if err := dgst.Validate(); err == digest.ErrDigestInvalidFormat {
hex = d
searchFunc = func(i int) bool {
return dst.entries[i].val >= d
}
} else {
hex = dgst.Hex()
} else { // Note: `err` is not necessarily `nil` here
hex = dgst.Encoded()
alg = dgst.Algorithm()
searchFunc = func(i int) bool {
if dst.entries[i].val == hex {
Expand Down