MEDIUM: add guid keywords

haproxytech · Jun 19, 2024 · 86ef212 · 86ef212
1 parent 1217c4e
commit 86ef212
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 4 deletions.
diff --git a/params/bind-options.go b/params/bind-options.go
@@ -217,6 +217,7 @@ func getBindOptions() []BindOption {
 		&BindOptionValue{Name: "quic-cc-algo"},
 		&BindOptionValue{Name: "quic-socket"},
 		&BindOptionValue{Name: "nbconn"},
+		&BindOptionValue{Name: "guid-prefix"},
 	}
 }
 

diff --git a/params/server-options.go b/params/server-options.go
@@ -265,6 +265,7 @@ func getServerOptions() []ServerOption {
 		&ServerOptionValue{Name: "pool-low-conn"},
 		&ServerOptionValue{Name: "ws"},
 		&ServerOptionValue{Name: "log-bufsize"},
+		&ServerOptionValue{Name: "guid"},
 		&ServerOptionIDValue{Name: "set-proxy-v2-tlv-fmt"},
 	}
 }

diff --git a/section-parsers.go b/section-parsers.go
@@ -532,6 +532,7 @@ func (p *configParser) getFrontendParser() *Parsers {
 	addParser(parser, &sequence, &http.HTTPErrors{})
 	addParser(parser, &sequence, &parsers.DeclareCapture{})
 	addParser(parser, &sequence, &simple.Number{Name: "rate-limit sessions"})
+	addParser(parser, &sequence, &simple.Word{Name: "guid"})
 	return p.createParsers(parser, sequence)
 }
 
@@ -654,6 +655,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, &simple.Word{Name: "guid"})
 	return p.createParsers(parser, sequence)
 }
 
@@ -811,6 +813,7 @@ func (p *configParser) getListenParser() *Parsers {
 		addParser(parser, &sequence, &parsers.Source{})
 		addParser(parser, &sequence, &parsers.Persist{})
 		addParser(parser, &sequence, &simple.Number{Name: "rate-limit sessions"})
+		addParser(parser, &sequence, &simple.Word{Name: "guid"})
 	}
 	return p.createParsers(parser, sequence)
 }

diff --git a/tests/bind_generated_test.go b/tests/bind_generated_test.go
diff --git a/tests/configs/haproxy_generated.cfg.go b/tests/configs/haproxy_generated.cfg.go
diff --git a/tests/integration/backend_data_test.go b/tests/integration/backend_data_test.go
diff --git a/tests/integration/backend_test.go b/tests/integration/backend_test.go
diff --git a/tests/integration/frontend_data_test.go b/tests/integration/frontend_data_test.go
diff --git a/tests/integration/frontend_test.go b/tests/integration/frontend_test.go
diff --git a/tests/server_generated_test.go b/tests/server_generated_test.go
diff --git a/types/types.go b/types/types.go
@@ -258,6 +258,7 @@ type ACL struct {
 //test:fail:bind :443 quic-socket something
 //test:ok:bind :443 nbconn 1
 //test:ok:bind :443 nbconn +2
+//test:ok:bind :443 guid-prefix guid-example
 type Bind struct {
 	Path    string // can be address:port or socket path
 	Params  []params.BindOption
@@ -1051,6 +1052,7 @@ type Peer struct {
 //test:ok:server name 127.0.0.1 ws h2
 //test:ok:server name 127.0.0.1 ws auto
 //test:ok:server name 127.0.0.1 log-bufsize 10
+//test:ok:server name 127.0.0.1 guid guid-example
 //test:fail:server
 type Server struct {
 	Name    string