extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-21 10:17:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #294 from openziti/tolerate-refs-prefix

Browse Source 
tolerate Git refs prefix in version string
This commit is contained in:
Michael Quigley 2023-04-10 15:18:27 -04:00 committed by GitHub
commit e1d26c1639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zrokdir/client.go
View File

@ -9,7 +9,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"net/url" "net/url"
"os" "os"
"strings" "regexp"
) )
func (zrd *ZrokDir) Client() (*rest_client_zrok.Zrok, error) { 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 { if err != nil {
return nil, errors.Wrapf(err, "error getting version from api endpoint '%v': %v", apiEndpoint, err) 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) return nil, errors.Errorf("expected a '%v' version, received: '%v'", build.Series, v.Payload)
} }