Merge pull request #30 from fqutishat/29

feat: Add couchdb prefix

Author: fqutishat

pkg/storage/couchdb/couchdbstore.go

@@ -23,22 +23,33 @@ import (
 	"github.com/trustbloc/edge-core/pkg/storage"
 )
 
+const (
+	blankHostErrMsg           = "hostURL for new CouchDB provider can't be blank"
+	failToCloseProviderErrMsg = "failed to close provider"
+	couchDBNotFoundErr        = "Not Found:"
+)
+
+// Option configures the couchdb provider
+type Option func(opts *Provider)
+
+// WithDBPrefix option is for adding prefix to db name
+func WithDBPrefix(dbPrefix string) Option {
+	return func(opts *Provider) {
+		opts.dbPrefix = dbPrefix
+	}
+}
+
 // Provider represents an CouchDB implementation of the storage.Provider interface
 type Provider struct {
 	hostURL       string
 	couchDBClient *kivik.Client
 	dbs           map[string]*CouchDBStore
+	dbPrefix      string
 	mux           sync.RWMutex
 }
 
-const (
-	blankHostErrMsg           = "hostURL for new CouchDB provider can't be blank"
-	failToCloseProviderErrMsg = "failed to close provider"
-	couchDBNotFoundErr        = "Not Found:"
-)
-
 // NewProvider instantiates Provider
-func NewProvider(hostURL string) (*Provider, error) {
+func NewProvider(hostURL string, opts ...Option) (*Provider, error) {
 	if hostURL == "" {
 		return nil, errors.New(blankHostErrMsg)
 	}
@@ -48,13 +59,23 @@ func NewProvider(hostURL string) (*Provider, error) {
 		return nil, err
 	}
 
-	return &Provider{hostURL: hostURL, couchDBClient: client, dbs: map[string]*CouchDBStore{}}, nil
+	p := &Provider{hostURL: hostURL, couchDBClient: client, dbs: map[string]*CouchDBStore{}}
+
+	for _, opt := range opts {
+		opt(p)
+	}
+
+	return p, nil
 }
 
 // CreateStore creates a new store with the given name.
 func (p *Provider) CreateStore(name string) error {
 	p.mux.Lock()
 
+	if p.dbPrefix != "" {
+		name = p.dbPrefix + "_" + name
+	}
+
 	err := p.couchDBClient.CreateDB(context.Background(), name)
 
 	p.mux.Unlock()
@@ -71,6 +92,10 @@ func (p *Provider) OpenStore(name string) (storage.Store, error) {
 	p.mux.Lock()
 	defer p.mux.Unlock()
 
+	if p.dbPrefix != "" {
+		name = p.dbPrefix + "_" + name
+	}
+
 	// Check cache first
 	cachedStore, existsInCache := p.dbs[name]
 	if existsInCache {
@@ -106,6 +131,10 @@ func (p *Provider) CloseStore(name string) error {
 	p.mux.Lock()
 	defer p.mux.Unlock()
 
+	if p.dbPrefix != "" {
+		name = p.dbPrefix + "_" + name
+	}
+
 	store, exists := p.dbs[name]
 	if !exists {
 		return storage.ErrStoreNotFound

pkg/storage/couchdb/couchdbstore_test.go

@@ -13,11 +13,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/trustbloc/edge-core/pkg/storage"
-
 	"github.com/go-kivik/kivik"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
+
+	"github.com/trustbloc/edge-core/pkg/storage"
 )
 
 const (
@@ -160,7 +160,7 @@ func TestProvider_OpenStore(t *testing.T) {
 
 func TestProvider_CloseStore(t *testing.T) {
 	t.Run("Successfully close a store", func(t *testing.T) {
-		provider := initializeTest(t)
+		provider := initializeTest(t, WithDBPrefix("prefixdb"))
 
 		_ = createAndOpenTestStore(t, provider)
 
@@ -475,8 +475,8 @@ func TestCouchDBStore_ResultsIterator(t *testing.T) {
 	})
 }
 
-func initializeTest(t *testing.T) *Provider {
-	provider, err := NewProvider(couchDBURL)
+func initializeTest(t *testing.T, opts ...Option) *Provider {
+	provider, err := NewProvider(couchDBURL, opts...)
 	require.NoError(t, err)
 
 	resetCouchDB(t, provider)