mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-03-31 14:33:32 +03:00
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.2 to master
Squashed commit of the following:
commit 7bcdf443135523022a7e5ed6b2da05fcd784a896
Merge: 4c25331b5 f84ff2bd0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:33:08 2023 +0300
Merge branch 'master' into AG-25392-confmigrate-vol.2
commit 4c25331b507078670e7f3505384b53179a210292
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:14:23 2023 +0300
confmigrate: fix fmt
commit d7dbfc46a7f825d248cb028d50b60eede941bf67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:07:25 2023 +0300
confmigrate: imp code
commit cd29729a23d1782a0b5fbd1e9153fe61ff3dbc71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 18:21:14 2023 +0300
confmigrate: imp code, split files
commit f075a14c251c68a13152709e14a326ad17c2f889
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 17:19:47 2023 +0300
confmigrate: imp code
commit 37335597e7870184528c1d868e2d5bd5525a74bb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 16:54:13 2023 +0300
confmigrate: imp code, docs
commit 1df0ddcad99e5056b4989d17490ca4b44ae17838
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 14:41:52 2023 +0300
all: add testdata
commit e62690dbe8e458811bbd6b115b4449affa729560
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 31 16:13:14 2023 +0300
all: imp code
commit 0934d5974b31a58b31b12412c3cd1a50810ffc4f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:50:52 2023 +0300
home: don't reread config
commit 7566ab6f330460bd608aae6dc0428a631e2fa4e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:43:57 2023 +0300
all: imp code
commit 6f6aae6290f8d3101f3678ecc705eee7030ad8d5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:25:46 2023 +0300
all: introduce confmigrate
66 lines
1.4 KiB
Go
66 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
|
|
}
|