16 refactor deprecated functions

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

handler/handler.go

@@ -22,10 +22,7 @@ import (
 	"errors"
 	"log"
 	"strings"
-
 	"code.vereign.com/code/viam-apis/clientutils"
-	"code.vereign.com/code/viam-apis/versions"
-	"github.com/golang/protobuf/proto"
 
 	keyutils "code.vereign.com/code/key-storage-agent/utils"
 	"code.vereign.com/code/viam-apis/authentication"
@@ -100,25 +97,33 @@ func (s *KeyStorageServerImpl) GetKey(ctx context.Context, in *api.GetKeyRequest
 		return getKeyResponse, nil
 	}
 
-	data, err := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+	key := &api.Key{}
+
+	hasData, errorsString, err := client.GetData("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType), key)
 	if err != nil {
-		log.Printf("grpc call DoGetDataCall to DataStorage failed: %s", err)
+		log.Printf("grpc call GetData to DataStorage failed: %s", err)
 		getKeyResponse.Key = nil
 		getKeyResponse.StatusList = utils.AddStatus(getKeyResponse.StatusList,
 			"500", api.StatusType_ERROR, err.Error())
 		return getKeyResponse, nil
 	}
 
-	if data.Errors != "" {
+	if errorsString != "" {
 		getKeyResponse.Key = nil
 		getKeyResponse.StatusList = utils.AddStatus(getKeyResponse.StatusList,
-			"500", api.StatusType_ERROR, data.Errors)
-	} else {
-		key := &api.Key{}
-		proto.Unmarshal(data.Data.Data, key)
-		getKeyResponse.Key = key
+			"500", api.StatusType_ERROR, errorsString)
+	}
+	
+	if !hasData {
+		log.Println("No such key " + in.Uuid)
+		getKeyResponse.Key = nil
+		getKeyResponse.StatusList = utils.AddStatus(getKeyResponse.StatusList,
+			"500", api.StatusType_ERROR, err.Error())
+		return getKeyResponse, nil
 	}
 
+	getKeyResponse.Key = key
+
 	return getKeyResponse, nil
 }
 
@@ -142,29 +147,23 @@ func (s *KeyStorageServerImpl) SetKey(ctx context.Context, in *api.SetKeyRequest
 		return setKeyResponse, nil
 	}
 
-	data, err := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+	key := &api.Key{}
+
+	_, _, err := client.GetData("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType), key)
 	if err != nil {
-		log.Printf("grpc call DoGetDataCall to DataStorage failed: %s", err)
+		log.Printf("grpc call GetData to DataStorage failed: %s", err)
 		setKeyResponse.StatusList = utils.AddStatus(setKeyResponse.StatusList,
 			"500", api.StatusType_ERROR, err.Error())
 		return setKeyResponse, nil
 	}
 
-	if data.Errors != "" {
-		setKeyResponse.StatusList = utils.AddStatus(setKeyResponse.StatusList,
-			"400", api.StatusType_ERROR, data.Errors)
-		return setKeyResponse, nil
-	}
-
-	key := &api.Key{}
-	proto.Unmarshal(data.Data.Data, key)
-	if key != nil && key.Content != nil && len(key.Content) > 0 {
+	if len(key.Content) > 0 {
 		setKeyResponse.StatusList = utils.AddStatus(setKeyResponse.StatusList,
 			"400", api.StatusType_ERROR, "Key is already set")
 		return setKeyResponse, nil
 	}
 
-	result, errors, err := client.DoPutDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType), in.Key, versions.EntitiesManagementAgentApiVersion)
+	result, errors, err := client.PutData("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType), in.Key)
 	setKeyResponse.StatusList = keyutils.HandlePutDataErrors(setKeyResponse.StatusList, errors, err)
 
 	if setKeyResponse.StatusList == nil || len(setKeyResponse.StatusList) == 0 {
@@ -175,10 +174,9 @@ func (s *KeyStorageServerImpl) SetKey(ctx context.Context, in *api.SetKeyRequest
 	if in.KeyType == api.KeyType_PUBLIC {
 		keyContent := base64.StdEncoding.EncodeToString(in.Key.Content)
 
-		_, _, err = client.DoPutDataCallWithString(keyToKeyIdTable, keyContent,
-			in.Uuid, versions.EntitiesManagementAgentApiVersion)
+		_, _, err = client.PutString(keyToKeyIdTable, keyContent, in.Uuid)
 		if err != nil {
-			log.Printf("can't DoPutDataCallWithString: %s", err)
+			log.Printf("can't PutString: %s", err)
 			return nil, err
 		}
 	}
@@ -205,16 +203,16 @@ func (s *KeyStorageServerImpl) ReserveKeyUUID(ctx context.Context, in *api.Reser
 		Content: []byte{},
 	}
 
-	result, errors, err := client.DoPutDataCall("keys", uuid+"/"+api.KeyType.String(api.KeyType_PRIVATE), emptyKey, versions.EntitiesManagementAgentApiVersion)
+	result, errors, err := client.PutData("keys", uuid+"/"+api.KeyType.String(api.KeyType_PRIVATE), emptyKey)
 	reserveKeyUUIDResponse.StatusList = keyutils.HandlePutDataErrors(reserveKeyUUIDResponse.StatusList, errors, err)
 
 	if reserveKeyUUIDResponse.StatusList == nil || len(reserveKeyUUIDResponse.StatusList) == 0 {
-		result, errors, err = client.DoPutDataCall("keys", uuid+"/"+api.KeyType.String(api.KeyType_PUBLIC), emptyKey, versions.EntitiesManagementAgentApiVersion)
+		result, errors, err = client.PutData("keys", uuid+"/"+api.KeyType.String(api.KeyType_PUBLIC), emptyKey)
 		reserveKeyUUIDResponse.StatusList = keyutils.HandlePutDataErrors(reserveKeyUUIDResponse.StatusList, errors, err)
 	}
 
 	if reserveKeyUUIDResponse.StatusList == nil || len(reserveKeyUUIDResponse.StatusList) == 0 {
-		result, errors, err = client.DoPutDataCall("keys", uuid+"/"+api.KeyType.String(api.KeyType_CERTIFICATE), emptyKey, versions.EntitiesManagementAgentApiVersion)
+		result, errors, err = client.PutData("keys", uuid+"/"+api.KeyType.String(api.KeyType_CERTIFICATE), emptyKey)
 		reserveKeyUUIDResponse.StatusList = keyutils.HandlePutDataErrors(reserveKeyUUIDResponse.StatusList, errors, err)
 	}
 
@@ -238,10 +236,9 @@ func (s *KeyStorageServerImpl) GetKeyId(ctx context.Context, in *api.GetKeyIdByK
 
 	keyIdResponse := &api.GetKeyIdByKeyResponse{}
 
-	response, err := dataStorageClient.DoGetDataCall(keyToKeyIdTable, in.PublicKey)
-	if err == nil && response.Data != nil && response.Data.Data != nil {
-		keyID := string(response.Data.Data)
-		keyIdResponse.KeyId = keyID
+	keyId, errorsString, err := dataStorageClient.GetString(keyToKeyIdTable, in.PublicKey)
+	if err == nil && errorsString == "" && keyId != "" {
+		keyIdResponse.KeyId = keyId
 		return keyIdResponse, nil
 	} else {
 		if err != nil {
@@ -260,17 +257,21 @@ func (s *KeyStorageServerImpl) GetKeyId(ctx context.Context, in *api.GetKeyIdByK
 	for _, checkID := range entity.AuthenticationKeys {
 		key := &api.Key{}
 
-		data, err := dataStorageClient.DoGetDataCall("keys", checkID+"/"+api.KeyType_PUBLIC.String())
+		hasData, errorsString, err := dataStorageClient.GetData("keys", checkID+"/"+api.KeyType_PUBLIC.String(), key)
 
 		if err != nil {
-			log.Printf("grpc call GetKeyId to DataStorage failed: %s", err)
+			log.Printf("grpc call GetData to DataStorage failed: %s", err)
 			return nil, err
 		}
 
-		if data.Errors != "" {
-			return nil, errors.New(data.Errors)
-		} else {
-			proto.Unmarshal(data.Data.Data, key)
+		if errorsString != "" {
+			log.Printf("Error: %s", errorsString)
+			return nil, errors.New(errorsString)
+		}
+	
+		if !hasData {
+			log.Println("No such checkID " + checkID)
+			return nil, errors.New("No such checkID " + checkID)
 		}
 
 		keyFromStorage := base64.StdEncoding.EncodeToString(key.Content)
@@ -279,10 +280,9 @@ func (s *KeyStorageServerImpl) GetKeyId(ctx context.Context, in *api.GetKeyIdByK
 			continue
 		}
 
-		_, _, err = dataStorageClient.DoPutDataCallWithString(keyToKeyIdTable, in.PublicKey,
-			checkID, versions.EntitiesManagementAgentApiVersion)
+		_, _, err = dataStorageClient.PutString(keyToKeyIdTable, in.PublicKey, checkID)
 		if err != nil {
-			log.Printf("can't DoPutDataCallWithString: %s", err)
+			log.Printf("can't PutString: %s", err)
 
 			return nil, err
 		}