From fe22dc0207d80aa8b07c57c365f56e27ca996830 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Thu, 21 May 2026 17:02:09 +0000 Subject: [PATCH] Pull request 2660: 8384-fix-do-caching Updates #8384. Updates #7046. Squashed commit of the following: commit 62b9aece3464a3b38e3b54fb12438dfd34330418 Author: Eugene Burkov Date: Thu May 21 19:51:09 2026 +0300 all: log duration changes commit 6dc85b11a6d72e4da288b7b6dcd20de8620274e1 Author: Eugene Burkov Date: Thu May 21 19:41:09 2026 +0300 all: upd proxy & golibs commit 14d59df3b484b8a0c2e738d098c8793aebccc828 Author: Eugene Burkov Date: Thu May 21 17:23:00 2026 +0300 all: upd proxy commit 43a4553b7f65c2c4df9f9e68cd2838c62ae34a65 Author: Eugene Burkov Date: Thu May 21 12:10:39 2026 +0300 all: log changes commit 1de93b2800e34bcc0472dcb65ea0b6ace85937d8 Author: Eugene Burkov Date: Wed May 20 21:12:12 2026 +0300 all: upd proxy --- CHANGELOG.md | 12 ++++++++++++ go.mod | 4 ++-- go.sum | 8 ++++---- internal/configmigrate/migrations_internal_test.go | 4 ++-- .../TestMigrateConfig_Migrate/v12/output.yml | 2 +- .../testdata/TestMigrateConfig_Migrate/v13/input.yml | 2 +- .../TestMigrateConfig_Migrate/v13/output.yml | 2 +- .../testdata/TestMigrateConfig_Migrate/v14/input.yml | 2 +- .../TestMigrateConfig_Migrate/v14/output.yml | 2 +- .../testdata/TestMigrateConfig_Migrate/v15/input.yml | 2 +- .../TestMigrateConfig_Migrate/v15/output.yml | 2 +- .../testdata/TestMigrateConfig_Migrate/v16/input.yml | 2 +- .../TestMigrateConfig_Migrate/v16/output.yml | 2 +- .../testdata/TestMigrateConfig_Migrate/v17/input.yml | 2 +- .../TestMigrateConfig_Migrate/v17/output.yml | 2 +- .../testdata/TestMigrateConfig_Migrate/v18/input.yml | 2 +- .../TestMigrateConfig_Migrate/v18/output.yml | 2 +- .../testdata/TestMigrateConfig_Migrate/v19/input.yml | 2 +- .../TestMigrateConfig_Migrate/v19/output.yml | 2 +- .../testdata/TestMigrateConfig_Migrate/v20/input.yml | 2 +- .../TestMigrateConfig_Migrate/v20/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v21/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v21/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v22/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v22/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v23/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v23/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v24/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v24/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v25/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v25/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v26/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v26/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v27/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v27/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v28/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v28/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v29/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v29/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v30/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v30/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v31/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v31/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v32/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v32/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v33/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v33/output.yml | 4 ++-- .../testdata/TestMigrateConfig_Migrate/v34/input.yml | 4 ++-- .../TestMigrateConfig_Migrate/v34/output.yml | 4 ++-- internal/dhcpd/options_unix_internal_test.go | 4 ++-- 50 files changed, 96 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9388e08848..edf476705a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,10 +22,22 @@ NOTE: Add new changes BELOW THIS COMMENT. - New `reason` query parameter in `GET /control/querylog`. See `openapi/openapi.yaml` for the full description. +### Changed + +- Duration values in YAML configuration file now support `d` (days) units and has been updated. + + **NOTE:** Any rollback to version below the `v0.107.76` should convert the values back to hours. + ### Deprecated - Query parameter `response_status` in `GET /control/querylog` is now deprecated. Use new `reason` query parameter instead. +### Fixed + +- DNS caching with disabled DNSSEC ([#8384]). + +[#8384]: https://github.com/AdguardTeam/AdGuardHome/issues/8384 + diff --git a/go.mod b/go.mod index 638a0c3c0fc..a8a5628afa5 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/AdguardTeam/AdGuardHome go 1.26.3 require ( - github.com/AdguardTeam/dnsproxy v0.81.3 - github.com/AdguardTeam/golibs v0.35.12 + github.com/AdguardTeam/dnsproxy v0.81.4 + github.com/AdguardTeam/golibs v0.35.13 github.com/AdguardTeam/urlfilter v0.23.2 github.com/NYTimes/gziphandler v1.1.1 github.com/ameshkov/dnscrypt/v2 v2.4.0 diff --git a/go.sum b/go.sum index 20aeb924fb6..0c2ac68ebf5 100644 --- a/go.sum +++ b/go.sum @@ -4,10 +4,10 @@ cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA= cloud.google.com/go/auth v0.20.0/go.mod h1:942/yi/itH1SsmpyrbnTMDgGfdy2BUqIKyd0cyYLc5Q= cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs= cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10= -github.com/AdguardTeam/dnsproxy v0.81.3 h1:WT2ylABCqTDs0vCg6Ik5K6pOfn7Zxnonfk2MpLGvNY4= -github.com/AdguardTeam/dnsproxy v0.81.3/go.mod h1:jcrlawxdZ+jh0TpCfPhT63LmVFuZETH495Sn9bAvQ8s= -github.com/AdguardTeam/golibs v0.35.12 h1:ONAzF/3JG2xp5Xq2G9EChbJiXjkouGjTGLzM8bSEYQQ= -github.com/AdguardTeam/golibs v0.35.12/go.mod h1:8EEGG4auTDd8HV3tBETXLkuxDH9lk9vvFbJn+wbmypg= +github.com/AdguardTeam/dnsproxy v0.81.4 h1:eFM8wzA9sNcK473FdWiy1VRhbgpEM5KighAoJ48O31c= +github.com/AdguardTeam/dnsproxy v0.81.4/go.mod h1:q7Wiq4iiABAFn6EzPqDWhUbXeVcI5O+RvZH/hmXoAaI= +github.com/AdguardTeam/golibs v0.35.13 h1:sflm5/sWhiGwUXNAZObiqVMkdg8HeYVFK2A0oJ27hbU= +github.com/AdguardTeam/golibs v0.35.13/go.mod h1:8EEGG4auTDd8HV3tBETXLkuxDH9lk9vvFbJn+wbmypg= github.com/AdguardTeam/urlfilter v0.23.2 h1:EiS/PQZO/X2S6cduFW6BBoRLyjd6SqZj1ZiFbU1KaFE= github.com/AdguardTeam/urlfilter v0.23.2/go.mod h1:JteAKoeka1Yr2oZ3P94dqYBfPOHWyFaOcu3uZa9Yl+I= github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk= diff --git a/internal/configmigrate/migrations_internal_test.go b/internal/configmigrate/migrations_internal_test.go index 5b7df4254b8..7e0c890a0c1 100644 --- a/internal/configmigrate/migrations_internal_test.go +++ b/internal/configmigrate/migrations_internal_test.go @@ -1433,7 +1433,7 @@ func TestUpgradeSchema22to23(t *testing.T) { want: yobj{ "http": yobj{ "address": "1.2.3.4:8081", - "session_ttl": "720h", + "session_ttl": "30d", }, "schema_version": newSchemaVer, }, @@ -1447,7 +1447,7 @@ func TestUpgradeSchema22to23(t *testing.T) { want: yobj{ "http": yobj{ "address": "[2001:db8::1]:8081", - "session_ttl": "720h", + "session_ttl": "30d", }, "schema_version": newSchemaVer, }, diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v12/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v12/output.yml index 56aaede53a3..9613ec64052 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v12/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v12/output.yml @@ -16,7 +16,7 @@ dns: parental_sensitivity: 0 blocked_response_ttl: 10 querylog_enabled: true - querylog_interval: 720h + querylog_interval: 30d upstream_dns: - tls://1.1.1.1 - tls://1.0.0.1 diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/input.yml index 56aaede53a3..9613ec64052 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/input.yml @@ -16,7 +16,7 @@ dns: parental_sensitivity: 0 blocked_response_ttl: 10 querylog_enabled: true - querylog_interval: 720h + querylog_interval: 30d upstream_dns: - tls://1.1.1.1 - tls://1.0.0.1 diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/output.yml index 09993bfa4b8..7ee5f2ed980 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v13/output.yml @@ -15,7 +15,7 @@ dns: parental_sensitivity: 0 blocked_response_ttl: 10 querylog_enabled: true - querylog_interval: 720h + querylog_interval: 30d upstream_dns: - tls://1.1.1.1 - tls://1.0.0.1 diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/input.yml index ab7ca6df6d2..7a7f361a4e9 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/input.yml @@ -15,7 +15,7 @@ dns: parental_sensitivity: 0 blocked_response_ttl: 10 querylog_enabled: true - querylog_interval: 720h + querylog_interval: 30d upstream_dns: - tls://1.1.1.1 - tls://1.0.0.1 diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/output.yml index 4f9884a5e07..33ccef5f172 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v14/output.yml @@ -15,7 +15,7 @@ dns: parental_sensitivity: 0 blocked_response_ttl: 10 querylog_enabled: true - querylog_interval: 720h + querylog_interval: 30d upstream_dns: - tls://1.1.1.1 - tls://1.0.0.1 diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/input.yml index 42ecb2b3bb3..22279809ef8 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/input.yml @@ -16,7 +16,7 @@ dns: blocked_response_ttl: 10 querylog_enabled: true querylog_file_enabled: true - querylog_interval: 720h + querylog_interval: 30d querylog_size_memory: 1000 upstream_dns: - tls://1.1.1.1 diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/output.yml index 258848f3a45..f2f930cebf5 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v15/output.yml @@ -67,7 +67,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/input.yml index 8d55775c2ed..6288a0b837c 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/input.yml @@ -68,7 +68,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/output.yml index 79144e60102..0294359a02e 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v16/output.yml @@ -67,7 +67,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/input.yml index 5114414f978..40226e311f7 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/input.yml @@ -68,7 +68,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/output.yml index 7b962db0e68..51f87864703 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v17/output.yml @@ -71,7 +71,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/input.yml index 7b962db0e68..51f87864703 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/input.yml @@ -71,7 +71,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/output.yml index 168db4e6518..73ebdd4ac91 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v18/output.yml @@ -78,7 +78,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/input.yml index d1b34a3e38e..c2937d5c3f6 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/input.yml @@ -78,7 +78,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/output.yml index ef60d5149e4..1ef67451c39 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v19/output.yml @@ -85,7 +85,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/input.yml index ef60d5149e4..1ef67451c39 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/input.yml @@ -85,7 +85,7 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/output.yml index 22823490e41..fa1613417cc 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v20/output.yml @@ -85,12 +85,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/input.yml index 14d277960a6..a0b25d4873f 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/input.yml @@ -87,12 +87,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/output.yml index 9b893883d35..2ffb0b3a5a2 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v21/output.yml @@ -90,12 +90,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/input.yml index 887a837e31c..b8ebd375ee8 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/input.yml @@ -92,12 +92,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/output.yml index ec568781962..ab7b8126135 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v22/output.yml @@ -95,12 +95,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/input.yml index aea800656eb..8a5640ba1fc 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/input.yml @@ -96,12 +96,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/output.yml index f8c41b2ba4e..df905d8af86 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v23/output.yml @@ -96,12 +96,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/input.yml index fd3ba93dfb5..c46232b934e 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/input.yml @@ -96,12 +96,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: "" diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/output.yml index 4b3063fb26e..fa49fba3255 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v24/output.yml @@ -96,12 +96,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/input.yml index ba70b5e80c1..d024c6ad08e 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/input.yml @@ -97,12 +97,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/output.yml index 58511b3e51a..8d3806774d5 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v25/output.yml @@ -99,12 +99,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/input.yml index 58511b3e51a..8d3806774d5 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/input.yml @@ -99,12 +99,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/output.yml index 253df602aa3..0d9b248de6d 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v26/output.yml @@ -100,12 +100,12 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: [] statistics: enabled: true - interval: 240h + interval: 10d ignored: [] os: group: '' diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v27/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v27/input.yml index 6472343d188..cb9a38381bc 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v27/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v27/input.yml @@ -100,13 +100,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '.' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '.' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v27/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v27/output.yml index e25b02c748f..51c6da795bf 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v27/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v27/output.yml @@ -100,13 +100,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v28/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v28/input.yml index fa77f22be23..f51c666ba27 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v28/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v28/input.yml @@ -101,13 +101,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v28/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v28/output.yml index a6f1d555e40..8d205974adb 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v28/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v28/output.yml @@ -101,13 +101,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v29/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v29/input.yml index 52130082c2c..5122bb4ed63 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v29/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v29/input.yml @@ -94,13 +94,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v29/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v29/output.yml index 0109834eada..708ea4d2158 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v29/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v29/output.yml @@ -97,13 +97,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v30/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v30/input.yml index 614dd234b0c..f63e89e54a2 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v30/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v30/input.yml @@ -96,13 +96,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v30/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v30/output.yml index 76c67aeb95b..623791f88d5 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v30/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v30/output.yml @@ -97,13 +97,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v31/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v31/input.yml index ff5c55fd928..a404ee19e11 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v31/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v31/input.yml @@ -99,13 +99,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v31/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v31/output.yml index 3ac5b6be44d..653726611f0 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v31/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v31/output.yml @@ -101,13 +101,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v32/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v32/input.yml index 3ac5b6be44d..653726611f0 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v32/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v32/input.yml @@ -101,13 +101,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v32/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v32/output.yml index 2394164e4c3..27f2d96bbc7 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v32/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v32/output.yml @@ -103,13 +103,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v33/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v33/input.yml index 2394164e4c3..27f2d96bbc7 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v33/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v33/input.yml @@ -103,13 +103,13 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' os: diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v33/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v33/output.yml index 5eb2d49047d..afebdfd8a17 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v33/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v33/output.yml @@ -103,14 +103,14 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' ignored_enabled: true statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' ignored_enabled: true diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v34/input.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v34/input.yml index 7d1b4e2bde7..f5c2d142705 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v34/input.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v34/input.yml @@ -106,14 +106,14 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' ignored_enabled: true statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' ignored_enabled: true diff --git a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v34/output.yml b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v34/output.yml index c93f92de0d3..fb96ffc651e 100644 --- a/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v34/output.yml +++ b/internal/configmigrate/testdata/TestMigrateConfig_Migrate/v34/output.yml @@ -112,14 +112,14 @@ user_rules: [] querylog: enabled: true file_enabled: true - interval: 720h + interval: 30d size_memory: 1000 ignored: - '|.^' ignored_enabled: true statistics: enabled: true - interval: 240h + interval: 10d ignored: - '|.^' ignored_enabled: true diff --git a/internal/dhcpd/options_unix_internal_test.go b/internal/dhcpd/options_unix_internal_test.go index 24abf807dcb..aab0030b76a 100644 --- a/internal/dhcpd/options_unix_internal_test.go +++ b/internal/dhcpd/options_unix_internal_test.go @@ -144,8 +144,8 @@ func TestParseOpt(t *testing.T) { in: "24 dur 3y", wantCode: nil, wantVal: nil, - wantErrMsg: `invalid option string "24 dur 3y": decoding dur: time: ` + - `unknown unit "y" in duration "3y"`, + wantErrMsg: `invalid option string "24 dur 3y": decoding dur: ` + + `parsing duration unit: invalid duration`, }, { name: "u8_error", in: "23 u8 256",