BUG/MINOR: fix regex for capture sample

haproxytech · Oct 3, 2024 · 496b7ba · 496b7ba
1 parent 29b9d34
commit 496b7ba
Show file tree

Hide file tree

Showing 13 changed files with 203 additions and 183 deletions.
diff --git a/config-parser/tests/configs/haproxy_generated.cfg.go b/config-parser/tests/configs/haproxy_generated.cfg.go
diff --git a/config-parser/tests/http-request_generated_test.go b/config-parser/tests/http-request_generated_test.go
diff --git a/config-parser/tests/integration/frontend_data_test.go b/config-parser/tests/integration/frontend_data_test.go
diff --git a/config-parser/tests/integration/frontend_test.go b/config-parser/tests/integration/frontend_test.go
diff --git a/config-parser/tests/tcp-request_generated_test.go b/config-parser/tests/tcp-request_generated_test.go
diff --git a/config-parser/types/types-other.go b/config-parser/types/types-other.go
@@ -271,6 +271,7 @@ type Action interface {
 //test:fail:http-request
 //test:fail:http-request capture req.cook_cnt(FirstVisit),bool strlen 10
 //test:frontend-ok:http-request capture req.cook_cnt(FirstVisit),bool len 10
+//test:frontend-ok:http-request capture str("DNS resolution failure") len 32 unless dns_successful
 //test:ok:http-request set-map(map.lst) %[src] %[req.hdr(X-Value)] if value
 //test:ok:http-request set-map(map.lst) %[src] %[req.hdr(X-Value)]
 //test:fail:http-request set-map(map.lst) %[src]
@@ -958,6 +959,7 @@ type TCPType interface {
 //test:ok:tcp-request content reject if !HTTP
 //test:ok:tcp-request content capture req.payload(0,6) len 6
 //test:ok:tcp-request content capture req.payload(0,6) len 6 if !HTTP
+//test:frontend-ok:tcp-request content capture str("DNS resolution failure") len 32 unless dns_successful
 //test:ok:tcp-request content do-resolve(txn.myip,mydns,ipv6) capture.req.hdr(0),lower
 //test:ok:tcp-request content do-resolve(txn.myip,mydns) capture.req.hdr(0),lower
 //test:ok:tcp-request content set-priority-class int(1)

diff --git a/models/http_after_response_rule.go b/models/http_after_response_rule.go
diff --git a/models/http_request_rule.go b/models/http_request_rule.go
diff --git a/models/tcp_request_rule.go b/models/tcp_request_rule.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -4386,7 +4386,7 @@ definitions:
             value: capture
         x-display-name: Capture Len
       capture_sample:
-        pattern: ^[^\s]+$
+        pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
         type: string
         x-dependency:
           type:
@@ -5603,7 +5603,7 @@ definitions:
             value: capture
         x-display-name: Capture Len
       capture_sample:
-        pattern: ^[^\s]+$
+        pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
         type: string
         x-dependency:
           type:
@@ -6288,7 +6288,7 @@ definitions:
               - content
         x-display-name: Capture Length
       capture_sample:
-        pattern: ^[^\s]+$
+        pattern: ^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)
         type: string
         x-dependency:
           action:

diff --git a/specification/models/configuration/http/after_response.yaml b/specification/models/configuration/http/after_response.yaml
@@ -33,7 +33,7 @@ http_after_response_rule:
         - unset-var
       x-nullable: false
     capture_sample:
-      pattern: '^[^\s]+$'
+      pattern: '^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)'
       x-display-name: Capture Sample
       type: string
       x-dependency:

diff --git a/specification/models/configuration/http/request.yaml b/specification/models/configuration/http/request.yaml
@@ -73,7 +73,7 @@ http_request_rule:
         - set-bandwidth-limit
       x-nullable: false
     capture_sample:
-      pattern: '^[^\s]+$'
+      pattern: '^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)'
       x-display-name: Capture Sample
       type: string
       x-dependency:

diff --git a/specification/models/configuration/tcp/request.yaml b/specification/models/configuration/tcp/request.yaml
@@ -56,7 +56,7 @@ tcp_request_rule:
           value: [connection, content, session]
           required: true
     capture_sample:
-      pattern: '^[^\s]+$'
+      pattern: '^(?:[A-Za-z]+\("([A-Za-z\s]+)"\)|[A-Za-z]+)'
       x-display-name: Capture Sample
       type: string
       x-dependency: