Skip to content

Commit

Permalink
Testing strict semver functionality
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Larsen <pnvlarsen@gmail.com>
  • Loading branch information
PaulSonOfLars committed Sep 25, 2024
1 parent b824956 commit 03f027b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion util/git/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion util/grpc/useragent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion util/helm/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion util/helm/tags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion util/helm/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion util/kustomize/kustomize.go
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 03f027b

Please sign in to comment.