Hide pogreb type inside kv.DB struct

README.md

@@ -106,5 +106,6 @@ kubeswap delete -n test --db /tmp/kubeswap.db
 - Compress the db into a single file, to enable
   - simplicity: the user has a single file with all the database, not a directory
   - backup/restore: easier to backup, restore or move between machines
+- Refine the TUI list to show only the important stuff (remove '?' option for example)
 - Cleanup! like a lot...
 - Performance (we can just copy files if we know the name, not creating a kubeconfig.Kubeconfig etc etc...)

cmd/add.go

@@ -45,7 +45,7 @@ func addFunc(cmd *cobra.Command, args []string) {
 		retcode = 1
 		return
 	}
-	defer db.CloseDB()
+	defer db.Close()
 
 	log.Debug().Str("action", "adding new kubeconfig to the database").Str("key", kc.Name).Str("value", kc.Content).Send()
 

cmd/delete.go

@@ -34,7 +34,7 @@ func deleteFunc(cmd *cobra.Command, args []string) {
 		retcode = 1
 		return
 	}
-	defer db.CloseDB()
+	defer db.Close()
 
 	log.Debug().Str("action", "delete kubeconfig from db").Str("key", name).Send()
 

cmd/list.go

@@ -31,7 +31,7 @@ func listFunc(cmd *cobra.Command, args []string) {
 		retcode = 1
 		return
 	}
-	defer db.CloseDB()
+	defer db.Close()
 
 	var list []pterm.BulletListItem
 

cmd/print.go

@@ -33,7 +33,7 @@ func printFunc(cmd *cobra.Command, args []string) {
 	if err != nil {
 		log.Error().Str("error", err.Error()).Msg("error opening kv database")
 	}
-	defer db.CloseDB()
+	defer db.Close()
 
 	kc, err := db.GetKubeconfig(name)
 	if err != nil {

cmd/printall.go

@@ -29,7 +29,7 @@ func printallFunc(cmd *cobra.Command, args []string) {
 	if err != nil {
 		log.Error().Str("error", err.Error()).Msg("error opening kv database")
 	}
-	defer db.CloseDB()
+	defer db.Close()
 
 	items, err := db.GetAll()
 	if err != nil {

cmd/use.go

@@ -35,7 +35,7 @@ func useFunc(cmd *cobra.Command, args []string) {
 		retcode = 1
 		return
 	}
-	defer db.CloseDB()
+	defer db.Close()
 
 	if db.IsEmpty() {
 		log.Info().Msg("there are no kubeconfigs in the database. Exiting...")

pkg/kv/kv.go

@@ -11,7 +11,7 @@ import (
 )
 
 type DB struct {
-	*pogreb.DB
+	db *pogreb.DB
 }
 
 func Open(path string) (*DB, error) {
@@ -25,25 +25,25 @@ func Open(path string) (*DB, error) {
 	return &DB{db}, nil
 }
 
-func (kv *DB) CloseDB() {
+func (kv *DB) Close() {
 	// this should:
 	// - compress the real database folder into a single file
-	err := kv.Close()
+	err := kv.db.Close()
 	if err != nil {
 		log.Fatalf("error closing db: %s", err)
 	}
 }
 
 func (kv *DB) GetKubeconfig(key string) (*kubeconfig.Kubeconfig, error) {
-	exist, err := kv.Has([]byte(key))
+	exist, err := kv.db.Has([]byte(key))
 	if err != nil {
 		return nil, err
 	}
 	if !exist {
 		return nil, fmt.Errorf("key does not exist in the db: %s", key)
 	}
 
-	val, err := kv.Get([]byte(key))
+	val, err := kv.db.Get([]byte(key))
 	if err != nil {
 		return nil, err
 	}
@@ -54,31 +54,31 @@ func (kv *DB) GetKubeconfig(key string) (*kubeconfig.Kubeconfig, error) {
 }
 
 func (kv *DB) PutKubeconfig(key string, value []byte) error {
-	exist, err := kv.Has([]byte(key))
+	exist, err := kv.db.Has([]byte(key))
 	if err != nil {
 		return err
 	}
 	if exist {
 		return fmt.Errorf("key already exists in the db: %s", key)
 	}
 
-	err = kv.Put([]byte(key), value)
+	err = kv.db.Put([]byte(key), value)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
 func (kv *DB) DeleteKubeconfig(key string) error {
-	exist, err := kv.Has([]byte(key))
+	exist, err := kv.db.Has([]byte(key))
 	if err != nil {
 		return err
 	}
 	if !exist {
 		return fmt.Errorf("key does not exist in the db: %s", key)
 	}
 
-	err = kv.Delete([]byte(key))
+	err = kv.db.Delete([]byte(key))
 	if err != nil {
 		return err
 	}
@@ -87,7 +87,7 @@ func (kv *DB) DeleteKubeconfig(key string) error {
 
 func (kv *DB) GetAll() ([]kubeconfig.Kubeconfig, error) {
 	var items []kubeconfig.Kubeconfig
-	it := kv.Items()
+	it := kv.db.Items()
 	for {
 		key, val, err := it.Next()
 		if err == pogreb.ErrIterationDone {
@@ -106,5 +106,5 @@ func (kv *DB) GetAll() ([]kubeconfig.Kubeconfig, error) {
 }
 
 func (kv *DB) IsEmpty() bool {
-	return kv.Count() == 0
+	return kv.db.Count() == 0
 }