[PR #2668] [CLOSED] Remove top-level `file` configuration parameter #3223

New issue

Closed

opened 2026-03-16 11:31:58 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 11:31:58 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/2668
Author: @pvdrz
Created: 12/11/2024
Status: ❌ Closed

Base: main ← Head: pvdrz/remove-top-file

📝 Commits (1)

d64a346 refactor!: remove file configuration parameter

📊 Changes

23 files changed (+220 additions, -244 deletions)

View changed files

📝 bin/src/hickory-dns.rs (+3 -68)
📝 bin/src/lib.rs (+30 -11)
📝 bin/tests/integration/config_tests.rs (+36 -8)
📝 bin/tests/integration/named_test_rsa_dnssec.rs (+0 -36)
📝 conformance/packages/dns-test/src/templates/hickory.name-server.toml.jinja (+6 -2)
📝 tests/test-data/test_configs/all_supported_dnssec.toml (+19 -8)
📝 tests/test-data/test_configs/chained_blocklist.toml (+15 -5)
📝 tests/test-data/test_configs/consulting_blocklist.toml (+15 -5)
📝 tests/test-data/test_configs/dns_over_https.toml (+3 -1)
📝 tests/test-data/test_configs/dns_over_quic.toml (+3 -1)
📝 tests/test-data/test_configs/dns_over_tls.toml (+3 -1)
📝 tests/test-data/test_configs/dns_over_tls_rustls_and_openssl.toml (+3 -1)
📝 tests/test-data/test_configs/dnssec_with_update.toml (+15 -5)
➖ tests/test-data/test_configs/dnssec_with_update_deprecated.toml (+0 -68)
📝 tests/test-data/test_configs/example.toml (+21 -8)
📝 tests/test-data/test_configs/example_allow_networks.toml (+3 -1)
📝 tests/test-data/test_configs/example_deny_allow_networks.toml (+3 -1)
📝 tests/test-data/test_configs/example_deny_networks.toml (+3 -1)
📝 tests/test-data/test_configs/example_forwarder.toml (+15 -5)
📝 tests/test-data/test_configs/example_recursor.toml (+15 -5)

...and 3 more files

📄 Description

This is done because having a configuration file like:

[[zones]]
zone = "myzone"
zone_type = "Primary"
file = "path1"

[zones.stores]
type = "file"
zone_file_path = "default/localhost.zone

was valid before even though it is not clear which one between "path1"
or "path2" takes precedence.

This is just #2199 but with a more recent base.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/2668 **Author:** [@pvdrz](https://github.com/pvdrz) **Created:** 12/11/2024 **Status:** ❌ Closed **Base:** `main` ← **Head:** `pvdrz/remove-top-file` --- ### 📝 Commits (1) - [`d64a346`](https://github.com/hickory-dns/hickory-dns/commit/d64a3463685715074092f86bd026c46cd33bde01) refactor!: remove `file` configuration parameter ### 📊 Changes **23 files changed** (+220 additions, -244 deletions) <details> <summary>View changed files</summary> 📝 `bin/src/hickory-dns.rs` (+3 -68) 📝 `bin/src/lib.rs` (+30 -11) 📝 `bin/tests/integration/config_tests.rs` (+36 -8) 📝 `bin/tests/integration/named_test_rsa_dnssec.rs` (+0 -36) 📝 `conformance/packages/dns-test/src/templates/hickory.name-server.toml.jinja` (+6 -2) 📝 `tests/test-data/test_configs/all_supported_dnssec.toml` (+19 -8) 📝 `tests/test-data/test_configs/chained_blocklist.toml` (+15 -5) 📝 `tests/test-data/test_configs/consulting_blocklist.toml` (+15 -5) 📝 `tests/test-data/test_configs/dns_over_https.toml` (+3 -1) 📝 `tests/test-data/test_configs/dns_over_quic.toml` (+3 -1) 📝 `tests/test-data/test_configs/dns_over_tls.toml` (+3 -1) 📝 `tests/test-data/test_configs/dns_over_tls_rustls_and_openssl.toml` (+3 -1) 📝 `tests/test-data/test_configs/dnssec_with_update.toml` (+15 -5) ➖ `tests/test-data/test_configs/dnssec_with_update_deprecated.toml` (+0 -68) 📝 `tests/test-data/test_configs/example.toml` (+21 -8) 📝 `tests/test-data/test_configs/example_allow_networks.toml` (+3 -1) 📝 `tests/test-data/test_configs/example_deny_allow_networks.toml` (+3 -1) 📝 `tests/test-data/test_configs/example_deny_networks.toml` (+3 -1) 📝 `tests/test-data/test_configs/example_forwarder.toml` (+15 -5) 📝 `tests/test-data/test_configs/example_recursor.toml` (+15 -5) _...and 3 more files_ </details> ### 📄 Description This is done because having a configuration file like: ```toml [[zones]] zone = "myzone" zone_type = "Primary" file = "path1" [zones.stores] type = "file" zone_file_path = "default/localhost.zone ``` was valid before even though it is not clear which one between `"path1"` or `"path2"` takes precedence. This is just #2199 but with a more recent base. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>