kresctl: migrate: rename '/defer/enabled' to /defer/enable'

- NEWS: added missing entry

diff --git a/NEWS b/NEWS
index 9085fef6c497e2cbd41fc677380913c33358dddc..dcad338d65b4390a3bfe2c674821d2f1777408f2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ https://www.knot-resolver.cz/documentation/v6.0.16/upgrading.html
 - Renamed/moved options in the declarative configuration model (YAML). (!1672)
   - /cache/garbage-collector -> /cache/garbage-collector/enable
   - /cache/prefetch/prediction -> /cache/prefetch/prediction/enable
+  - /defer/enabled -> /defer/enable
   - /dns64: true|false -> /dns64/enable: true|false
   - /dns64/rev-ttl -> /dns64/reverse-ttl
   - /dnssec: true|false -> /dnssec/enable: true|false

diff --git a/etc/config/config.migrate-test.yaml b/etc/config/config.migrate-test.yaml
index 7666e8b8a69faf4e16e81cc3fdd1ea7a66d44baf..8bf2ab7e873548838ceb6adcc368c9772e5714aa 100644 (file)
--- a/etc/config/config.migrate-test.yaml
+++ b/etc/config/config.migrate-test.yaml
@@ -6,6 +6,9 @@ cache:
       window: 15m
       period: 24
 
+defer:
+  enabled: true
+
 dns64:
   rev-ttl: 1d
 

diff --git a/python/knot_resolver/client/commands/migrate.py b/python/knot_resolver/client/commands/migrate.py
index 6a7eda14d08e356159ef0114e923e1de927d53f0..afd1e80be0f1844831884a246acb21e4028ac56d 100644 (file)
--- a/python/knot_resolver/client/commands/migrate.py
+++ b/python/knot_resolver/client/commands/migrate.py
@@ -141,6 +141,7 @@ class MigrateCommand(Command):
                         _add(new, "/cache/prefetch/prediction/enable", False)
                     else:
                         _add(new, "/cache/prefetch/prediction/enable", True)
+        _rename(new, "/defer/enabled", "/defer/enable")
         dns64_key = "dns64"
         if dns64_key in new:
             if new[dns64_key] is False: