Skip to content

Commit 0c6a33e

Browse files
committedOct 3, 2024·
BUG/MINOR: fix regex for capture sample
1 parent 43ffce3 commit 0c6a33e

13 files changed

+197
-177
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

+163-162
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
@@ -272,6 +272,7 @@ type Action interface {
272272
//test:fail:http-request
273273
//test:fail:http-request capture req.cook_cnt(FirstVisit),bool strlen 10
274274
//test:frontend-ok:http-request capture req.cook_cnt(FirstVisit),bool len 10
275+
//test:frontend-ok:http-request capture str("DNS resolution failure") len 32 unless dns_successful
275276
//test:ok:http-request set-map(map.lst) %[src] %[req.hdr(X-Value)] if value
276277
//test:ok:http-request set-map(map.lst) %[src] %[req.hdr(X-Value)]
277278
//test:fail:http-request set-map(map.lst) %[src]
@@ -950,6 +951,7 @@ type TCPType interface {
950951
//test:ok:tcp-request content reject if !HTTP
951952
//test:ok:tcp-request content capture req.payload(0,6) len 6
952953
//test:ok:tcp-request content capture req.payload(0,6) len 6 if !HTTP
954+
//test:frontend-ok:tcp-request content capture str("DNS resolution failure") len 32 unless dns_successful
953955
//test:ok:tcp-request content do-resolve(txn.myip,mydns,ipv6) capture.req.hdr(0),lower
954956
//test:ok:tcp-request content do-resolve(txn.myip,mydns) capture.req.hdr(0),lower
955957
//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
@@ -3839,7 +3839,7 @@ definitions:
38393839
value: capture
38403840
x-display-name: Capture Len
38413841
capture_sample:
3842-
pattern: ^[^\s]+$
3842+
pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
38433843
type: string
38443844
x-dependency:
38453845
type:
@@ -5146,7 +5146,7 @@ definitions:
51465146
value: capture
51475147
x-display-name: Capture Len
51485148
capture_sample:
5149-
pattern: ^[^\s]+$
5149+
pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
51505150
type: string
51515151
x-dependency:
51525152
type:
@@ -5842,7 +5842,7 @@ definitions:
58425842
- content
58435843
x-display-name: Capture Length
58445844
capture_sample:
5845-
pattern: ^[^\s]+$
5845+
pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
58465846
type: string
58475847
x-dependency:
58485848
action:

‎specification/models/configuration/http/after_response.yaml

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

‎specification/models/configuration/http/request.yaml

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

‎specification/models/configuration/tcp/request.yaml

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

0 commit comments

Comments
 (0)
Please sign in to comment.