From 39fa4b1f8ea18a713080713c9b4ef3734101d97d Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Fri, 19 Aug 2022 15:19:11 +0300 Subject: [PATCH] cherry-pick: 4846-migration-fix Updates #4846. Squashed commit of the following: commit 22e2e89e5390c7b1486fb69064c55da40fc5c7e7 Author: Ainar Garipov Date: Thu Aug 18 16:25:07 2022 +0300 home: fix yaml object type --- CHANGELOG.md | 5 ----- internal/home/upgrade.go | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0587a04b..12118439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,16 +20,11 @@ and this project adheres to - Weaker cipher suites that use the CBC (cipher block chaining) mode of operation have been disabled ([#2993]). -### Added - -- Bilibili service blocking ([#4795]). - ### Deprecated - Go 1.18 support. v0.109.0 will require at least Go 1.19 to build. [#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993 -[#4795]: https://github.com/AdguardTeam/AdGuardHome/issues/4795 diff --git a/internal/home/upgrade.go b/internal/home/upgrade.go index 15970e7b..4426149c 100644 --- a/internal/home/upgrade.go +++ b/internal/home/upgrade.go @@ -27,7 +27,7 @@ const currentSchemaVersion = 14 // These aliases are provided for convenience. type ( yarr = []any - yobj = map[any]any + yobj = map[string]any ) // Performs necessary upgrade operations if needed @@ -182,12 +182,12 @@ func upgradeSchema2to3(diskConf yobj) error { newDNSConfig := make(yobj) switch v := dnsConfig.(type) { - case map[any]any: + case yobj: for k, v := range v { newDNSConfig[fmt.Sprint(k)] = v } default: - return fmt.Errorf("dns configuration is not a map") + return fmt.Errorf("unexpected type of dns: %T", dnsConfig) } // Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside