From b95096b521a745684a1fda9cdddade81c338549d Mon Sep 17 00:00:00 2001 From: Morgan Fainberg Date: Wed, 21 Feb 2024 06:48:25 -0800 Subject: [PATCH] Update manifest.go Address PR comments: * Do not return bool, err on isValidURL * Do not wrap error for the sake of wrapping the error. Co-authored-by: Philip Potter --- cmd/multifile/manifest.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/multifile/manifest.go b/cmd/multifile/manifest.go index c00ed8b..6e9d026 100644 --- a/cmd/multifile/manifest.go +++ b/cmd/multifile/manifest.go @@ -104,8 +104,8 @@ func parseManifest(file io.Reader) (pget.Manifest, error) { return nil, err } } - if valid, err := validURL(urlString); !valid { - return nil, fmt.Errorf("error parsing manifest invalid URL: %s: %w", urlString, err) + if err := validURL(urlString); err != nil { + return nil, err } manifest = manifest.AddEntry(urlString, dest) @@ -114,7 +114,7 @@ func parseManifest(file io.Reader) (pget.Manifest, error) { return manifest, nil } -func validURL(s string) (bool, error) { +func validURL(s string) error { _, err := netUrl.Parse(s) - return err == nil, err + return err }