replaced DoPutDataCall

handler/generate_certificate.go

@@ -45,7 +45,7 @@ func (s *KeyStorageServerImpl) GenerateCertificate(ctx context.Context, in *api.
 		Content: certificateBytes,
 	}
 
-	result, errors, err := client.DoPutDataCall("keys", in.Uuid+"/"+api.KeyType.String(api.KeyType_CERTIFICATE), certificateMessage, versions.EntitiesManagementAgentApiVersion)
+	result, errors, err := client.PutData("keys", in.Uuid+"/"+api.KeyType.String(api.KeyType_CERTIFICATE), certificateMessage)
 	generateCertificateResponse.StatusList = handlePutDataErrors(generateCertificateResponse.StatusList, errors, err)
 
 	if generateCertificateResponse.StatusList == nil || len(generateCertificateResponse.StatusList) == 0 {

handler/generate_keypair.go

@@ -30,7 +30,6 @@ import (
 	keyutils "code.vereign.com/code/key-storage-agent/utils"
 	"code.vereign.com/code/viam-apis/key-storage-agent/api"
 	"code.vereign.com/code/viam-apis/utils"
-	"code.vereign.com/code/viam-apis/versions"
 	"golang.org/x/net/context"
 )
 
@@ -73,22 +72,19 @@ func (s *KeyStorageServerImpl) GenerateKeyPair(ctx context.Context,
 		return generateKeyPairResponse, nil
 	}
 	encryptedPrivateKey := &api.Key{Content: encryptedPrivateKeyBytes}
-	result, errors, err := client.DoPutDataCall("keys", uuid+"/"+api.KeyType.String(api.KeyType_PRIVATE),
-		encryptedPrivateKey, versions.EntitiesManagementAgentApiVersion)
+	result, errors, err := client.PutData("keys", uuid+"/"+api.KeyType.String(api.KeyType_PRIVATE), encryptedPrivateKey)
 	generateKeyPairResponse.StatusList = keyutils.HandlePutDataErrors(generateKeyPairResponse.StatusList, errors, err)
 
 	if generateKeyPairResponse.StatusList == nil || len(generateKeyPairResponse.StatusList) == 0 {
 		publicKey := &api.Key{Content: publicKeyBytes}
-		result, errors, err = client.DoPutDataCall("keys", uuid+"/"+api.KeyType.String(api.KeyType_PUBLIC),
-			publicKey, versions.EntitiesManagementAgentApiVersion)
+		result, errors, err = client.PutData("keys", uuid+"/"+api.KeyType.String(api.KeyType_PUBLIC), publicKey)
 		generateKeyPairResponse.StatusList = keyutils.HandlePutDataErrors(generateKeyPairResponse.StatusList, errors, err)
 	}
 
 	//duplicate logic of ReserveKeyUUID
 	if generateKeyPairResponse.StatusList == nil || len(generateKeyPairResponse.StatusList) == 0 {
 		emptyKey := &api.Key{Content: []byte{}}
-		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)
 		generateKeyPairResponse.StatusList = keyutils.HandlePutDataErrors(generateKeyPairResponse.StatusList, errors, err)
 	}
 
@@ -103,7 +99,7 @@ func (s *KeyStorageServerImpl) GenerateKeyPair(ctx context.Context,
 
 		encryptedAesKey := &api.Key{Content: encryptedAesKeyBytes}
 
-		result, errors, err = client.DoPutDataCall("keys", uuid+"/"+api.KeyType.String(api.KeyType_AES), encryptedAesKey, versions.EntitiesManagementAgentApiVersion)
+		result, errors, err = client.PutData("keys", uuid+"/"+api.KeyType.String(api.KeyType_AES), encryptedAesKey)
 		generateKeyPairResponse.StatusList = keyutils.HandlePutDataErrors(generateKeyPairResponse.StatusList, errors, err)
 	}
 
@@ -118,7 +114,7 @@ func (s *KeyStorageServerImpl) GenerateKeyPair(ctx context.Context,
 
 		encryptedNonce := &api.Key{Content: encryptedPrivateKeyNonceBytes}
 
-		result, errors, err = client.DoPutDataCall("keys", uuid+"/"+api.KeyType.String(api.KeyType_NONCE), encryptedNonce, versions.EntitiesManagementAgentApiVersion)
+		result, errors, err = client.PutData("keys", uuid+"/"+api.KeyType.String(api.KeyType_NONCE), encryptedNonce)
 		generateKeyPairResponse.StatusList = keyutils.HandlePutDataErrors(generateKeyPairResponse.StatusList, errors, err)
 	}
 

handler/handler.go

@@ -24,7 +24,6 @@ import (
 	"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"
@@ -164,7 +163,7 @@ func (s *KeyStorageServerImpl) SetKey(ctx context.Context, in *api.SetKeyRequest
 		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,8 +174,7 @@ 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)
 			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)
 	}
 
@@ -279,8 +277,7 @@ 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)
 

handler/manage_device_key.go

@@ -22,7 +22,6 @@ import (
 	"code.vereign.com/code/viam-apis/data-storage-agent/client"
 	"code.vereign.com/code/viam-apis/key-storage-agent/api"
 	"code.vereign.com/code/viam-apis/utils"
-	"code.vereign.com/code/viam-apis/versions"
 	"golang.org/x/net/context"
 )
 
@@ -116,7 +115,7 @@ func updateKey(client *client.DataStorageClientImpl, uuid string, keyType api.Ke
 
 	update(key)
 
-	_, errors, err := client.DoPutDataCall("keys", uuid+"/"+api.KeyType.String(keyType), key, versions.EntitiesManagementAgentApiVersion)
+	_, errors, err := client.PutData("keys", uuid+"/"+api.KeyType.String(keyType), key)
 	statusList = keyutils.HandlePutDataErrors(statusList, errors, err)
 	if statusList != nil && len(statusList) > 0 {
 		return statusList