MINOR: Add 4 new tunable keywords for HAProxy 3.4

Author: oliwer

.aspell.yml

@@ -197,6 +197,7 @@ allowed:
   - tls
   - tooltip
   - tsconfig
+  - tunable
   - typings
   - ubuntu
   - uniq

config-parser/section-parsers.go

@@ -284,13 +284,16 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
 	addParser(parser, &sequence, &simple.Size{Name: "tune.bufsize"})
 	addParser(parser, &sequence, &simple.Size{Name: "tune.bufsize.small"})
 	addParser(parser, &sequence, &simple.Number{Name: "tune.comp.maxlevel"})
+	addParser(parser, &sequence, &simple.Enabled{Name: "tune.defaults.purge"})
 	addParser(parser, &sequence, &simple.Enabled{Name: "tune.disable-zero-copy-forwarding"})
 	addParser(parser, &sequence, &simple.Enabled{Name: "tune.disable-fast-forward"})
 	addParser(parser, &sequence, &simple.Word{Name: "tune.epoll.mask-events"})
 	addParser(parser, &sequence, &simple.Number{Name: "tune.events.max-events-at-once"})
 	addParser(parser, &sequence, &simple.Enabled{Name: "tune.fail-alloc"})
 	addParser(parser, &sequence, &simple.Number{Name: "tune.glitches.kill.cpu-usage"})
 	addParser(parser, &sequence, &simple.OnOff{Name: "tune.fd.edge-triggered"})
+	addParser(parser, &sequence, &simple.Number{Name: "tune.h1.be.glitches-threshold"})
+	addParser(parser, &sequence, &simple.Number{Name: "tune.h1.fe.glitches-threshold"})
 	addParser(parser, &sequence, &simple.OnOff{Name: "tune.h1.zero-copy-fwd-recv"})
 	addParser(parser, &sequence, &simple.OnOff{Name: "tune.h1.zero-copy-fwd-send"})
 	addParser(parser, &sequence, &simple.Number{Name: "tune.h2.be.glitches-threshold"})
@@ -352,6 +355,7 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
 	addParser(parser, &sequence, &simple.Size{Name: "tune.sndbuf.frontend"})
 	addParser(parser, &sequence, &simple.Size{Name: "tune.sndbuf.server"})
 	addParser(parser, &sequence, &simple.Number{Name: "tune.ssl.cachesize"})
+	addParser(parser, &sequence, &simple.AutoOnOff{Name: "tune.ssl.certificate-compression"})
 	addParser(parser, &sequence, &simple.Enabled{Name: "tune.ssl.force-private-cache"})
 	addParser(parser, &sequence, &simple.OnOff{Name: "tune.ssl.keylog"})
 	addParser(parser, &sequence, &simple.Time{Name: "tune.ssl.lifetime"})

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

@@ -44,9 +44,12 @@ global
   tune.buffers.reserve 3
   tune.bufsize 32768
   tune.bufsize.small 16k
+  tune.defaults.purge
   tune.disable-zero-copy-forwarding
   tune.disable-fast-forward
   tune.events.max-events-at-once 150
+  tune.h1.be.glitches-threshold 2
+  tune.h1.fe.glitches-threshold 16
   tune.h1.zero-copy-fwd-recv on
   tune.h1.zero-copy-fwd-send on
   tune.h2.be.glitches-threshold 16
@@ -62,6 +65,7 @@ global
   tune.renice.runtime -10
   tune.renice.startup 8
   tune.ring.queues 8
+  tune.ssl.certificate-compression off
   tune.ssl.default-dh-param 2048
   tune.quic.reorder-ratio 75
   tune.quic.zero-copy-fwd-send on

configuration/global.go

@@ -1285,6 +1285,15 @@ func parseTuneOptions(p parser.Parser) (*models.TuneOptions, error) { //nolint:g
 		options.CompMaxlevel = intOption
 	}
 
