mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-25 06:25:44 +03:00
30c6676dc0
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.3 to master Squashed commit of the following: commit 925b35b9fedcdcf18474785530189a1eb504e1d6 Merge: 232f18481581891af2
Author: 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: c0d880bed5bd452516
Author: 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
68 lines
1.4 KiB
Go
68 lines
1.4 KiB
Go
package confmigrate
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
type (
|
|
// yarr is the convenience alias for YAML array.
|
|
yarr = []any
|
|
|
|
// yobj is the convenience alias for YAML key-value object.
|
|
yobj = map[string]any
|
|
)
|
|
|
|
// fieldVal returns the value of type T for key from obj. Use [any] if the
|
|
// field's type doesn't matter.
|
|
func fieldVal[T any](obj yobj, key string) (v T, ok bool, err error) {
|
|
val, ok := obj[key]
|
|
if !ok {
|
|
return v, false, nil
|
|
}
|
|
|
|
if val == nil {
|
|
return v, true, nil
|
|
}
|
|
|
|
v, ok = val.(T)
|
|
if !ok {
|
|
return v, false, fmt.Errorf("unexpected type of %q: %T", key, val)
|
|
}
|
|
|
|
return v, true, nil
|
|
}
|
|
|
|
// moveVal copies the value for srcKey from src into dst for dstKey and deletes
|
|
// it from src.
|
|
func moveVal[T any](src, dst yobj, srcKey, dstKey string) (err error) {
|
|
newVal, ok, err := fieldVal[T](src, srcKey)
|
|
if !ok {
|
|
return err
|
|
}
|
|
|
|
dst[dstKey] = newVal
|
|
delete(src, srcKey)
|
|
|
|
return nil
|
|
}
|
|
|
|
// moveSameVal moves the value for key from src into dst.
|
|
func moveSameVal[T any](src, dst yobj, key string) (err error) {
|
|
return moveVal[T](src, dst, key, key)
|
|
}
|
|
|
|
// coalesceError returns the first non-nil error. It is named after function
|
|
// COALESCE in SQL. If all errors are nil, it returns nil.
|
|
//
|
|
// TODO(e.burkov): Replace with [errors.Join].
|
|
//
|
|
// TODO(a.garipov): Think of ways to merge with [aghalg.Coalesce].
|
|
func coalesceError(errors ...error) (res error) {
|
|
for _, err := range errors {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|