这是indexloc提供的服务，不要输入任何密码
Skip to content

compare only major and minor versions for cli-server (fix #331) #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 30, 2018
Merged

compare only major and minor versions for cli-server (fix #331) #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0affe1
compare only major and minor versions for cli-server (fix #331)
shahidhk Aug 30, 2018
f7f65fb
Merge branch 'master' into version-check
arvi3411301 Aug 30, 2018
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
12 changes: 1 addition & 11 deletions cli/version/compatibility.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
package version

import (
"fmt"

"github.com/Masterminds/semver"
)

const (
untaggedBuild = "for untagged builds, server and cli versions should match"
taggedBuild = "cli version (major.minor) should be equal or ahead of server version, please update cli"
Expand Down Expand Up @@ -43,11 +37,7 @@ func (v *Version) CheckCLIServerCompatibility() (compatible bool, reason string)
if v.Server != "" && v.ServerSemver != nil {
// cli is also tagged build
if v.CLI != "" && v.CLISemver != nil {
c, err := semver.NewConstraint(fmt.Sprintf(">=%s", v.ServerSemver.String()))
if err != nil {
return false, "parsing server as constraint failed"
}
if c.Check(v.CLISemver) {
if (v.CLISemver.Major() >= v.ServerSemver.Major()) && (v.CLISemver.Minor() >= v.ServerSemver.Minor()) {
return true, taggedBuild
}
return false, taggedBuild
Expand Down
4 changes: 4 additions & 0 deletions cli/version/compatibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ func TestCheckCLIServerCompatibility(t *testing.T) {
{"no cli and server version", "", "", false, noCLIVersion},
{"tagged version exact match", "v1.2.4", "v1.2.4", true, taggedBuild},
{"tagged version major.minor match", "v1.3.4", "v1.3.1", true, taggedBuild},
{"tagged version with server pre-release, major.minor match", "v1.3.4", "v1.3.4-alpha13", true, taggedBuild},
{"tagged version with cli pre-release major.minor match", "v1.3.4-alpha13", "v1.3.4", true, taggedBuild},
{"tagged version with cli and server pre-release major.minor match", "v1.3.4-alpha13", "v1.3.4-alpha13", true, taggedBuild},
{"tagged version with cli and server pre-release major.minor match", "v1.3.1-alpha13", "v1.3.4-alpha16", true, taggedBuild},
{"tagged version major.minor mismatch, server ahead", "v2.1.8", "v7.2.9", false, taggedBuild},
{"tagged version major.minor mismatch, server behind, different major", "v2.1.8", "v1.1.1", true, taggedBuild},
{"tagged version major.minor mismatch, server behind, same major", "v2.1.8", "v2.0.1", true, taggedBuild},
Expand Down