MINOR: improve HAProxy runtime version checks

- Add a fallback in Reload() to retry fetching the HAProxy version
  if the initial startup probe failed, preventing permanent gate failure.
- Replace explicit struct instantiations in runtime_client.go with
  semver.MustParse() for cleaner and more robust version comparisons.

Author: oktalz

.aspell.yml

@@ -115,6 +115,7 @@ allowed:
   - ioutil
   - ipam
   - istanbul
+  - instantiations
   - iweight
   - jose
   - json

cmd/gitlab-mr-checker/main.go

@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Masterminds/semver"
+	"github.com/Masterminds/semver/v3"
 	"github.com/joho/godotenv"
 )
 
@@ -164,7 +164,7 @@ func main() {
 		"backport-ee": {},
 	}
 	for _, version := range versions {
-		ver := strconv.Itoa(int(version.Major())) + "." + strconv.Itoa(int(version.Minor()))
+		ver := strconv.FormatUint(version.Major(), 10) + "." + strconv.FormatUint(version.Minor(), 10)
 		question += "\n" + "| " + ver + " | " + "backport-" + ver + " |"
 		backportLabels["backport-"+ver] = struct{}{}
 	}

e2e/runtime/version/version_test.go

@@ -30,6 +30,6 @@ func (s *MajorVersionInRuntime) TestExample() {
 	if err != nil {
 		s.FailNow(err.Error())
 	}
-	versionStr := fmt.Sprintf("%d.%d", version.Major, version.Minor)
+	versionStr := fmt.Sprintf("%d.%d", version.Major(), version.Minor())
 	s.Equal(versionStr, s.haproxy_version)
 }

go.mod

