Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions version.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ func getSemverRegexp() *regexp.Regexp {
// The raw regular expression string used for testing the validity
// of a version.
const (
VersionRegexpRaw string = `v?([0-9]+(\.[0-9]+)*?)` +
VersionRegexpRaw string = `(?:\w+\-)*v?([0-9]+(\.[0-9]+)*?)` +
`(-([0-9]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)|(-?([A-Za-z\-~]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)))?` +
`(\+([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` +
`?`

// SemverRegexpRaw requires a separator between version and prerelease
SemverRegexpRaw string = `v?([0-9]+(\.[0-9]+)*?)` +
SemverRegexpRaw string = `(?:\w+\-)*v?([0-9]+(\.[0-9]+)*?)` +
`(-([0-9]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)|(-([A-Za-z\-~]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)))?` +
`(\+([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` +
`?`
Expand Down
10 changes: 10 additions & 0 deletions version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ func TestNewVersion(t *testing.T) {
{"1.7rc2", false},
{"v1.7rc2", false},
{"1.0-", false},
{"controller-v0.40.2", false},
{"azure-cli-v1.4.2", false},
}

for _, tc := range cases {
Expand Down Expand Up @@ -80,6 +82,8 @@ func TestNewSemver(t *testing.T) {
{"1.7rc2", true},
{"v1.7rc2", true},
{"1.0-", true},
{"controller-v0.40.2", false},
{"azure-cli-v1.4.2", false},
}

for _, tc := range cases {
Expand Down Expand Up @@ -147,6 +151,12 @@ func TestVersionCompare(t *testing.T) {
{"1.7rc2", "1.7rc1", 1},
{"1.7rc2", "1.7", -1},
{"1.2.0", "1.2.0-X-1.2.0+metadata~dist", 1},
{"controller-v0.40.2", "controller-v0.40.3", -1},
{"0.40.4", "controller-v0.40.2", 1},
{"0.40.4", "controller-v0.40.4", 0},
{"azure-cli-v1.4.2", "azure-cli-v1.4.2", 0},
{"azure-cli-v1.4.1", "azure-cli-v1.4.2", -1},
{"1.4.3", "azure-cli-v1.4.2", 1},
}

for _, tc := range cases {
Expand Down