From 03f027b457a1912a900457bd9e535b402c87aa18 Mon Sep 17 00:00:00 2001
From: Paul Larsen <pnvlarsen@gmail.com>
Date: Wed, 25 Sep 2024 08:49:20 +0100
Subject: [PATCH] Testing strict semver functionality

Signed-off-by: Paul Larsen <pnvlarsen@gmail.com>
---
 util/git/client.go          | 2 +-
 util/grpc/useragent.go      | 2 +-
 util/helm/index.go          | 2 +-
 util/helm/tags.go           | 2 +-
 util/helm/version.go        | 2 +-
 util/kustomize/kustomize.go | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/util/git/client.go b/util/git/client.go
index 3b9c6d42450a5..8c2b991b0759a 100644
--- a/util/git/client.go
+++ b/util/git/client.go
@@ -704,7 +704,7 @@ func (m *nativeGitClient) resolveSemverRevision(constraint *semver.Constraints,
 		}
 
 		tag := ref.Name().Short()
-		version, err := semver.NewVersion(tag)
+		version, err := semver.StrictNewVersion(tag)
 		if err != nil {
 			log.Debugf("Error parsing version for tag: '%s': %v", tag, err)
 			// Skip this tag and continue to the next one
diff --git a/util/grpc/useragent.go b/util/grpc/useragent.go
index c71f5e1a8a6f2..7c56f9f2a2470 100644
--- a/util/grpc/useragent.go
+++ b/util/grpc/useragent.go
@@ -63,7 +63,7 @@ func userAgentEnforcer(ctx context.Context, clientName, constraintStr string, se
 		// remove pre-release part
 		versionStr := strings.Split(uaSplit[1], "-")[0]
 		// We have matched the client name to the one we care about
-		uaVers, err := semver.NewVersion(versionStr)
+		uaVers, err := semver.StrictNewVersion(versionStr)
 		if err != nil {
 			return status.Errorf(codes.InvalidArgument, "could not parse version from user-agent: %s", userAgent)
 		}
diff --git a/util/helm/index.go b/util/helm/index.go
index 2dca5041d40dd..3d6e4986758f5 100644
--- a/util/helm/index.go
+++ b/util/helm/index.go
@@ -32,7 +32,7 @@ type Entries []Entry
 func (e Entries) MaxVersion(constraints *semver.Constraints) (*semver.Version, error) {
 	versions := semver.Collection{}
 	for _, entry := range e {
-		v, err := semver.NewVersion(entry.Version)
+		v, err := semver.StrictNewVersion(entry.Version)
 
 		// Invalid semantic version ignored
 		if errors.Is(err, semver.ErrInvalidSemVer) {
diff --git a/util/helm/tags.go b/util/helm/tags.go
index 6cfa745fb33fc..1570f3f3e39ad 100644
--- a/util/helm/tags.go
+++ b/util/helm/tags.go
@@ -16,7 +16,7 @@ type TagsList struct {
 func (t TagsList) MaxVersion(constraints *semver.Constraints) (*semver.Version, error) {
 	versions := semver.Collection{}
 	for _, tag := range t.Tags {
-		v, err := semver.NewVersion(tag)
+		v, err := semver.StrictNewVersion(tag)
 
 		// Invalid semantic version ignored
 		if errors.Is(err, semver.ErrInvalidSemVer) {
diff --git a/util/helm/version.go b/util/helm/version.go
index 89746843525c7..3acb67f64afb2 100644
--- a/util/helm/version.go
+++ b/util/helm/version.go
@@ -3,6 +3,6 @@ package helm
 import "github.com/Masterminds/semver/v3"
 
 func IsVersion(text string) bool {
-	_, err := semver.NewVersion(text)
+	_, err := semver.StrictNewVersion(text)
 	return err == nil
 }
diff --git a/util/kustomize/kustomize.go b/util/kustomize/kustomize.go
index 3509f4689de96..d72f7bfeb51a6 100644
--- a/util/kustomize/kustomize.go
+++ b/util/kustomize/kustomize.go
@@ -406,7 +406,7 @@ func getSemver() (*semver.Version, error) {
 		return nil, fmt.Errorf("expected string that includes semver formatted version but got: '%s'", verStr)
 	}
 
-	return semver.NewVersion(semverMatches[0])
+	return semver.StrictNewVersion(semverMatches[0])
 }
 
 // getSemverSafe returns parsed kustomize version;