refactor(ezkv): update ezkv

Author: yankeguo

cmd/ezdeploy/main.go

@@ -19,7 +19,7 @@ import (
 )
 
 type syncNamespaceOptions struct {
-	DB         *ezkv.Database
+	DB         *ezkv.KV
 	Kubeconfig string
 	Root       string
 	Namespace  string
@@ -68,7 +68,7 @@ func syncNamespace(ctx context.Context, opts syncNamespaceOptions) (err error) {
 }
 
 type syncResourcesOptions struct {
-	DB         *ezkv.Database
+	DB         *ezkv.KV
 	Resources  []ezdeploy.Resource
 	Title      string
 	Namespace  string
@@ -135,7 +135,7 @@ func syncResources(ctx context.Context, opts syncResourcesOptions) (err error) {
 }
 
 type syncReleaseOptions struct {
-	DB         *ezkv.Database
+	DB         *ezkv.KV
 	Release    ezdeploy.Release
 	Title      string
 	Namespace  string

pkg/ezkv/kv.go

@@ -12,19 +12,19 @@ import (
 
 type Options ezblob.Options
 
-type Database struct {
+type KV struct {
 	blob *ezblob.Blob
 	lock *sync.RWMutex
 	data map[string]string
 }
 
-// Open create an instance and load existed data / 创建一个实例并载入已有的数据
-func Open(ctx context.Context, opts Options) (db *Database, err error) {
+// Open create an instance and load existed data
+func Open(ctx context.Context, opts Options) (db *KV, err error) {
 	var blob *ezblob.Blob
 	if blob, err = ezblob.New(ezblob.Options(opts)); err != nil {
 		return
 	}
-	db = &Database{
+	db = &KV{
 		blob: blob,
 		lock: &sync.RWMutex{},
 		data: map[string]string{},
@@ -37,41 +37,36 @@ func Open(ctx context.Context, opts Options) (db *Database, err error) {
 			return
 		}
 	} else {
-		var gr *gzip.Reader
-		if gr, err = gzip.NewReader(bytes.NewReader(buf)); err != nil {
-			return
-		}
-		if err = gob.NewDecoder(gr).Decode(&db.data); err != nil {
+		if err = db.unmarshal(buf); err != nil {
 			return
 		}
 	}
 	return
 }
 
-// Put set a key-value / 设置一个键值对
-func (db *Database) Put(key string, val string) {
+// Put set a key-value
+func (db *KV) Put(key string, val string) {
 	db.lock.Lock()
 	defer db.lock.Unlock()
 	db.data[key] = val
-	return
 }
 
-// Get retrieve value by key / 读取一个值
-func (db *Database) Get(key string) string {
+// Get retrieve value by key
+func (db *KV) Get(key string) string {
 	db.lock.RLock()
 	defer db.lock.RUnlock()
 	return db.data[key]
 }
 
-// Del delete a value by key / 移除一个值
-func (db *Database) Del(key string) {
+// Del delete a value by key
+func (db *KV) Del(key string) {
 	db.lock.Lock()
 	defer db.lock.Unlock()
 	delete(db.data, key)
 }
 
-// Purge iterate all entries and determine whether to delete / 遍历所有键值对，并决定是否移除某个键值
-func (db *Database) Purge(fn func(key string, val string) (del bool, stop bool)) {
+// Purge iterate all entries and determine whether to delete
+func (db *KV) Purge(fn func(key string, val string) (del bool, stop bool)) {
 	db.lock.Lock()
 	defer db.lock.Unlock()
 	for k, v := range db.data {
@@ -83,13 +78,27 @@ func (db *Database) Purge(fn func(key string, val string) (del bool, stop bool))
 			return
 		}
 	}
+}
+
+func (db *KV) unmarshal(buf []byte) (err error) {
+	db.lock.Lock()
+	defer db.lock.Unlock()
+
+	var gr *gzip.Reader
+	if gr, err = gzip.NewReader(bytes.NewReader(buf)); err != nil {
+		return
+	}
+
+	if err = gob.NewDecoder(gr).Decode(&db.data); err != nil {
+		return
+	}
 	return
 }
 
-// Serialize marshal internal data / 序列化内部数据
-func (db *Database) Serialize() (data []byte, err error) {
+func (db *KV) marshal() (data []byte, err error) {
 	db.lock.RLock()
 	defer db.lock.RUnlock()
+
 	buf := &bytes.Buffer{}
 	gw := gzip.NewWriter(buf)
 	if err = gob.NewEncoder(gw).Encode(&db.data); err != nil {
@@ -102,10 +111,10 @@ func (db *Database) Serialize() (data []byte, err error) {
 	return
 }
 
-// Save persist data to kubernetes / 将内部数据保存到 Kubernetes
-func (db *Database) Save(ctx context.Context) (err error) {
+// Save persist data to kubernetes
+func (db *KV) Save(ctx context.Context) (err error) {
 	var buf []byte
-	if buf, err = db.Serialize(); err != nil {
+	if buf, err = db.marshal(); err != nil {
 		return
 	}
 	if err = db.blob.Save(ctx, buf); err != nil {

pkg/ezkv/kv_test.go

@@ -2,21 +2,19 @@ package ezkv
 
 import (
 	"context"
-	"github.com/stretchr/testify/require"
-	"github.com/yankeguo/ezdeploy/pkg/ezblob"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/clientcmd"
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/yankeguo/ezdeploy/pkg/ezblob"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/clientcmd"
 )
 
-func TestDatabase(t *testing.T) {
-	dirHome, err := os.UserHomeDir()
-	require.NoError(t, err)
-	config, err := clientcmd.BuildConfigFromFlags("", filepath.Join(dirHome, ".kube", "config"))
+func TestKV(t *testing.T) {
+	config, err := clientcmd.BuildConfigFromFlags("", os.Getenv("KUBECONFIG"))
 	require.NoError(t, err)
 	client, err := kubernetes.NewForConfig(config)
 	require.NoError(t, err)
@@ -56,11 +54,12 @@ func TestDatabase(t *testing.T) {
 	err = db.Save(ctx)
 	require.NoError(t, err)
 
-	blob := ezblob.New(ezblob.Options{
+	blob, err := ezblob.New(ezblob.Options{
 		Client:    client,
 		Name:      "ezkv-demo",
 		Namespace: "default",
 	})
+	require.NoError(t, err)
 	err = blob.Delete(ctx)
 	require.NoError(t, err)
 }