Skip to content

Commit 9ca50cd

Browse files
committed
BUG/MINOR: accept set-var-fmt in http_request_rule
1 parent 40bfc04 commit 9ca50cd

File tree

5 files changed

+15
-3
lines changed

5 files changed

+15
-3
lines changed

models/http_request_rule.go

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/build/haproxy_spec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5174,6 +5174,7 @@ definitions:
51745174
- set-tos
51755175
- set-uri
51765176
- set-var
5177+
- set-var-fmt
51775178
- silent-drop
51785179
- strict-mode
51795180
- tarpit

specification/models/configuration/http/request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ http_request_rule:
6262
- set-tos
6363
- set-uri
6464
- set-var
65+
- set-var-fmt
6566
- silent-drop
6667
- strict-mode
6768
- tarpit

test/configuration_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ frontend test
444444
http-request allow if src 192.168.0.0/16
445445
http-request set-header X-SSL %[ssl_fc]
446446
http-request set-var(req.my_var) req.fhdr(user-agent),lower
447+
http-request set-var-fmt(txn.from) %[src]:%[src_port]
447448
http-request set-map(map.lst) %[src] %[req.hdr(X-Value)]
448449
http-request del-map(map.lst) %[src] if FALSE
449450
http-request del-acl(map.lst) %[src] if FALSE

test/expected/structured.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,6 +1730,12 @@
17301730
"var_name": "my_var",
17311731
"var_scope": "req"
17321732
},
1733+
{
1734+
"type": "set-var-fmt",
1735+
"var_format": "%[src]:%[src_port]",
1736+
"var_name": "from",
1737+
"var_scope": "txn"
1738+
},
17331739
{
17341740
"map_file": "map.lst",
17351741
"map_keyfmt": "%[src]",

0 commit comments

Comments
 (0)