fix semver parse problem (Azure#18185)

Author: tadelesh

eng/tools/smoketests/cmd/models.go

@@ -1,7 +1,5 @@
 package cmd
 
-import "fmt"
-
 type ConfigFile struct {
 	Packages []Package
 }
@@ -17,22 +15,3 @@ type Module struct {
 	Version string
 	Replace string
 }
-
-type SemVer struct {
-	Major, Minor, Patch int
-}
-
-func (s SemVer) Newer(s2 SemVer) bool {
-	if s.Major > s2.Major {
-		return true
-	} else if s.Major == s2.Major && s.Minor > s2.Minor {
-		return true
-	} else if s.Major == s2.Major && s.Minor == s2.Minor && s.Patch > s2.Patch {
-		return true
-	}
-	return false
-}
-
-func (s SemVer) String() string {
-	return fmt.Sprintf("v%d.%d.%d", s.Major, s.Minor, s.Patch)
-}

eng/tools/smoketests/cmd/root.go

@@ -12,9 +12,9 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
-	"strconv"
 	"strings"
 
+	"github.com/Masterminds/semver"
 	"github.com/spf13/cobra"
 )
 
@@ -106,40 +106,35 @@ func getAllTags() []string {
 	return strings.Split(res, "\n")
 }
 
-// Convert a string to an integer and handle errors
-func toInt(a string) int {
-	r, err := strconv.Atoi(a)
-	handle(err)
-	return r
-}
-
 // Create a new SemVer type
-func NewSemVerFromTag(s string) SemVer {
+func NewSemVerFromTag(s string) (*semver.Version, error) {
 	path := strings.Split(s, "/")
 	versionStr := path[len(path)-1]
 	versionStr = strings.TrimLeft(versionStr, "v")
-	parts := strings.Split(versionStr, ".")
-	return SemVer{
-		Major: toInt(parts[0]),
-		Minor: toInt(parts[1]),
-		Patch: toInt(parts[2]),
-	}
+	return semver.NewVersion(versionStr)
 }
 
 // Find the most recent SemVer tag for a given package.
 func findLatestTag(p string, tags []string) (string, error) {
-	var v SemVer
+	var v *semver.Version
+	var err error
 	for i, tag := range tags {
 		if strings.Contains(tag, p) {
-			v = NewSemVerFromTag(tag)
+			v, err = NewSemVerFromTag(tag)
+			if err != nil {
+				return "", fmt.Errorf("could not parse version for tag %s", tag)
+			}
 			for strings.Contains(tags[i+1], p) {
-				newV := NewSemVerFromTag(tags[i+1])
-				if newV.Newer(v) {
+				newV, err := NewSemVerFromTag(tags[i+1])
+				if err != nil {
+					return "", fmt.Errorf("could not parse version for tag %s", tags[i+1])
+				}
+				if newV.GreaterThan(v) {
 					v = newV
 				}
 				i += 1
 			}
-			return v.String(), nil
+			return "v" + v.String(), nil
 		}
 	}
 	return "", fmt.Errorf("could not find a version for module %s", p)

eng/tools/smoketests/go.mod

@@ -5,6 +5,7 @@ go 1.17
 require github.com/spf13/cobra v1.4.0
 
 require (
+	github.com/Masterminds/semver v1.5.0
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 )

eng/tools/smoketests/go.sum

@@ -1,3 +1,5 @@
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=