Move data store related code in internal/store

Author: tcr-ableton

internal/trousseau/kv.go internal/store/kv.go

@@ -1,4 +1,4 @@
-package trousseau
+package store
 
 import (
 	"errors"

internal/trousseau/kv_test.go internal/store/kv_test.go

@@ -1,4 +1,4 @@
-package trousseau
+package store
 
 import (
 	"testing"

internal/trousseau/meta.go internal/store/meta.go

@@ -1,4 +1,4 @@
-package trousseau
+package store
 
 import (
 	"errors"

internal/trousseau/store.go internal/store/store.go

@@ -1,4 +1,4 @@
-package trousseau
+package store
 
 type Store struct {
 	Meta Meta    `json:"meta"`

internal/trousseau/actions.go

@@ -10,17 +10,19 @@ import (
 	"os"
 	"strings"
 
+	"github.com/oleiade/trousseau/internal/store"
+
 	"github.com/oleiade/trousseau/pkg/dsn"
 )
 
 func CreateAction(ct CryptoType, ca CryptoAlgorithm, recipients []string) error {
-	meta := Meta{
+	meta := store.Meta{
 		CreatedAt:        time.Now().String(),
 		LastModifiedAt:   time.Now().String(),
 		Recipients:       recipients,
 		TrousseauVersion: TROUSSEAU_VERSION,
 	}
-	store := NewStore(meta)
+	store := store.NewStore(meta)
 
 	tr := Trousseau{
 		CryptoType:      ct,
@@ -182,7 +184,7 @@ func ExportAction(destination io.Writer, plain bool) error {
 func ImportAction(source io.Reader, strategy ImportStrategy, plain bool) error {
 	var data []byte
 	var err error
-	var importedStore *Store = &Store{}
+	var importedStore *store.Store = &store.Store{}
 	var localFilePath string = InferStorePath()
 
 	localTr, err := OpenTrousseau(localFilePath)

internal/trousseau/import.go

@@ -3,14 +3,15 @@ package trousseau
 import (
 	"fmt"
 
+	"github.com/oleiade/trousseau/internal/store"
 	"github.com/urfave/cli"
 )
 
 type ImportStrategy uint32
 
 // ImportStore imports the src encrypted data store content
 // into dest data store, respecting the provided import strategy.
-func ImportStore(src, dest *Store, strategy ImportStrategy) error {
+func ImportStore(src, dest *store.Store, strategy ImportStrategy) error {
 	switch strategy {
 	case IMPORT_YOURS:
 		for key, value := range src.Data {

internal/trousseau/trousseau.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/oleiade/serrure/aes"
 	"github.com/oleiade/serrure/openpgp"
+	"github.com/oleiade/trousseau/internal/store"
 )
 
 type Trousseau struct {
@@ -70,8 +71,8 @@ func FromBytes(d []byte) (*Trousseau, error) {
 	return trousseau, err
 }
 
-func (t *Trousseau) Decrypt() (*Store, error) {
-	var store Store
+func (t *Trousseau) Decrypt() (*store.Store, error) {
+	var store store.Store
 
 	switch t.CryptoAlgorithm {
 	case GPG_ENCRYPTION:
@@ -118,7 +119,7 @@ func (t *Trousseau) Decrypt() (*Store, error) {
 	return &store, nil
 }
 
-func (t *Trousseau) Encrypt(store *Store) error {
+func (t *Trousseau) Encrypt(store *store.Store) error {
 	switch t.CryptoAlgorithm {
 	case GPG_ENCRYPTION:
 		pd, err := json.Marshal(*store)