+	boolOption, err = parseBoolOption(p, "tune.defaults.purge")
+	if err != nil {
+		return nil, err
+	}
+	if boolOption {
+		isEmpty = false
+		options.DefaultsPurge = boolOption
+	}
+
 	boolOption, err = parseBoolOption(p, "tune.disable-fast-forward")
 	if err != nil {
 		return nil, err
@@ -1341,6 +1350,24 @@ func parseTuneOptions(p parser.Parser) (*models.TuneOptions, error) { //nolint:g
 		options.GlitchesKillCPUUsage = intPOption
 	}
 
+	intPOption, err = parseInt64POption(p, "tune.h1.be.glitches-threshold")
+	if err != nil {
+		return nil, err
+	}
+	if intPOption != nil {
+		isEmpty = false
+		options.H1BeGlitchesThreshold = intPOption
+	}
+
+	intPOption, err = parseInt64POption(p, "tune.h1.fe.glitches-threshold")
+	if err != nil {
+		return nil, err
+	}
+	if intPOption != nil {
+		isEmpty = false
+		options.H1FeGlitchesThreshold = intPOption
+	}
+
 	intOption, err = parseInt64Option(p, "tune.h2.header-table-size")
 	if err != nil {
 		return nil, err
@@ -2080,6 +2107,15 @@ func parseTuneSSLOptions(p parser.Parser) (*models.TuneSslOptions, error) {
 		options.Cachesize = intPOption
 	}
 
+	strOption, err := parseAutoOnOffOption(p, "tune.ssl.certificate-compression")
+	if err != nil {
+		return nil, err
+	}
+	if strOption != "" {
+		isEmpty = false
+		options.CertificateCompression = strOption
+	}
+
 	boolOption, err := parseBoolOption(p, "tune.ssl.force-private-cache")
 	if err != nil {
 		return nil, err
@@ -2089,7 +2125,7 @@ func parseTuneSSLOptions(p parser.Parser) (*models.TuneSslOptions, error) {
 		options.ForcePrivateCache = boolOption
 	}
 
-	strOption, err := parseOnOffOption(p, "tune.ssl.keylog")
+	strOption, err = parseOnOffOption(p, "tune.ssl.keylog")
 	if err != nil {
 		return nil, err
 	}
@@ -3770,6 +3806,9 @@ func serializeTuneSSLOptions(p parser.Parser, options *models.TuneSslOptions, co
 	if err := serializeInt64POption(p, "tune.ssl.capture-buffer-size", options.CaptureBufferSize); err != nil {
 		return err
 	}
+	if err := serializeAutoOnOffOption(p, "tune.ssl.certificate-compression", options.CertificateCompression); err != nil {
+		return err
+	}
 	if err := serializeInt64Option(p, "tune.ssl.ssl-ctx-cache-size", options.CtxCacheSize); err != nil {
 		return err
 	}
@@ -3833,6 +3872,9 @@ func serializeTuneOptions(p parser.Parser, options *models.TuneOptions, configOp
 	if err := serializeInt64Option(p, "tune.comp.maxlevel", options.CompMaxlevel); err != nil {
 		return err
 	}
+	if err := serializeBoolOption(p, "tune.defaults.purge", options.DefaultsPurge); err != nil {
+		return err
+	}
 	if err := serializeBoolOption(p, "tune.disable-fast-forward", options.DisableFastForward); err != nil {
 		return err
 	}
@@ -3851,6 +3893,12 @@ func serializeTuneOptions(p parser.Parser, options *models.TuneOptions, configOp
 	if err := serializeInt64POption(p, "tune.glitches.kill.cpu-usage", options.GlitchesKillCPUUsage); err != nil {
 		return err
 	}
+	if err := serializeInt64POption(p, "tune.h1.be.glitches-threshold", options.H1BeGlitchesThreshold); err != nil {
+		return err
+	}
+	if err := serializeInt64POption(p, "tune.h1.fe.glitches-threshold", options.H1FeGlitchesThreshold); err != nil {
+		return err
+	}
 	if err := serializeInt64Option(p, "tune.h2.header-table-size", options.H2HeaderTableSize); err != nil {
 		return err
 	}