Skip to content

NPM Version Validation #498

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 3 commits into from
Feb 7, 2020
Merged

NPM Version Validation #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
387011c
The value of minor was incorrectly assumed to be e.g. 14.8-hotfix.201…
jaer-tsun Feb 6, 2020
10386cf
adding Jonathan Chauncey's test
jaer-tsun Feb 6, 2020
15318cc
addressing Robbie's comments
jaer-tsun Feb 6, 2020
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
16 changes: 14 additions & 2 deletions npm/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"hash/fnv"
"os"
"regexp"
"strings"
"sort"

Expand All @@ -16,6 +17,9 @@ import (
// IsNewNwPolicyVerFlag indicates if the current kubernetes version is newer than 1.11 or not
var IsNewNwPolicyVerFlag = false

// regex to get minor version
var re = regexp.MustCompile("[0-9]+")

// Exists reports whether the named file or directory exists.
func Exists(filePath string) bool {
if _, err := os.Stat(filePath); err == nil {
Expand Down Expand Up @@ -98,11 +102,19 @@ func GetHashedName(name string) string {
// returns -1, 0, 1 if firstVer smaller, equals, bigger than secondVer respectively.
// returns -2 for error.
func CompareK8sVer(firstVer *version.Info, secondVer *version.Info) int {
v1, err := semver.NewVersion(firstVer.Major+firstVer.Minor)
v1Minor := re.FindAllString(firstVer.Minor, -1)
if len(v1Minor) < 1 {
return -2
}
v1, err := semver.NewVersion(firstVer.Major+"."+v1Minor[0])
if err != nil {
return -2
}
v2, err := semver.NewVersion(secondVer.Major+secondVer.Minor)
v2Minor := re.FindAllString(secondVer.Minor, -1)
if len(v2Minor) < 1 {
return -2
}
v2, err := semver.NewVersion(secondVer.Major+"."+v2Minor[0])
if err != nil {
return -2
}
Expand Down
42 changes: 42 additions & 0 deletions npm/util/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,48 @@ func TestCompareK8sVer(t *testing.T) {
if res := CompareK8sVer(firstVer, secondVer); res != 1 {
t.Errorf("TestCompareK8sVer failed @ firstVer > secondVer w/ hotfix tag/pre-release")
}

firstVer = &version.Info{
Major: "1",
Minor: "14+",
}

secondVer = &version.Info{
Major: "1",
Minor: "11",
}

if res := CompareK8sVer(firstVer, secondVer); res != 1 {
t.Errorf("TestCompareK8sVer failed @ firstVer > secondVer w/ minor+ release")
}

firstVer = &version.Info{
Major: "2",
Minor: "1",
}

secondVer = &version.Info{
Major: "1",
Minor: "11",
}

if res := CompareK8sVer(firstVer, secondVer); res != 1 {
t.Errorf("TestCompareK8sVer failed @ firstVer > secondVer w/ major version upgrade")
}

firstVer = &version.Info{
Major: "1",
Minor: "11",
}

secondVer = &version.Info{
Major: "2",
Minor: "1",
}

if res := CompareK8sVer(firstVer, secondVer); res != -1 {
t.Errorf("TestCompareK8sVer failed @ firstVer < secondVer w/ major version upgrade")
}
}

func TestIsNewNwPolicyVer(t *testing.T) {
Expand Down