remove etcd provider

provider/etcd/provider.go

@@ -1,111 +0,0 @@
-package etcd
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"gitoa.ru/go-4devs/config"
-	"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)
-)
-
-type Client interface {
-	client.KV
-	client.Watcher
-}
-
-func NewProvider(namespace, appName string, client Client) *Provider {
-	p := Provider{
-		client: client,
-		key: func(s ...string) string {
-			return strings.Join(s, Separator)
-		},
-		name:   Name,
-		prefix: namespace + Separator + appName,
-	}
-
-	return &p
-}
-
-type Provider struct {
-	client Client
-	key    func(...string) string
-	name   string
-	prefix string
-}
-
-func (p *Provider) Name() string {
-	return p.name
-}
-func (p *Provider) Key(s []string) string {
-	return p.prefix + Separator + p.key(s...)
-}
-
-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 nil, fmt.Errorf("%w: key:%s, prov:%s", err, name, p.Name())
-	}
-
-	val, err := p.resolve(name, resp.Kvs)
-	if err != nil {
-		return nil, fmt.Errorf("%w: key:%s, prov:%s", err, name, p.Name())
-	}
-
-	return val, nil
-}
-
-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 {
-			kvs, olds := p.getEventKvs(w.Events)
-			if len(kvs) > 0 {
-				newVar, _ := p.resolve(key, kvs)
-				oldVar, _ := p.resolve(key, olds)
-				callback(ctx, oldVar, newVar)
-			}
-		}
-	}(ctx, p.Key(path), callback)
-
-	return nil
-}
-
-func (p *Provider) getEventKvs(events []*client.Event) ([]*pb.KeyValue, []*pb.KeyValue) {
-	kvs := make([]*pb.KeyValue, 0, len(events))
-	old := make([]*pb.KeyValue, 0, len(events))
-
-	for i := range events {
-		kvs = append(kvs, events[i].Kv)
-		old = append(old, events[i].PrevKv)
-	}
-
-	return kvs, old
-}
-
-func (p *Provider) resolve(key string, kvs []*pb.KeyValue) (config.Value, error) {
-	for _, kv := range kvs {
-		switch {
-		case kv == nil:
-			return nil, nil
-		case string(kv.Key) == key:
-			return value.JBytes(kv.Value), nil
-		}
-	}
-
-	return nil, fmt.Errorf("%w: name %s", config.ErrValueNotFound, key)
-}

provider/etcd/provider_test.go

@@ -1,115 +0,0 @@
-package etcd_test
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gitoa.ru/go-4devs/config"
-	"gitoa.ru/go-4devs/config/provider/etcd"
-	"gitoa.ru/go-4devs/config/test"
-)
-
-func TestProvider(t *testing.T) {
-	t.Parallel()
-
-	ctx := context.Background()
-
-	et, err := test.NewEtcd(ctx)
-	require.NoError(t, err)
-
-	provider := etcd.NewProvider("fdevs", "config", et)
-	read := []test.Read{
-		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)
-}
-
-func value(cnt int32) string {
-	return fmt.Sprintf("test data: %d", cnt)
-}
-
-func TestWatcher(t *testing.T) {
-	t.Parallel()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	key := "test_watch"
-
-	et, err := test.NewEtcd(ctx)
-	require.NoError(t, err)
-
-	defer func() {
-		_, err = et.KV.Delete(context.Background(), "fdevs/config/test_watch")
-		require.NoError(t, err)
-	}()
-
-	var cnt, cnt2 int32
-
-	prov := etcd.NewProvider("fdevs", "config", et)
-	wg := sync.WaitGroup{}
-	wg.Add(6)
-
-	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.String())
-				assert.Nil(t, oldVar)
-			case 1:
-				assert.Equal(t, value(*cnt), newVar.String())
-				assert.Equal(t, value(*cnt-1), oldVar.String())
-			case 2:
-				_, perr := newVar.ParseString()
-				assert.NoError(t, perr)
-				assert.Equal(t, "", newVar.String())
-				assert.Equal(t, value(*cnt-1), oldVar.String())
-			default:
-				assert.Fail(t, "unexpected watch")
-			}
-
-			wg.Done()
-			atomic.AddInt32(cnt, 1)
-		}
-	}
-
-	err = prov.Watch(ctx, watch(&cnt), key)
-	err = prov.Watch(ctx, watch(&cnt2), key)
-	require.NoError(t, err)
-
-	time.AfterFunc(time.Second, func() {
-		_, err = et.KV.Put(ctx, "fdevs/config/test_watch", value(0))
-		require.NoError(t, err)
-		_, err = et.KV.Put(ctx, "fdevs/config/test_watch", value(1))
-		require.NoError(t, err)
-		_, err = et.KV.Delete(ctx, "fdevs/config/test_watch")
-		require.NoError(t, err)
-	})
-
-	time.AfterFunc(time.Second*10, func() {
-		assert.Fail(t, "failed watch after 5 sec")
-		cancel()
-	})
-
-	go func() {
-		wg.Wait()
-		cancel()
-	}()
-
-	<-ctx.Done()
-}