BUG/MINOR: accept set-var-fmt in http_request_rule

Author: hdurand0710

configuration/configuration_test.go

@@ -420,6 +420,7 @@ frontend test
   http-request track-sc2 src table tr2 if TRUE
   http-request track-sc5 src table test if TRUE
   http-request sc-set-gpt(1,2) hdr(Host),lower if FALSE
+  http-request set-var-fmt(txn.from) %[src]:%[src_port]
   http-response allow if src 192.168.0.0/16
   http-response set-header X-SSL %[ssl_fc]
   http-response set-var(req.my_var) req.fhdr(user-agent),lower

configuration/http_request_rule_test.go

@@ -30,8 +30,8 @@ func TestGetHTTPRequestRules(t *testing.T) { //nolint:gocognit,gocyclo
 		t.Error(err.Error())
 	}
 
-	if len(hRules) != 48 {
-		t.Errorf("%v http request rules returned, expected 48", len(hRules))
+	if len(hRules) != 49 {
+		t.Errorf("%v http request rules returned, expected 49", len(hRules))
 	}
 
 	if v != version {
@@ -745,6 +745,19 @@ func TestGetHTTPRequestRules(t *testing.T) { //nolint:gocognit,gocyclo
 			if r.ScIdx != 2 {
 				t.Errorf("%v: sc-idx not 2: %v", *r.Index, r.ScIdx)
 			}
+		case 48:
+			if r.Type != "set-var-fmt" {
+				t.Errorf("%v: Type not set-var-fmt: %v", *r.Index, r.Type)
+			}
+			if r.VarName != "from" {
+				t.Errorf("%v: VarName not from: %v", *r.Index, r.VarName)
+			}
+			if r.VarFormat != "%[src]:%[src_port]" {
+				t.Errorf("%v: VarFormat not %%[src]:%%[src_port]: %v", *r.Index, r.VarFormat)
+			}
+			if r.VarScope != "txn" {
+				t.Errorf("%v: VarScope not txn: %v", *r.Index, r.VarScope)
+			}
 		default:
 			t.Errorf("Expect only http-request 0 to 47, %v found", *r.Index)
 		}
@@ -919,9 +932,9 @@ func TestCreateEditDeleteHTTPRequestRule(t *testing.T) {
 		t.Error("Version not incremented")
 	}
 
-	_, _, err = clientTest.GetHTTPRequestRule(48, "frontend", "test", "")
+	_, _, err = clientTest.GetHTTPRequestRule(49, "frontend", "test", "")
 	if err == nil {
-		t.Error("DeleteHTTPRequestRule failed, HTTP Request Rule 48 still exists")
+		t.Error("DeleteHTTPRequestRule failed, HTTP Request Rule 49 still exists")
 	}
 
 	err = clientTest.DeleteHTTPRequestRule(2, "backend", "test_2", "", version)

models/http_request_rule.go

@@ -4424,6 +4424,7 @@ definitions:
                   - set-tos
                   - set-uri
                   - set-var
+                  - set-var-fmt
                   - silent-drop
                   - strict-mode
                   - tarpit

specification/build/haproxy_spec.yaml

@@ -62,6 +62,7 @@ http_request_rule:
         - set-tos
         - set-uri
         - set-var
+        - set-var-fmt
         - silent-drop
         - strict-mode
         - tarpit