This is an automated email from the ASF dual-hosted git repository.
dmeden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 7d8a3a0602 Fix convert2yaml script to include missed records. (#12713)
7d8a3a0602 is described below
commit 7d8a3a0602f3a385f952121fc269237d8ac36f16
Author: Damian Meden <[email protected]>
AuthorDate: Wed Dec 3 09:55:32 2025 +0100
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.
---
tests/gold_tests/records/gold/renamed_records.gold | 7 +++++--
tests/gold_tests/records/gold/renamed_records.yaml | 5 +++++
tests/gold_tests/records/legacy_config/old_records.config | 3 +++
tools/records/convert2yaml.py | 5 ++++-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/tests/gold_tests/records/gold/renamed_records.gold
b/tests/gold_tests/records/gold/renamed_records.gold
index c937200fc4..26494440f9 100644
--- a/tests/gold_tests/records/gold/renamed_records.gold
+++ b/tests/gold_tests/records/gold/renamed_records.gold
@@ -1,5 +1,5 @@
```
-┌■ 8 Renamed records:
+┌■ 11 Renamed records:
└┬──» #1 : proxy.config.output.logfile -> proxy.config.output.logfile.name
├──» #2 : proxy.config.exec_thread.autoconfig ->
proxy.config.exec_thread.autoconfig.enabled
├──» #3 : proxy.config.hostdb -> proxy.config.hostdb.enabled
@@ -7,5 +7,8 @@
├──» #5 : proxy.config.ssl.origin_session_cache ->
proxy.config.ssl.origin_session_cache.enabled
├──» #6 : proxy.config.ssl.session_cache ->
proxy.config.ssl.session_cache.mode
├──» #7 : proxy.config.ssl.TLSv1_3 -> proxy.config.ssl.TLSv1_3.enabled
- └──» #8 : proxy.config.ssl.client.TLSv1_3 ->
proxy.config.ssl.client.TLSv1_3.enabled
+ ├──» #8 : proxy.config.ssl.client.TLSv1_3 ->
proxy.config.ssl.client.TLSv1_3.enabled
+ ├──» #9 : proxy.local.incoming_ip_to_bind -> proxy.config.incoming_ip_to_bind
+ ├──» #10 : proxy.local.outgoing_ip_to_bind -> proxy.config.outgoing_ip_to_bind
+ └──» #11 : proxy.local.http.parent_proxy.disable_connect_tunneling ->
proxy.config.http.parent_proxy.disable_connect_tunneling
```
diff --git a/tests/gold_tests/records/gold/renamed_records.yaml
b/tests/gold_tests/records/gold/renamed_records.yaml
index c8e91340f2..0e69778f90 100644
--- a/tests/gold_tests/records/gold/renamed_records.yaml
+++ b/tests/gold_tests/records/gold/renamed_records.yaml
@@ -4,6 +4,11 @@ records:
enabled: 1
hostdb:
enabled: 1
+ http:
+ parent_proxy:
+ disable_connect_tunneling: 0
+ incoming_ip_to_bind: 0.0.0.0
+ outgoing_ip_to_bind: 0.0.0.0
output:
logfile:
name: traffic.out
diff --git a/tests/gold_tests/records/legacy_config/old_records.config
b/tests/gold_tests/records/legacy_config/old_records.config
index 63de6b11c8..3f6968dafa 100644
--- a/tests/gold_tests/records/legacy_config/old_records.config
+++ b/tests/gold_tests/records/legacy_config/old_records.config
@@ -7,3 +7,6 @@ CONFIG proxy.config.ssl.origin_session_cache INT 0
CONFIG proxy.config.ssl.session_cache INT 0
CONFIG proxy.config.ssl.TLSv1_3 INT 0
CONFIG proxy.config.ssl.client.TLSv1_3 INT 0
+CONFIG proxy.local.incoming_ip_to_bind STRING 0.0.0.0
+CONFIG proxy.local.outgoing_ip_to_bind STRING 0.0.0.0
+CONFIG proxy.local.http.parent_proxy.disable_connect_tunneling INT 0
diff --git a/tools/records/convert2yaml.py b/tools/records/convert2yaml.py
index 0643715c08..5ecd91c578 100755
--- a/tools/records/convert2yaml.py
+++ b/tools/records/convert2yaml.py
@@ -48,7 +48,10 @@ Renamed_Records = {
'proxy.config.ssl.origin_session_cache':
'proxy.config.ssl.origin_session_cache.enabled',
'proxy.config.ssl.session_cache': 'proxy.config.ssl.session_cache.mode',
'proxy.config.ssl.TLSv1_3': 'proxy.config.ssl.TLSv1_3.enabled',
- 'proxy.config.ssl.client.TLSv1_3':
'proxy.config.ssl.client.TLSv1_3.enabled'
+ 'proxy.config.ssl.client.TLSv1_3':
'proxy.config.ssl.client.TLSv1_3.enabled',
+ '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'
}
###############################################################################################
