From 45c148d98c0d901353fd92185e267d4771e70cd0 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 7 Apr 2023 16:14:10 -0400 Subject: [PATCH] tolerate Git refs prefix in version string --- zrokdir/client.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zrokdir/client.go b/zrokdir/client.go index 5676a0ea..2f41b47b 100644 --- a/zrokdir/client.go +++ b/zrokdir/client.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "net/url" "os" - "strings" + "regexp" ) func (zrd *ZrokDir) Client() (*rest_client_zrok.Zrok, error) { @@ -27,7 +27,10 @@ func (zrd *ZrokDir) Client() (*rest_client_zrok.Zrok, error) { if err != nil { return nil, errors.Wrapf(err, "error getting version from api endpoint '%v': %v", apiEndpoint, err) } - if !strings.HasPrefix(string(v.Payload), build.Series) { + // allow reported version string to be optionally prefixed with + // "refs/heads/" or "refs/tags/" + re := regexp.MustCompile(`^(refs/(heads|tags)/)?` + build.Series) + if ! re.MatchString(string(v.Payload)) { return nil, errors.Errorf("expected a '%v' version, received: '%v'", build.Series, v.Payload) }