From 38c779740f0c8ae54e4358ab2acbabcda12292bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Fri, 5 Dec 2025 15:23:25 +0100 Subject: [PATCH] Use jinja2 templates in transport-change test - Replace named*.conf.in files with jinja2 templates. - When applying the files use plain cp command to copy the rendered files. (cherry picked from commit 0f37603b1a2de15cbcf37e47bf1b733a664ffbc5) --- ...conf.in => named-http-plain-proxy.conf.j2} | 0 ...plain.conf.in => named-http-plain.conf.j2} | 0 ...in => named-https-proxy-encrypted.conf.j2} | 0 ...onf.in => named-https-proxy-plain.conf.j2} | 0 ...amed-https.conf.in => named-https.conf.j2} | 0 ...amed-proxy.conf.in => named-proxy.conf.j2} | 0 ...f.in => named-tls-proxy-encrypted.conf.j2} | 0 ....conf.in => named-tls-proxy-plain.conf.j2} | 0 .../{named-tls.conf.in => named-tls.conf.j2} | 0 bin/tests/system/transport-change/tests.sh | 24 +++++++++---------- 10 files changed, 12 insertions(+), 12 deletions(-) rename bin/tests/system/transport-change/ns1/{named-http-plain-proxy.conf.in => named-http-plain-proxy.conf.j2} (100%) rename bin/tests/system/transport-change/ns1/{named-http-plain.conf.in => named-http-plain.conf.j2} (100%) rename bin/tests/system/transport-change/ns1/{named-https-proxy-encrypted.conf.in => named-https-proxy-encrypted.conf.j2} (100%) rename bin/tests/system/transport-change/ns1/{named-https-proxy-plain.conf.in => named-https-proxy-plain.conf.j2} (100%) rename bin/tests/system/transport-change/ns1/{named-https.conf.in => named-https.conf.j2} (100%) rename bin/tests/system/transport-change/ns1/{named-proxy.conf.in => named-proxy.conf.j2} (100%) rename bin/tests/system/transport-change/ns1/{named-tls-proxy-encrypted.conf.in => named-tls-proxy-encrypted.conf.j2} (100%) rename bin/tests/system/transport-change/ns1/{named-tls-proxy-plain.conf.in => named-tls-proxy-plain.conf.j2} (100%) rename bin/tests/system/transport-change/ns1/{named-tls.conf.in => named-tls.conf.j2} (100%) diff --git a/bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.in b/bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.in rename to bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-http-plain.conf.in b/bin/tests/system/transport-change/ns1/named-http-plain.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-http-plain.conf.in rename to bin/tests/system/transport-change/ns1/named-http-plain.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.in b/bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.in rename to bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.in b/bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.in rename to bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-https.conf.in b/bin/tests/system/transport-change/ns1/named-https.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-https.conf.in rename to bin/tests/system/transport-change/ns1/named-https.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-proxy.conf.in b/bin/tests/system/transport-change/ns1/named-proxy.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-proxy.conf.in rename to bin/tests/system/transport-change/ns1/named-proxy.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.in b/bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.in rename to bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.in b/bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.in rename to bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.j2 diff --git a/bin/tests/system/transport-change/ns1/named-tls.conf.in b/bin/tests/system/transport-change/ns1/named-tls.conf.j2 similarity index 100% rename from bin/tests/system/transport-change/ns1/named-tls.conf.in rename to bin/tests/system/transport-change/ns1/named-tls.conf.j2 diff --git a/bin/tests/system/transport-change/tests.sh b/bin/tests/system/transport-change/tests.sh index 56a016766d..923b7c7292 100644 --- a/bin/tests/system/transport-change/tests.sh +++ b/bin/tests/system/transport-change/tests.sh @@ -61,45 +61,45 @@ reconfig_server() { config_file="$1" shift echo_i "$message" - copy_setports "ns1/$config_file" "ns1/named.conf" + cp "ns1/$config_file" "ns1/named.conf" rndc_reconfig ns1 10.53.0.1 } run_dig_multitest_expect_success "$testing: a UDP query over Do53" run_dig_multitest_expect_success "$testing: a TCP query over Do53" +tcp -reconfig_server "reconfiguring the server to use PROXYv2" named-proxy.conf.in +reconfig_server "reconfiguring the server to use PROXYv2" named-proxy.conf run_dig_multitest_expect_success "$testing: a UDP query for Do53 over PROXYv2" +proxy run_dig_multitest_expect_success "$testing: a TCP query for Do53 over PROXYv2" +tcp +proxy -reconfig_server "reconfiguring the server to use TLS/DoT" named-tls.conf.in +reconfig_server "reconfiguring the server to use TLS/DoT" named-tls.conf run_dig_multitest_expect_success "$testing: a query over TLS/DoT" +tls -reconfig_server "reconfiguring the server to use TLS/DoT over encrypted PROXYv2" named-tls-proxy-encrypted.conf.in +reconfig_server "reconfiguring the server to use TLS/DoT over encrypted PROXYv2" named-tls-proxy-encrypted.conf run_dig_multitest_expect_success "$testing: a query over TLS/DoT over encrypted PROXYv2" +tls +proxy -reconfig_server "reconfiguring the server to use TLS/DoT over plain PROXYv2" named-tls-proxy-plain.conf.in +reconfig_server "reconfiguring the server to use TLS/DoT over plain PROXYv2" named-tls-proxy-plain.conf run_dig_multitest_expect_success "$testing: a query over TLS/DoT over plain PROXYv2" +tls +proxy +proxy-plain -reconfig_server "reconfiguring the server to use HTTPS/DoH" named-https.conf.in +reconfig_server "reconfiguring the server to use HTTPS/DoH" named-https.conf run_dig_multitest_expect_success "$testing: a query over HTTPS/DoH" +https -reconfig_server "reconfiguring the server to use HTTPS/DoH over encrypted PROXYv2" named-https-proxy-encrypted.conf.in +reconfig_server "reconfiguring the server to use HTTPS/DoH over encrypted PROXYv2" named-https-proxy-encrypted.conf run_dig_multitest_expect_success "$testing: a query over HTTPS/DoH over encrypted PROXYv2" +https +proxy -reconfig_server "reconfiguring the server to use HTTPS/DoH over plain PROXYv2" named-https-proxy-plain.conf.in +reconfig_server "reconfiguring the server to use HTTPS/DoH over plain PROXYv2" named-https-proxy-plain.conf run_dig_multitest_expect_success "$testing: a query over HTTPS/DoH over plain PROXYv2" +https +proxy +proxy-plain -reconfig_server "reconfiguring the server to use plain HTTP/DoH" named-http-plain.conf.in +reconfig_server "reconfiguring the server to use plain HTTP/DoH" named-http-plain.conf run_dig_multitest_expect_success "$testing: a query over plain HTTP/DoH" +http-plain -reconfig_server "reconfiguring the server to use plain HTTP/DoH over PROXYv2" named-http-plain-proxy.conf.in +reconfig_server "reconfiguring the server to use plain HTTP/DoH over PROXYv2" named-http-plain-proxy.conf run_dig_multitest_expect_success "$testing: a query over plain HTTP/DoH over PROXYv2" +http-plain +proxy -reconfig_server "reconfiguring the server back to use TLS/DoT" named-tls.conf.in +reconfig_server "reconfiguring the server back to use TLS/DoT" named-tls.conf run_dig_multitest_expect_success "$testing: a query over TLS/DoT" +tls -reconfig_server "reconfiguring the server back to use HTTPS/DoH" named-https.conf.in +reconfig_server "reconfiguring the server back to use HTTPS/DoH" named-https.conf run_dig_multitest_expect_success "$testing: a query over HTTPS/DoH" +https echo_i "exit status: $status"