mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-28 18:08:51 +03:00
30c6676dc0
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.3 to master Squashed commit of the following: commit 925b35b9fedcdcf18474785530189a1eb504e1d6 Merge: 232f18481581891af2Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Sep 6 12:48:05 2023 +0300 Merge branch 'master' into AG-25392-confmigrate-vol.3 commit 232f18481bbf3400da0b95bcec7949fb3868bf85 Merge: c0d880bed5bd452516Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 18:54:47 2023 +0300 Merge branch 'master' into AG-25392-confmigrate-vol.3 commit c0d880bed6e3270e88f5377e66b787565e1249ce Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 17:21:57 2023 +0300 confmigrate: fix v15 commit 8a27148b708e6d6a61f8097bf7792aefa1055772 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 15:47:18 2023 +0300 confmigrate: imp gocognit, overall
56 lines
1 KiB
Go
56 lines
1 KiB
Go
package confmigrate
|
|
|
|
import "fmt"
|
|
|
|
// migrateTo6 performs the following changes:
|
|
//
|
|
// # BEFORE:
|
|
// 'schema_version': 5
|
|
// 'clients':
|
|
// - # …
|
|
// 'ip': '127.0.0.1'
|
|
// 'mac': 'AA:AA:AA:AA:AA:AA'
|
|
// # …
|
|
// # …
|
|
//
|
|
// # AFTER:
|
|
// 'schema_version': 6
|
|
// 'clients':
|
|
// - # …
|
|
// 'ip': '127.0.0.1'
|
|
// 'mac': 'AA:AA:AA:AA:AA:AA'
|
|
// 'ids':
|
|
// - '127.0.0.1'
|
|
// - 'AA:AA:AA:AA:AA:AA'
|
|
// # …
|
|
// # …
|
|
func migrateTo6(diskConf yobj) (err error) {
|
|
diskConf["schema_version"] = 6
|
|
|
|
clients, ok, err := fieldVal[yarr](diskConf, "clients")
|
|
if !ok {
|
|
return err
|
|
}
|
|
|
|
for i, client := range clients {
|
|
var c yobj
|
|
c, ok = client.(yobj)
|
|
if !ok {
|
|
return fmt.Errorf("unexpected type of client at index %d: %T", i, client)
|
|
}
|
|
|
|
ids := yarr{}
|
|
for _, id := range []string{"ip", "mac"} {
|
|
val, _, valErr := fieldVal[string](c, id)
|
|
if valErr != nil {
|
|
return fmt.Errorf("client at index %d: %w", i, valErr)
|
|
} else if val != "" {
|
|
ids = append(ids, val)
|
|
}
|
|
}
|
|
|
|
c["ids"] = ids
|
|
}
|
|
|
|
return nil
|
|
}
|