16 refactor deprecated functions

Closes https://code.vereign.com/code/data-storage-agent/issues/16

utils/utils.go

@@ -36,7 +36,6 @@ import (
 	emclient "code.vereign.com/code/viam-apis/entities-management-agent/client"
 	"code.vereign.com/code/viam-apis/key-storage-agent/api"
 	"code.vereign.com/code/viam-apis/utils"
-	"github.com/golang/protobuf/proto"
 )
 
 func GenerateUnusedUUID(client *client.DataStorageClientImpl) (string, error) {
@@ -45,9 +44,10 @@ func GenerateUnusedUUID(client *client.DataStorageClientImpl) (string, error) {
 		uuid, err := NewUUID()
 
 		// check that uuid is not used
-		data, _ := client.DoGetDataCall("keys", uuid+"/"+api.KeyType.String(api.KeyType_PRIVATE))
+		key := &api.Key{}
 
-		if data == nil || data.Errors != "" || err != nil {
+		hasData, _, err := client.GetData("keys", uuid+"/"+api.KeyType.String(api.KeyType_PRIVATE), key)
+		if err != nil || !hasData {
 			return uuid, nil
 		}
 		if count >= 10 {
@@ -136,14 +136,25 @@ func ReadPemBlockFromFile(fileName string) (*pem.Block, error) {
 func GetKey(client *client.DataStorageClientImpl, uuid string, keyType api.KeyType) (*api.Key, []*api.Status) {
 	statusList := []*api.Status{}
 
-	data, _ := client.DoGetDataCall("keys", uuid+"/"+api.KeyType.String(keyType))
-	if data.Errors != "" {
-		statusList = utils.AddStatus(statusList, "400", api.StatusType_ERROR, data.Errors)
+	key := &api.Key{}
+
+	_, errorsString, err := client.GetData("keys", uuid+"/"+api.KeyType.String(keyType), key)
+	if err != nil {
+		statusList = utils.AddStatus(statusList, "400", api.StatusType_ERROR, errorsString)
 		return nil, statusList
 	}
 
-	key := &api.Key{}
-	proto.Unmarshal(data.Data.Data, key)
+	/*
+	if errorsString != "" {
+		statusList = utils.AddStatus(statusList, "400", api.StatusType_ERROR, errorsString)
+		return nil, statusList
+	}
+
+	if !hasData {
+		statusList = utils.AddStatus(statusList, "400", api.StatusType_ERROR, errorsString)
+		return nil, statusList
+	}
+	*/
 
 	return key, nil
 }