Skip to content

Commit

Permalink
Merge pull request #313 from tusv/artifactory-regex-fix
Browse files Browse the repository at this point in the history
Make leading slash optional in regex when looking for versions
  • Loading branch information
MatrixCrawler committed Mar 31, 2024
2 parents ef1f0ce + 87442e4 commit 3cec6bf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/list_versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ func GetTFList(mirrorURL string, preRelease bool) ([]string, error) {
var semver string
if preRelease == true {
// Getting versions from body; should return match /X.X.X-@/ where X is a number,@ is a word character between a-z or A-Z
semver = `\/(\d+\.\d+\.\d+)(-[a-zA-z]+\d*)?/?"`
semver = `\/?(\d+\.\d+\.\d+)(-[a-zA-z]+\d*)?/?"`
} else if preRelease == false {
// Getting versions from body; should return match /X.X.X/ where X is a number
// without the ending '"' pre-release folders would be tried and break.
semver = `\/(\d+\.\d+\.\d+)\/?"`
semver = `\/?(\d+\.\d+\.\d+)\/?"`
}
r, _ := regexp.Compile(semver)
for i := range result {
Expand All @@ -58,7 +58,7 @@ func GetTFLatest(mirrorURL string) (string, error) {
return "", error
}
// Getting versions from body; should return match /X.X.X/ where X is a number
semver := `\/(\d+\.\d+\.\d+)\/?"`
semver := `\/?(\d+\.\d+\.\d+)\/?"`
r, _ := regexp.Compile(semver)
for i := range result {
if r.MatchString(result[i]) {
Expand All @@ -80,7 +80,7 @@ func GetTFLatestImplicit(mirrorURL string, preRelease bool, version string) (str
return "", error
}
// Getting versions from body; should return match /X.X.X-@/ where X is a number,@ is a word character between a-z or A-Z
semver := fmt.Sprintf(`\/(%s{1}\.\d+\-[a-zA-z]+\d*)\/?"`, version)
semver := fmt.Sprintf(`\/?(%s{1}\.\d+\-[a-zA-z]+\d*)\/?"`, version)
r, err := regexp.Compile(semver)
if err != nil {
return "", err
Expand Down

0 comments on commit 3cec6bf

Please sign in to comment.