Skip to content

Commit 3e5eff6

Browse files
authored
Proxy Verifier: use concise stack protocol specification (#13003)
Proxy Verifier v3.0.0 has a more concise `stack` configurable for `protocol` specification. This makes use of that over the more verbose full `protocol` sequence.
1 parent c0cb477 commit 3e5eff6

108 files changed

Lines changed: 403 additions & 686 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tests/gold_tests/cache/replay/bg_fill.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,9 @@ meta:
2525
version: '1.0'
2626
sessions:
2727
- protocol:
28-
- name: http
29-
version: 2
30-
- name: tls
31-
sni: test_sni
32-
- name: tcp
33-
- name: ip
34-
version: 4
28+
stack: http2
29+
tls:
30+
sni: test_sni
3531
transactions:
3632
- client-request:
3733
frames:
@@ -65,13 +61,9 @@ sessions:
6561
size: 11
6662

6763
- protocol:
68-
- name: http
69-
version: 2
70-
- name: tls
71-
sni: test_sni
72-
- name: tcp
73-
- name: ip
74-
version: 4
64+
stack: http2
65+
tls:
66+
sni: test_sni
7567
transactions:
7668
- client-request:
7769
delay: 3s

tests/gold_tests/chunked_encoding/replays/chunked.replay.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ sessions:
4848
size: 32
4949

5050
- protocol:
51-
- name: http
52-
version: 1
53-
- name: tls
54-
- name: tcp
55-
- name: ip
56-
51+
stack: https
5752
transactions:
5853
- client-request:
5954
method: "GET"

tests/gold_tests/chunked_encoding/replays/large_chunked.replay.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ sessions:
137137
# HTTP/2 - dechunk
138138

139139
- protocol:
140-
- name: http
141-
version: 2
140+
stack: http2
142141
transactions:
143142
- client-request:
144143
headers:

tests/gold_tests/client_connection/http2_slow_origins.replay.yaml

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,9 @@ meta:
3333
sessions:
3434

3535
- protocol:
36-
- name: http
37-
version: 2
38-
- name: tls
39-
sni: test_sni
40-
- name: tcp
41-
- name: ip
42-
36+
stack: http2
37+
tls:
38+
sni: test_sni
4339
transactions:
4440

4541
- client-request:
@@ -75,13 +71,9 @@ sessions:
7571
- [ X-Response, {value: 'first-response', as: equal } ]
7672

7773
- protocol:
78-
- name: http
79-
version: 2
80-
- name: tls
81-
sni: test_sni
82-
- name: tcp
83-
- name: ip
84-
74+
stack: http2
75+
tls:
76+
sni: test_sni
8577
transactions:
8678

8779
- client-request:
@@ -117,13 +109,9 @@ sessions:
117109
- [ X-Response, {value: 'second-response', as: equal } ]
118110

119111
- protocol:
120-
- name: http
121-
version: 2
122-
- name: tls
123-
sni: test_sni
124-
- name: tcp
125-
- name: ip
126-
112+
stack: http2
113+
tls:
114+
sni: test_sni
127115
transactions:
128116

129117
- client-request:
@@ -160,16 +148,12 @@ sessions:
160148

161149

162150
- protocol:
163-
- name: http
164-
version: 2
165-
- name: tls
166-
sni: test_sni
167-
- name: tcp
168-
- name: ip
169-
170-
# Make sure this is the last attempted transaction by giving the above
171-
# three transactions, all executed in parallel, a one second head start.
172-
# This connection should be aborted.
151+
# Make sure this is the last attempted transaction by giving the above
152+
# three transactions, all executed in parallel, a one second head start.
153+
# This connection should be aborted.
154+
stack: http2
155+
tls:
156+
sni: test_sni
173157
delay: 1s
174158

175159
transactions:
@@ -198,13 +182,9 @@ sessions:
198182
# Note that this will delay after the previous 1s delay, so this is really
199183
# a delay of 3s.
200184
- protocol:
201-
- name: http
202-
version: 2
203-
- name: tls
204-
sni: test_sni
205-
- name: tcp
206-
- name: ip
207-
185+
stack: http2
186+
tls:
187+
sni: test_sni
208188
delay: 2s
209189

210190
transactions:

tests/gold_tests/client_connection/https_slow_origins.replay.yaml

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ meta:
3333
sessions:
3434

3535
- protocol:
36-
- name: tls
37-
sni: test_sni
38-
- name: tcp
39-
- name: ip
40-
36+
stack: https
37+
tls:
38+
sni: test_sni
4139
transactions:
4240

4341
- client-request:
@@ -75,11 +73,9 @@ sessions:
7573
- [ X-Response, {value: 'first-response', as: equal } ]
7674

7775
- protocol:
78-
- name: tls
79-
sni: test_sni
80-
- name: tcp
81-
- name: ip
82-
76+
stack: https
77+
tls:
78+
sni: test_sni
8379
transactions:
8480

8581
- client-request:
@@ -117,11 +113,9 @@ sessions:
117113
- [ X-Response, {value: 'second-response', as: equal } ]
118114

119115
- protocol:
120-
- name: tls
121-
sni: test_sni
122-
- name: tcp
123-
- name: ip
124-
116+
stack: https
117+
tls:
118+
sni: test_sni
125119
transactions:
126120

127121
- client-request:
@@ -160,14 +154,12 @@ sessions:
160154

161155

162156
- protocol:
163-
- name: tls
164-
sni: test_sni
165-
- name: tcp
166-
- name: ip
167-
168-
# Make sure this is the last attempted transaction by giving the above
169-
# three transactions, all executed in parallel, a one second head start.
170-
# This connection should be aborted.
157+
# Make sure this is the last attempted transaction by giving the above
158+
# three transactions, all executed in parallel, a one second head start.
159+
# This connection should be aborted.
160+
stack: https
161+
tls:
162+
sni: test_sni
171163
delay: 1s
172164

173165
transactions:
@@ -198,11 +190,9 @@ sessions:
198190
# Note that this will delay after the previous 1s delay, so this is really
199191
# a delay of 3s.
200192
- protocol:
201-
- name: tls
202-
sni: test_sni
203-
- name: tcp
204-
- name: ip
205-
193+
stack: https
194+
tls:
195+
sni: test_sni
206196
delay: 2s
207197

208198
transactions:

tests/gold_tests/connect/replays/connect_h2.replay.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@ meta:
2323

2424
sessions:
2525
- protocol:
26-
- name: http
27-
version: 2
28-
- name: tls
26+
stack: http2
27+
tls:
2928
sni: www.example.com
30-
- name: tcp
31-
- name: ip
32-
3329
transactions:
3430
- client-request:
3531
frames:

tests/gold_tests/h2/expect_100_continue.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,10 @@ meta:
1919

2020
sessions:
2121
- protocol:
22-
- name: http
23-
version: '2'
24-
- name: tls
22+
stack: http2
23+
tls:
2524
version: TLSv1.3
2625
sni: data.brian.example.com
27-
- name: tcp
28-
- name: ip
29-
version: '4'
30-
3126
transactions:
3227
- client-request:
3328
headers:

tests/gold_tests/h2/h2get_with_body.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,9 @@ meta:
2525
version: '1.0'
2626
sessions:
2727
- protocol:
28-
- name: http
29-
version: 2
30-
- name: tls
31-
sni: test_sni
32-
- name: tcp
33-
- name: ip
34-
version: 4
28+
stack: http2
29+
tls:
30+
sni: test_sni
3531
transactions:
3632
- client-request:
3733
frames:

tests/gold_tests/h2/http2_close_connection.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,9 @@ meta:
2525
version: '1.0'
2626
sessions:
2727
- protocol:
28-
- name: http
29-
version: 2
30-
- name: tls
31-
sni: test_sni
32-
- name: tcp
33-
- name: ip
34-
version: 4
28+
stack: http2
29+
tls:
30+
sni: test_sni
3531
transactions:
3632
- client-request:
3733
frames:

tests/gold_tests/h2/http2_flow_control.replay.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@ meta:
2323
sessions:
2424

2525
- protocol:
26-
- name: http
27-
version: 2
28-
- name: tls
29-
sni: www.example.com
30-
- name: tcp
31-
- name: ip
32-
26+
stack: http2
27+
tls:
28+
sni: www.example.com
3329
transactions:
3430

3531
- client-request:

0 commit comments

Comments
 (0)