ES-3193 : fixing semver 2 (#471)

* This is even worse spaghetti

* filter out prerelease

* prerelease doesn't make sense for orbs imo

circleci/docker.go

@@ -87,7 +87,7 @@ func findNewestDockerVersion(currentVersion string, parameters *map[string]*yaml
 		}
 
 	}
-
+	currentv, _ := version.NewVersion(versionParts["version"])
 	errorList := []string{}
 	versions := []*version.Version{}
 	for _, raw := range newTagsList {
@@ -97,6 +97,15 @@ func findNewestDockerVersion(currentVersion string, parameters *map[string]*yaml
 			continue
 		}
 
+		if len(v.Prerelease()) > 0 {
+			log.Debug().Msgf("version %s skipped, prerelease", v.Original())
+			continue
+		}
+		if trimmed := TrimSemver(currentv.Original(), v.Original()); len(trimmed) != len(v.Original()) {
+			log.Debug().Msgf("version %s skipped, must have the same ammount of segments as old version %s", v.Original(), currentv.Original())
+			continue
+		}
+
 		versions = append(versions, v)
 	}
 
@@ -108,12 +117,11 @@ func findNewestDockerVersion(currentVersion string, parameters *map[string]*yaml
 
 	newest := versions[len(versions)-1]
 
-	currentv, _ := version.NewVersion(versionParts["version"])
 	if currentv.GreaterThan(newest) {
 		cache[currentVersion] = currentTag
 		return imageName, currentTag, currentTag
 	}
-	newVersion := TrimSemver(currentTag, newest.Original())
+	newVersion := newest.Original()
 	cache[currentVersion] = newVersion
 	return imageName, currentTag, newVersion
 }

circleci/orb.go

@@ -2,6 +2,7 @@ package circleci
 
 import (
 	"fmt"
+	"github.com/hashicorp/go-version"
 	"net/http"
 	"strings"
 
@@ -52,6 +53,12 @@ func findNewestOrbVersion(currentVersion string, parameters *map[string]*yaml.No
 		currentTag = paramDefault.Value
 	}
 
+	currentTagParsed, err := version.NewVersion(currentTag)
+	if err != nil {
+		log.Error().Err(err).Msgf("error parsing current version for orb: %s", orbSplitString[0])
+		return orbName, currentTag, currentTag
+	}
+
 	CCIApiToken := ""
 	if config.AppConfig.BestsellerSpecific.Running {
 		log.Debug().Msg("Using Bestseller specific token to handle private orbs")
@@ -66,13 +73,17 @@ func findNewestOrbVersion(currentVersion string, parameters *map[string]*yaml.No
 		log.Error().Err(err).Msgf("error finding latests orb version failed for orb: %s", orbSplitString[0])
 		return orbName, currentTag, currentTag
 	}
-
-	if len(orbInfo.Orb.HighestVersion) == 0 || strings.HasPrefix(orbInfo.Orb.HighestVersion, currentTag) {
+	highestVersion, err := version.NewVersion(orbInfo.Orb.HighestVersion)
+	if err != nil {
+		log.Error().Err(err).Msgf("error parsing highest version for orb: %s", orbSplitString[0])
+		return orbName, currentTag, currentTag
+	}
+	if currentTagParsed.GreaterThan(highestVersion) {
 		cache[currentVersion] = currentTag
 		return orbName, currentTag, currentTag
 	}
 
-	newVersion := TrimSemver(currentTag, orbInfo.Orb.HighestVersion)
+	newVersion := TrimSemver(currentTag, highestVersion.Original())
 	cache[currentVersion] = newVersion
 	return orbName, currentTag, newVersion
 }