Add support for composite keys

Composite keys help us store objects which are unique
for a given set of pre-existing objects.
Eg: Many profiles can exist for a definition and its
key will have a definition name as a part of the composite key.
P2: Use a predefined interface for keys instead of generic interfaceP{}
P3: Add check for empty strings in stringer interface
P5: Add appropriate keys in other packages.

Issue-ID: MULTICLOUD-531
Change-Id: I314b1fbd718489ae8a45f0f38915c08ca32f9f43
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>

2 files changed, 36 insertions, 12 deletions

diff --git a/src/k8splugin/internal/rb/definition.go b/src/k8splugin/internal/rb/definition.go
index 4eaa9578..2ebbb08a 100644
--- a/src/k8splugin/internal/rb/definition.go
+++ b/src/k8splugin/internal/rb/definition.go
@@ -49,6 +49,14 @@ type DefinitionManager interface {
 	Upload(resID string, inp []byte) error
 }
 
+type definitionKey struct {
+	Key string
+}
+
+func (dk definitionKey) String() string {
+	return dk.Key
+}
+
 // DefinitionClient implements the DefinitionManager
 // It will also be used to maintain some localized state
 type DefinitionClient struct {
@@ -73,7 +81,7 @@ func (v *DefinitionClient) Create(def Definition) (Definition, error) {
 	if def.UUID == "" {
 		def.UUID, _ = uuid.GenerateUUID()
 	}
-	key := def.UUID
+	key := definitionKey{Key: def.UUID}
 
 	err := db.DBconn.Create(v.storeName, key, v.tagMeta, def)
 	if err != nil {
@@ -109,7 +117,8 @@ func (v *DefinitionClient) List() ([]Definition, error) {
 
 // Get returns the Resource Bundle Definition for corresponding ID
 func (v *DefinitionClient) Get(id string) (Definition, error) {
-	value, err := db.DBconn.Read(v.storeName, id, v.tagMeta)
+	key := definitionKey{Key: id}
+	value, err := db.DBconn.Read(v.storeName, key, v.tagMeta)
 	if err != nil {
 		return Definition{}, pkgerrors.Wrap(err, "Get Resource Bundle definition")
 	}
@@ -129,13 +138,14 @@ func (v *DefinitionClient) Get(id string) (Definition, error) {
 
 // Delete the Resource Bundle definition from database
 func (v *DefinitionClient) Delete(id string) error {
-	err := db.DBconn.Delete(v.storeName, id, v.tagMeta)
+	key := definitionKey{Key: id}
+	err := db.DBconn.Delete(v.storeName, key, v.tagMeta)
 	if err != nil {
 		return pkgerrors.Wrap(err, "Delete Resource Bundle Definition")
 	}
 
 	//Delete the content when the delete operation happens
-	err = db.DBconn.Delete(v.storeName, id, v.tagContent)
+	err = db.DBconn.Delete(v.storeName, key, v.tagContent)
 	if err != nil {
 		return pkgerrors.Wrap(err, "Delete Resource Bundle Definition Content")
 	}
@@ -146,6 +156,7 @@ func (v *DefinitionClient) Delete(id string) error {
 // Upload the contents of resource bundle into database
 func (v *DefinitionClient) Upload(id string, inp []byte) error {
 
+	key := definitionKey{Key: id}
 	//Check if definition metadata exists
 	def, err := v.Get(id)
 	if err != nil {
@@ -192,7 +203,7 @@ func (v *DefinitionClient) Upload(id string, inp []byte) error {
 
 	//Encode given byte stream to text for storage
 	encodedStr := base64.StdEncoding.EncodeToString(inp)
-	err = db.DBconn.Create(v.storeName, id, v.tagContent, encodedStr)
+	err = db.DBconn.Create(v.storeName, key, v.tagContent, encodedStr)
 	if err != nil {
 		return pkgerrors.Errorf("Error uploading data to db: %s", err.Error())
 	}
@@ -205,6 +216,7 @@ func (v *DefinitionClient) Upload(id string, inp []byte) error {
 // ExtractTarBall code to create the folder structure on disk
 func (v *DefinitionClient) Download(id string) ([]byte, error) {
 
+	key := definitionKey{Key: id}
 	//ignore the returned data here
 	//Check if id is valid
 	_, err := v.Get(id)
@@ -212,7 +224,7 @@ func (v *DefinitionClient) Download(id string) ([]byte, error) {
 		return nil, pkgerrors.Errorf("Invalid Definition ID provided: %s", err.Error())
 	}
 
-	value, err := db.DBconn.Read(v.storeName, id, v.tagContent)
+	value, err := db.DBconn.Read(v.storeName, key, v.tagContent)
 	if err != nil {
 		return nil, pkgerrors.Wrap(err, "Get Resource Bundle definition content")
 	}
diff --git a/src/k8splugin/internal/rb/profile.go b/src/k8splugin/internal/rb/profile.go
index 086c3486..006fa913 100644
--- a/src/k8splugin/internal/rb/profile.go
+++ b/src/k8splugin/internal/rb/profile.go
@@ -49,6 +49,14 @@ type ProfileManager interface {
 	Upload(resID string, inp []byte) error
 }
 
+type profileKey struct {
+	Key string
+}
+
+func (dk profileKey) String() string {
+	return dk.Key
+}
+
 // ProfileClient implements the ProfileManager
 // It will also be used to maintain some localized state
 type ProfileClient struct {
@@ -95,7 +103,7 @@ func (v *ProfileClient) Create(p Profile) (Profile, error) {
 	if p.UUID == "" {
 		p.UUID, _ = uuid.GenerateUUID()
 	}
-	key := p.UUID
+	key := profileKey{Key: p.UUID}
 
 	err = db.DBconn.Create(v.storeName, key, v.tagMeta, p)
 	if err != nil {
@@ -132,7 +140,8 @@ func (v *ProfileClient) List() ([]Profile, error) {
 
 // Get returns the Resource Bundle Profile for corresponding ID
 func (v *ProfileClient) Get(id string) (Profile, error) {
-	value, err := db.DBconn.Read(v.storeName, id, v.tagMeta)
+	key := profileKey{Key: id}
+	value, err := db.DBconn.Read(v.storeName, key, v.tagMeta)
 	if err != nil {
 		return Profile{}, pkgerrors.Wrap(err, "Get Resource Bundle Profile")
 	}
@@ -152,12 +161,13 @@ func (v *ProfileClient) Get(id string) (Profile, error) {
 
 // Delete the Resource Bundle Profile from database
 func (v *ProfileClient) Delete(id string) error {
-	err := db.DBconn.Delete(v.storeName, id, v.tagMeta)
+	key := profileKey{Key: id}
+	err := db.DBconn.Delete(v.storeName, key, v.tagMeta)
 	if err != nil {
 		return pkgerrors.Wrap(err, "Delete Resource Bundle Profile")
 	}
 
-	err = db.DBconn.Delete(v.storeName, id, v.tagContent)
+	err = db.DBconn.Delete(v.storeName, key, v.tagContent)
 	if err != nil {
 		return pkgerrors.Wrap(err, "Delete Resource Bundle Profile Content")
 	}
@@ -168,6 +178,7 @@ func (v *ProfileClient) Delete(id string) error {
 // Upload the contents of resource bundle into database
 func (v *ProfileClient) Upload(id string, inp []byte) error {
 
+	key := profileKey{Key: id}
 	//ignore the returned data here.
 	_, err := v.Get(id)
 	if err != nil {
@@ -181,7 +192,7 @@ func (v *ProfileClient) Upload(id string, inp []byte) error {
 
 	//Encode given byte stream to text for storage
 	encodedStr := base64.StdEncoding.EncodeToString(inp)
-	err = db.DBconn.Create(v.storeName, id, v.tagContent, encodedStr)
+	err = db.DBconn.Create(v.storeName, key, v.tagContent, encodedStr)
 	if err != nil {
 		return pkgerrors.Errorf("Error uploading data to db %s", err.Error())
 	}
@@ -194,6 +205,7 @@ func (v *ProfileClient) Upload(id string, inp []byte) error {
 // ExtractTarBall code to create the folder structure on disk
 func (v *ProfileClient) Download(id string) ([]byte, error) {
 
+	key := profileKey{Key: id}
 	//ignore the returned data here
 	//Check if id is valid
 	_, err := v.Get(id)
@@ -201,7 +213,7 @@ func (v *ProfileClient) Download(id string) ([]byte, error) {
 		return nil, pkgerrors.Errorf("Invalid Profile ID provided: %s", err.Error())
 	}
 
-	value, err := db.DBconn.Read(v.storeName, id, v.tagContent)
+	value, err := db.DBconn.Read(v.storeName, key, v.tagContent)
 	if err != nil {
 		return nil, pkgerrors.Wrap(err, "Get Resource Bundle Profile content")
 	}