Skip to content

Commit 7d8a3a0

Browse files
authored
Fix convert2yaml script to include missed records. (#12713)
* Add record name mappings for IP binding and parent proxy configs Add support for converting legacy record names to YAML format: - proxy.local.incoming_ip_to_bind -> proxy.config.incoming_ip_to_bind - proxy.local.outgoing_ip_to_bind -> proxy.config.outgoing_ip_to_bind - proxy.local.http.parent_proxy.disable_connect_tunneling -> proxy.config.http.parent_proxy.disable_connect_tunneling Updated convert2yaml.py and test gold files accordingly.
1 parent abf073f commit 7d8a3a0

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
```
2-
┌■ 8 Renamed records:
2+
┌■ 11 Renamed records:
33
└┬──» #1 : proxy.config.output.logfile -> proxy.config.output.logfile.name
44
├──» #2 : proxy.config.exec_thread.autoconfig -> proxy.config.exec_thread.autoconfig.enabled
55
├──» #3 : proxy.config.hostdb -> proxy.config.hostdb.enabled
66
├──» #4 : proxy.config.tunnel.prewarm -> proxy.config.tunnel.prewarm.enabled
77
├──» #5 : proxy.config.ssl.origin_session_cache -> proxy.config.ssl.origin_session_cache.enabled
88
├──» #6 : proxy.config.ssl.session_cache -> proxy.config.ssl.session_cache.mode
99
├──» #7 : proxy.config.ssl.TLSv1_3 -> proxy.config.ssl.TLSv1_3.enabled
10-
└──» #8 : proxy.config.ssl.client.TLSv1_3 -> proxy.config.ssl.client.TLSv1_3.enabled
10+
├──» #8 : proxy.config.ssl.client.TLSv1_3 -> proxy.config.ssl.client.TLSv1_3.enabled
11+
├──» #9 : proxy.local.incoming_ip_to_bind -> proxy.config.incoming_ip_to_bind
12+
├──» #10 : proxy.local.outgoing_ip_to_bind -> proxy.config.outgoing_ip_to_bind
13+
└──» #11 : proxy.local.http.parent_proxy.disable_connect_tunneling -> proxy.config.http.parent_proxy.disable_connect_tunneling
1114
```

tests/gold_tests/records/gold/renamed_records.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ records:
44
enabled: 1
55
hostdb:
66
enabled: 1
7+
http:
8+
parent_proxy:
9+
disable_connect_tunneling: 0
10+
incoming_ip_to_bind: 0.0.0.0
11+
outgoing_ip_to_bind: 0.0.0.0
712
output:
813
logfile:
914
name: traffic.out

tests/gold_tests/records/legacy_config/old_records.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ CONFIG proxy.config.ssl.origin_session_cache INT 0
77
CONFIG proxy.config.ssl.session_cache INT 0
88
CONFIG proxy.config.ssl.TLSv1_3 INT 0
99
CONFIG proxy.config.ssl.client.TLSv1_3 INT 0
10+
CONFIG proxy.local.incoming_ip_to_bind STRING 0.0.0.0
11+
CONFIG proxy.local.outgoing_ip_to_bind STRING 0.0.0.0
12+
CONFIG proxy.local.http.parent_proxy.disable_connect_tunneling INT 0

tools/records/convert2yaml.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
'proxy.config.ssl.origin_session_cache': 'proxy.config.ssl.origin_session_cache.enabled',
4949
'proxy.config.ssl.session_cache': 'proxy.config.ssl.session_cache.mode',
5050
'proxy.config.ssl.TLSv1_3': 'proxy.config.ssl.TLSv1_3.enabled',
51-
'proxy.config.ssl.client.TLSv1_3': 'proxy.config.ssl.client.TLSv1_3.enabled'
51+
'proxy.config.ssl.client.TLSv1_3': 'proxy.config.ssl.client.TLSv1_3.enabled',
52+
'proxy.local.incoming_ip_to_bind': 'proxy.config.incoming_ip_to_bind',
53+
'proxy.local.outgoing_ip_to_bind': 'proxy.config.outgoing_ip_to_bind',
54+
'proxy.local.http.parent_proxy.disable_connect_tunneling': 'proxy.config.http.parent_proxy.disable_connect_tunneling'
5255
}
5356

5457
###############################################################################################

0 commit comments

Comments
 (0)