Skip to content

Commit

Permalink
version: changed to package semver github.com/hashicorp/go-version to…
Browse files Browse the repository at this point in the history
… allow versions starting with 'v' as vgo requires
  • Loading branch information
jllopis committed Jun 19, 2018
1 parent 9e66976 commit 2d13633
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion cmd/sample/impl/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func (st *StatusService) GetServerTime(ctx context.Context, empty *common.EmptyM
return &status.ServerTimeMessage{Value: time.Now().UTC().UnixNano()}, nil
}

// GetVersion returns the current API Version. It is a direct mapping from github.com/coreos/go-semver/semver.Version
// GetVersion returns the current API Version. It is a direct mapping from go-version "github.com/hashicorp/go-version.Version
func (st *StatusService) GetVersion(ctx context.Context, empty *common.EmptyMessage) (*common.Version, error) {
return &common.Version{
Version: version.Version,
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package version
import (
"fmt"

"github.com/coreos/go-semver/semver"
semver "github.com/hashicorp/go-version"
)

var (
Expand Down
29 changes: 17 additions & 12 deletions version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version
import (
"testing"

"github.com/coreos/go-semver/semver"
semver "github.com/hashicorp/go-version"
)

type testValues struct {
Expand All @@ -12,7 +12,7 @@ type testValues struct {
Major int64
Minor int64
Patch int64
PreRelease semver.PreRelease
PreRelease string
Metadata string
GitCommit string
}
Expand All @@ -24,6 +24,9 @@ var (
{"0.0.1", "0.0.1", 0, 0, 1, "", "", ""},
{"0.0.1-dirty", "0.0.1-dirty", 0, 0, 1, "dirty", "", ""},
{"0.0.1-212-gbf8a411-dirty", "0.0.1-212-gbf8a411-dirty", 0, 0, 1, "212-gbf8a411-dirty", "", "f8a411"},
{"0.0.1-212-gbf8a411", "v0.0.1-212-gbf8a411", 0, 0, 1, "212-gbf8a411", "", "f8a411"},
{"v0.0.1", "0.0.1", 0, 0, 1, "", "", ""},
{"v0.0.1-dirty", "v0.0.1-dirty", 0, 0, 1, "dirty", "", ""},
}
)

Expand All @@ -34,29 +37,31 @@ func TestSemVer(t *testing.T) {
if err != nil {
t.Error("error creating semver.NewVersion", err)
}
if semver.Major != test.Major {
semverSegments := semver.Segments64()
// testSegments := semver.Segments64()
if semverSegments[0] != test.Major {
t.Error("For", test.value,
"Got", semver.Major,
"Got", semverSegments[0],
"Expected", test.Major)
}
if semver.Minor != test.Minor {
if semverSegments[1] != test.Minor {
t.Error("For", test.value,
"Got", semver.Minor,
"Got", semverSegments[1],
"Expected", test.Minor)
}
if semver.Patch != test.Patch {
if semverSegments[2] != test.Patch {
t.Error("For", test.value,
"Got", semver.Patch,
"Got", semverSegments[2],
"Expected", test.Patch)
}
if semver.PreRelease != test.PreRelease {
if semver.Prerelease() != test.PreRelease {
t.Error("For", test.value,
"Got", semver.PreRelease,
"Got", semver.Prerelease(),
"Expected", test.PreRelease)
}
if semver.Metadata != test.Metadata {
if semver.Metadata() != test.Metadata {
t.Error("For", test.value,
"Got", semver.Metadata,
"Got", semver.Metadata(),
"Expected", test.Metadata)
}
}
Expand Down

0 comments on commit 2d13633

Please sign in to comment.