go-4devs/config
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

add definition config
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is failing
Details

Browse Source
This commit is contained in:
andrey
2024-01-25 18:17:27 +03:00
parent 303433a336
commit 3945d61f17
52 changed files with 1382 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
provider/etcd/provider.go
View File

@@ -3,14 +3,19 @@ package etcd
import (
"context"
"fmt"
"strings"
"gitoa.ru/go-4devs/config"
"gitoa.ru/go-4devs/config/key"
"gitoa.ru/go-4devs/config/value"
pb "go.etcd.io/etcd/api/v3/mvccpb"
client "go.etcd.io/etcd/client/v3"
)
const (
Name = "etcd"
Separator = "/"
)
var (
_ config.Provider = (*Provider)(nil)
_ config.WatchProvider = (*Provider)(nil)
@@ -21,10 +26,14 @@ type Client interface {
client.Watcher
}
func NewProvider(client Client) *Provider {
func NewProvider(namespace, appName string, client Client) *Provider {
p := Provider{
client: client,
key: key.NsAppName("/"),
key: func(s ...string) string {
return strings.Join(s, Separator)
},
name: Name,
prefix: namespace + Separator + appName,
}
return &p
@@ -32,34 +41,35 @@ func NewProvider(client Client) *Provider {
type Provider struct {
client Client
key config.KeyFactory
}
func (p *Provider) IsSupport(ctx context.Context, key config.Key) bool {
return p.key(ctx, key) != ""
key func(...string) string
name string
prefix string
}
func (p *Provider) Name() string {
return "etcd"
return p.name
}
func (p *Provider) Key(s []string) string {
return p.prefix + Separator + p.key(s...)
}
func (p *Provider) Read(ctx context.Context, key config.Key) (config.Variable, error) {
name := p.key(ctx, key)
func (p *Provider) Value(ctx context.Context, path ...string) (config.Value, error) {
name := p.Key(path)
resp, err := p.client.Get(ctx, name, client.WithPrefix())
if err != nil {
return config.Variable{}, fmt.Errorf("%w: key:%s, prov:%s", err, name, p.Name())
return nil, fmt.Errorf("%w: key:%s, prov:%s", err, name, p.Name())
}
val, err := p.resolve(name, resp.Kvs)
if err != nil {
return config.Variable{}, fmt.Errorf("%w: key:%s, prov:%s", err, name, p.Name())
return nil, fmt.Errorf("%w: key:%s, prov:%s", err, name, p.Name())
}
return val, nil
}
func (p *Provider) Watch(ctx context.Context, key config.Key, callback config.WatchCallback) error {
func (p *Provider) Watch(ctx context.Context, callback config.WatchCallback, path ...string) error {
go func(ctx context.Context, key string, callback config.WatchCallback) {
watch := p.client.Watch(ctx, key, client.WithPrevKV(), client.WithPrefix())
for w := range watch {
@@ -70,7 +80,7 @@ func (p *Provider) Watch(ctx context.Context, key config.Key, callback config.Wa
callback(ctx, oldVar, newVar)
}
}
}(ctx, p.key(ctx, key), callback)
}(ctx, p.Key(path), callback)
return nil
}
@@ -87,23 +97,15 @@ func (p *Provider) getEventKvs(events []*client.Event) ([]*pb.KeyValue, []*pb.Ke
return kvs, old
}
func (p *Provider) resolve(key string, kvs []*pb.KeyValue) (config.Variable, error) {
func (p *Provider) resolve(key string, kvs []*pb.KeyValue) (config.Value, error) {
for _, kv := range kvs {
switch {
case kv == nil:
return config.Variable{
Name: key,
Provider: p.Name(),
Value: nil,
}, nil
return nil, nil
case string(kv.Key) == key:
return config.Variable{
Value: value.JBytes(kv.Value),
Name: key,
Provider: p.Name(),
}, nil
return value.JBytes(kv.Value), nil
}
}
return config.Variable{}, fmt.Errorf("%w: name %s", config.ErrVariableNotFound, key)
return nil, fmt.Errorf("%w: name %s", config.ErrValueNotFound, key)
}

50
provider/etcd/provider_test.go
View File

@@ -23,17 +23,17 @@ func TestProvider(t *testing.T) {
et, err := test.NewEtcd(ctx)
require.NoError(t, err)
provider := etcd.NewProvider(et)
provider := etcd.NewProvider("fdevs", "config", et)
read := []test.Read{
test.NewRead("db_dsn", test.DSN),
test.NewRead("duration", 12*time.Minute),
test.NewRead("port", 8080),
test.NewRead("maintain", true),
test.NewRead("start_at", test.Time("2020-01-02T15:04:05Z")),
test.NewRead("percent", .064),
test.NewRead("count", uint(2020)),
test.NewRead("int64", int64(2021)),
test.NewRead("uint64", int64(2022)),
test.NewRead(test.DSN, "db_dsn"),
test.NewRead(12*time.Minute, "duration"),
test.NewRead(8080, "port"),
test.NewRead(true, "maintain"),
test.NewRead(test.Time("2020-01-02T15:04:05Z"), "start_at"),
test.NewRead(.064, "percent"),
test.NewRead(uint(2020), "count"),
test.NewRead(int64(2021), "int64"),
test.NewRead(int64(2022), "uint64"),
test.NewReadConfig("config"),
}
test.Run(t, provider, read)
@@ -49,11 +49,7 @@ func TestWatcher(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
key := config.Key{
AppName: "config",
Namespace: "fdevs",
Name: "test_watch",
}
key := "test_watch"
et, err := test.NewEtcd(ctx)
require.NoError(t, err)
@@ -65,24 +61,24 @@ func TestWatcher(t *testing.T) {
var cnt, cnt2 int32
prov := etcd.NewProvider(et)
prov := etcd.NewProvider("fdevs", "config", et)
wg := sync.WaitGroup{}
wg.Add(6)
watch := func(cnt *int32) func(ctx context.Context, oldVar, newVar config.Variable) {
return func(ctx context.Context, oldVar, newVar config.Variable) {
watch := func(cnt *int32) func(ctx context.Context, oldVar, newVar config.Value) {
return func(ctx context.Context, oldVar, newVar config.Value) {
switch *cnt {
case 0:
assert.Equal(t, value(*cnt), newVar.Value.String())
assert.Nil(t, oldVar.Value)
assert.Equal(t, value(*cnt), newVar.String())
assert.Nil(t, oldVar)
case 1:
assert.Equal(t, value(*cnt), newVar.Value.String())
assert.Equal(t, value(*cnt-1), oldVar.Value.String())
assert.Equal(t, value(*cnt), newVar.String())
assert.Equal(t, value(*cnt-1), oldVar.String())
case 2:
_, perr := newVar.Value.ParseString()
_, perr := newVar.ParseString()
assert.NoError(t, perr)
assert.Equal(t, "", newVar.Value.String())
assert.Equal(t, value(*cnt-1), oldVar.Value.String())
assert.Equal(t, "", newVar.String())
assert.Equal(t, value(*cnt-1), oldVar.String())
default:
assert.Fail(t, "unexpected watch")
}
@@ -92,8 +88,8 @@ func TestWatcher(t *testing.T) {
}
}
err = prov.Watch(ctx, key, watch(&cnt))
err = prov.Watch(ctx, key, watch(&cnt2))
err = prov.Watch(ctx, watch(&cnt), key)
err = prov.Watch(ctx, watch(&cnt2), key)
require.NoError(t, err)
time.AfterFunc(time.Second, func() {