@@ -3,7 +3,7 @@ module github.com/haproxytech/client-native/v6
 go 1.25.0
 
 require (
-	github.com/Masterminds/semver v1.5.0
+	github.com/Masterminds/semver/v3 v3.5.0
 	github.com/go-faker/faker/v4 v4.7.0
 	github.com/go-openapi/errors v0.22.7
 	github.com/go-openapi/strfmt v0.25.0

go.sum

@@ -1,5 +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/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
+github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

runtime/runtime_client.go

@@ -24,6 +24,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/Masterminds/semver/v3"
 	native_errors "github.com/haproxytech/client-native/v6/errors"
 	"github.com/haproxytech/client-native/v6/misc"
 	"github.com/haproxytech/client-native/v6/models"
@@ -173,7 +174,12 @@ func (c *client) Reload() (string, error) {
 	if c.options.MasterSocketData == nil {
 		return "", errors.New("cannot reload: not connected to a master socket")
 	}
-	if !c.IsVersionBiggerOrEqual(&HAProxyVersion{Major: 2, Minor: 7}) {
+	// Init-time version probe is fire-and-forget; retry here so a transient
+	// startup failure doesn't permanently disable the gate.
+	if haproxyVersion == nil {
+		_, _ = c.GetVersion()
+	}
+	if !c.IsVersionBiggerOrEqual(&HAProxyVersion{Version: semver.MustParse("2.7")}) {
 		return "", fmt.Errorf("cannot reload: requires HAProxy 2.7 or later but current version is %v", haproxyVersion)
 	}
 
@@ -252,7 +258,7 @@ func (c *client) AddServer(backend, name, attributes string) error {
 	if !c.runtime.IsValid() {
 		return errors.New("no valid runtime found")
 	}
-	if !c.IsVersionBiggerOrEqual(&HAProxyVersion{Major: 2, Minor: 6}) {
+	if !c.IsVersionBiggerOrEqual(&HAProxyVersion{Version: semver.MustParse("2.6")}) {
 		return fmt.Errorf("this operation requires HAProxy 2.6 or later but current version is %v", haproxyVersion)
 	}
 	err := c.runtime.AddServer(backend, name, attributes)
@@ -267,7 +273,7 @@ func (c *client) DeleteServer(backend, name string) error {
 	if !c.runtime.IsValid() {
 		return errors.New("no valid runtime found")
 	}
-	if !c.IsVersionBiggerOrEqual(&HAProxyVersion{Major: 2, Minor: 6}) {
+	if !c.IsVersionBiggerOrEqual(&HAProxyVersion{Version: semver.MustParse("2.6")}) {
 		return errors.New("this operation requires HAProxy 2.6 or later")
 	}
 	err := c.runtime.DeleteServer(backend, name)
@@ -734,7 +740,7 @@ func (c *client) AddMapPayloadVersioned(name string, entries models.MapEntries)
 		return fmt.Errorf("%s %w", c.runtime.socketPath, err)
 	}
 	canAtomicUpdate := false
-	v := HAProxyVersion{Major: 2, Minor: 4}
+	v := HAProxyVersion{Version: semver.MustParse("2.4")}
 	if c.IsVersionBiggerOrEqual(&v) {
 		canAtomicUpdate = true
 	}
@@ -976,7 +982,7 @@ func (c *client) AddACLAtomic(aclID string, entries models.ACLFilesEntries) erro
 	if !c.runtime.IsValid() {
 		return errors.New("no valid runtime found")
 	}
-	v := HAProxyVersion{Major: 2, Minor: 4}
+	v := HAProxyVersion{Version: semver.MustParse("2.4")}
 	if !c.IsVersionBiggerOrEqual(&v) {
 		return fmt.Errorf("not supported for HAProxy versions lower than 2.4 %w", native_errors.ErrGeneral)
 	}

runtime/version.go

@@ -16,66 +16,42 @@
 package runtime
 
 import (
-	"fmt"
-	"strconv"
 	"strings"
+
+	"github.com/Masterminds/semver/v3"
 )
 
 type HAProxyVersion struct {
-	Commit  string
-	Version string
-	Major   int
-	Minor   int
-	Patch   int
+	*semver.Version
+
+	Commit string
 }
 
 func (v *HAProxyVersion) ParseHAProxyVersion(version string) error {
-	v.Version = version
-
-	parts := strings.SplitN(version, "-", 2)
-	data := strings.SplitN(parts[0], ".", 3)
-	major, err := strconv.Atoi(data[0])
-	if err == nil {
-		v.Major = major
-	}
-	if len(data) > 1 {
-		minor, err := strconv.Atoi(data[1])
-		if err == nil {
-			v.Minor = minor
-		}
-	}
-	if len(data) > 2 {
-		patch, err := strconv.Atoi(data[2])
-		if err == nil {
-			v.Patch = patch
+	sv, err := semver.NewVersion(version)
+	if err != nil {
+		return err
+	}
+	v.Version = sv
+	// Commit lives in the prerelease tail: "dev6-2f6f36-13" → "2f6f36",
+	// "a42e6c-11" → "a42e6c", "34b2b10" → "34b2b10".
+	if pre := sv.Prerelease(); pre != "" {
+		parts := strings.Split(pre, "-")
+		if len(parts) < 2 {
+			v.Commit = parts[0]
+		} else {
+			v.Commit = parts[len(parts)-2]
 		}
 	}
-	if len(parts) < 2 {
-		return fmt.Errorf("version is not in correct format [%s]", version)
-	}
-	data = strings.Split(parts[1], "-")
-	if len(data) < 2 {
-		v.Commit = data[0]
-	} else {
-		v.Commit = data[len(data)-2]
-	}
 	return nil
 }
 
 func IsBiggerOrEqual(minimum, current *HAProxyVersion) bool {
-	if current == nil {
+	if current == nil || current.Version == nil {
 		return false
 	}
-	if current.Major > minimum.Major {
+	if minimum == nil || minimum.Version == nil {
 		return true
 	}
-	if current.Major == minimum.Major {
-		switch {
-		case current.Minor > minimum.Minor:
-			return true
-		case current.Minor == minimum.Minor:
-			return current.Patch >= minimum.Patch
-		}
-	}
-	return false
+	return current.GreaterThanEqual(minimum.Version)
 }