Skip to content

Commit 0777122

Browse files
committed
BUG/MINOR: fix regex for capture sample
1 parent 94c0b05 commit 0777122

13 files changed

+203
-183
lines changed

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

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/http-request_generated_test.go

+169-168
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/integration/frontend_data_test.go

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/integration/frontend_test.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/tcp-request_generated_test.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/types/types-other.go

+2
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ type Action interface {
271271
//test:fail:http-request
272272
//test:fail:http-request capture req.cook_cnt(FirstVisit),bool strlen 10
273273
//test:frontend-ok:http-request capture req.cook_cnt(FirstVisit),bool len 10
274+
//test:frontend-ok:http-request capture str("DNS resolution failure") len 32 unless dns_successful
274275
//test:ok:http-request set-map(map.lst) %[src] %[req.hdr(X-Value)] if value
275276
//test:ok:http-request set-map(map.lst) %[src] %[req.hdr(X-Value)]
276277
//test:fail:http-request set-map(map.lst) %[src]
@@ -958,6 +959,7 @@ type TCPType interface {
958959
//test:ok:tcp-request content reject if !HTTP
959960
//test:ok:tcp-request content capture req.payload(0,6) len 6
960961
//test:ok:tcp-request content capture req.payload(0,6) len 6 if !HTTP
962+
//test:frontend-ok:tcp-request content capture str("DNS resolution failure") len 32 unless dns_successful
961963
//test:ok:tcp-request content do-resolve(txn.myip,mydns,ipv6) capture.req.hdr(0),lower
962964
//test:ok:tcp-request content do-resolve(txn.myip,mydns) capture.req.hdr(0),lower
963965
//test:ok:tcp-request content set-priority-class int(1)

models/http_after_response_rule.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/http_request_rule.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/tcp_request_rule.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/build/haproxy_spec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4386,7 +4386,7 @@ definitions:
43864386
value: capture
43874387
x-display-name: Capture Len
43884388
capture_sample:
4389-
pattern: ^[^\s]+$
4389+
pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
43904390
type: string
43914391
x-dependency:
43924392
type:
@@ -5603,7 +5603,7 @@ definitions:
56035603
value: capture
56045604
x-display-name: Capture Len
56055605
capture_sample:
5606-
pattern: ^[^\s]+$
5606+
pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
56075607
type: string
56085608
x-dependency:
56095609
type:
@@ -6288,7 +6288,7 @@ definitions:
62886288
- content
62896289
x-display-name: Capture Length
62906290
capture_sample:
6291-
pattern: ^[^\s]+$
6291+
pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
62926292
type: string
62936293
x-dependency:
62946294
action:

specification/models/configuration/http/after_response.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ http_after_response_rule:
3333
- unset-var
3434
x-nullable: false
3535
capture_sample:
36-
pattern: '^[^\s]+$'
36+
pattern: '^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)'
3737
x-display-name: Capture Sample
3838
type: string
3939
x-dependency:

specification/models/configuration/http/request.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ http_request_rule:
7373
- set-bandwidth-limit
7474
x-nullable: false
7575
capture_sample:
76-
pattern: '^[^\s]+$'
76+
pattern: '^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)'
7777
x-display-name: Capture Sample
7878
type: string
7979
x-dependency:

specification/models/configuration/tcp/request.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ tcp_request_rule:
5656
value: [connection, content, session]
5757
required: true
5858
capture_sample:
59-
pattern: '^[^\s]+$'
59+
pattern: '^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)'
6060
x-display-name: Capture Sample
6161
type: string
6262
x-dependency:

0 commit comments

Comments
 (0)