MINOR: support keyword hash-preserve-affinity in defaults, backends and listen sections

Signed-off-by: Vincent Gramer <vgramer@haproxy.com>

Author: vgramer

config-parser/parsers/hash-preserve-affinity.go

@@ -0,0 +1,45 @@
+package parsers
+
+import (
+	"fmt"
+
+	"github.com/haproxytech/client-native/v6/config-parser/common"
+	"github.com/haproxytech/client-native/v6/config-parser/errors"
+	"github.com/haproxytech/client-native/v6/config-parser/types"
+)
+
+type HashPreserveAffinity struct {
+	data        *types.StringC
+	preComments []string // comments that appear before the actual line
+}
+
+func (p *HashPreserveAffinity) Parse(line string, parts []string, comment string) (string, error) {
+	if parts[0] == "hash-preserve-affinity" {
+		if len(parts) < 2 {
+			return "", &errors.ParseError{Parser: "HashPreserveAffinity", Line: line, Message: "Parse error"}
+		}
+
+		if parts[1] == "always" || parts[1] == "maxconn" || parts[1] == "maxqueue" {
+			p.data = &types.StringC{
+				Value:   parts[1],
+				Comment: comment,
+			}
+			return "", nil
+		}
+
+		return "", &errors.ParseError{Parser: "HashPreserveAffinity", Line: line, Message: fmt.Sprintf("Unknown data %q", parts[1])}
+	}
+	return "", &errors.ParseError{Parser: "HashPreserveAffinity", Line: line}
+}
+
+func (p *HashPreserveAffinity) Result() ([]common.ReturnResultLine, error) {
+	if p.data == nil {
+		return nil, errors.ErrFetch
+	}
+	return []common.ReturnResultLine{
+		{
+			Data:    "hash-preserve-affinity " + p.data.Value,
+			Comment: p.data.Comment,
+		},
+	}, nil
+}

config-parser/parsers/hash-preserve-affinity_generated.go

@@ -211,6 +211,7 @@ func (p *configParser) getDefaultParser() *Parsers {
 	addParser(parser, &sequence, &parsers.Persist{})
 	addParser(parser, &sequence, &simple.Number{Name: "rate-limit sessions"})
 	addParser(parser, &sequence, &simple.Number{Name: "hash-balance-factor"})
+	addParser(parser, &sequence, &parsers.HashPreserveAffinity{})
 	addParser(parser, &sequence, &http.Requests{Mode: "defaults"})
 	addParser(parser, &sequence, &tcp.Requests{Mode: "defaults"})
 	addParser(parser, &sequence, &tcp.Responses{Mode: "defaults"})
@@ -698,6 +699,7 @@ func (p *configParser) getBackendParser() *Parsers {
 	addParser(parser, &sequence, &parsers.Source{})
 	addParser(parser, &sequence, &parsers.Persist{})
 	addParser(parser, &sequence, &simple.Number{Name: "hash-balance-factor"})
+	addParser(parser, &sequence, &parsers.HashPreserveAffinity{})
 	addParser(parser, &sequence, &simple.Word{Name: "guid"})
 	return p.createParsers(parser, sequence)
 }
@@ -789,6 +791,7 @@ func (p *configParser) getListenParser() *Parsers {
 		addParser(parser, &sequence, &parsers.OptionHTTPRestrictReqHdrNames{})
 		addParser(parser, &sequence, &tcp.Checks{})
 		addParser(parser, &sequence, &parsers.OptionHttpchk{})
+		addParser(parser, &sequence, &parsers.HashPreserveAffinity{})
 		if p.Options.UseV2HTTPCheck {
 			addParser(parser, &sequence, &parsers.HTTPCheckV2{})
 		} else {

config-parser/section-parsers.go

@@ -127,6 +127,7 @@ defaults A
   srvtcpka-intvl 10s
   load-server-state-from-file global
   hash-balance-factor 150
+  hash-preserve-affinity maxconn
 
 # some random userlist L1
 userlist L1
@@ -397,6 +398,7 @@ backend test from A
   tcp-response content accept if TRUE
   tcp-response content reject if FALSE
   hash-balance-factor 150
+  hash-preserve-affinity always
   option httplog
   option contstats
   option contstats
@@ -421,6 +423,7 @@ listen stats from A
   option transparent
   option idle-close-on-response
   option dontlog-normal
+  hash-preserve-affinity maxconn
   stats enable
   stats realm HAProxy\ Statistics
   stats uri /

config-parser/tests/configs/haproxy.cfg.go

@@ -76,7 +76,7 @@ type Int64C struct {
 	Comment string
 }
 
-// String is used by parsers Mode, DefaultBackend, SimpleTimeTwoWords, StatsTimeout, CompressionDirection, CompressionAlgoReq, CPUPolicy
+// String is used by parsers Mode, DefaultBackend, SimpleTimeTwoWords, StatsTimeout, CompressionDirection, CompressionAlgoReq, CPUPolicy, HashPreserveAffinity
 //
 //generate:type:Mode
 //name:mode
@@ -124,6 +124,13 @@ type Int64C struct {
 //test:ok:cpu-policy resource
 //test:ko:cpu-policy
 //test:ko:cpu-policy notvalid
+//generate:type:HashPreserveAffinity
+//name:hash-preserve-affinity
+//test:ok:hash-preserve-affinity always
+//test:ok:hash-preserve-affinity maxconn # comment
+//test:ok:hash-preserve-affinity maxqueue
+//test:fail:hash-preserve-affinity
+//test:fail:hash-preserve-affinity notvalid
 type StringC struct {
 	Value   string
 	Comment string