mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-08-16 22:20:30 +03:00
Pull request: 4846-migration-fix
Updates #4846. Squashed commit of the following: commit 22e2e89e5390c7b1486fb69064c55da40fc5c7e7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Aug 18 16:25:07 2022 +0300 home: fix yaml object type
This commit is contained in:
parent
257d167002
commit
4a7b4d03a1
@ -28,8 +28,13 @@ and this project adheres to
|
||||
|
||||
- Go 1.18 support. v0.109.0 will require at least Go 1.19 to build.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Migrations from releases older than v0.107.7 failing ([#4846]).
|
||||
|
||||
[#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993
|
||||
[#4795]: https://github.com/AdguardTeam/AdGuardHome/issues/4795
|
||||
[#4846]: https://github.com/AdguardTeam/AdGuardHome/issues/4846
|
||||
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user