Skip to content
Snippets Groups Projects
Commit 21814dba authored by Olgun Cengiz's avatar Olgun Cengiz :drum:
Browse files

gopkg updated and removed log lines

parent 27a06e71
No related branches found
No related tags found
2 merge requests!48Master,!4716 refactor deprecated functions
...@@ -6,10 +6,6 @@ ...@@ -6,10 +6,6 @@
name = "github.com/hashicorp/go-retryablehttp" name = "github.com/hashicorp/go-retryablehttp"
version = "=v0.5.4" version = "=v0.5.4"
[[constraint]]
name = "github.com/golang/protobuf"
version = "1.1.0"
[[constraint]] [[constraint]]
branch = "master" branch = "master"
name = "golang.org/x/net" name = "golang.org/x/net"
......
...@@ -23,7 +23,6 @@ import ( ...@@ -23,7 +23,6 @@ import (
"code.vereign.com/code/viam-apis/key-storage-agent/api" "code.vereign.com/code/viam-apis/key-storage-agent/api"
"code.vereign.com/code/viam-apis/utils" "code.vereign.com/code/viam-apis/utils"
"golang.org/x/net/context" "golang.org/x/net/context"
"log"
) )
func (s *KeyStorageServerImpl) SetAuthorized(ctx context.Context, in *api.SetAuthorizedRequest) (*api.SetAuthorizedResponse, error) { func (s *KeyStorageServerImpl) SetAuthorized(ctx context.Context, in *api.SetAuthorizedRequest) (*api.SetAuthorizedResponse, error) {
...@@ -110,18 +109,13 @@ func (s *KeyStorageServerImpl) updateAll(ctx context.Context, uuid string, updat ...@@ -110,18 +109,13 @@ func (s *KeyStorageServerImpl) updateAll(ctx context.Context, uuid string, updat
func updateKey(client *client.DataStorageClientImpl, uuid string, keyType api.KeyType, update func(*api.Key)) []*api.Status { func updateKey(client *client.DataStorageClientImpl, uuid string, keyType api.KeyType, update func(*api.Key)) []*api.Status {
key, statusList := keyutils.GetKey(client, uuid, keyType) key, statusList := keyutils.GetKey(client, uuid, keyType)
log.Printf("OC-16 key: %v", key)
log.Printf("OC-16 statusList: %v", statusList)
if statusList != nil { if statusList != nil {
return statusList return statusList
} }
update(key) update(key)
log.Printf("OC-16 key: %v", key)
_, errors, err := client.PutData("keys", uuid+"/"+api.KeyType.String(keyType), key) _, errors, err := client.PutData("keys", uuid+"/"+api.KeyType.String(keyType), key)
log.Printf("OC-16 errors: %v", errors)
log.Printf("OC-16 err: %v", err)
statusList = keyutils.HandlePutDataErrors(statusList, errors, err) statusList = keyutils.HandlePutDataErrors(statusList, errors, err)
if statusList != nil && len(statusList) > 0 { if statusList != nil && len(statusList) > 0 {
return statusList return statusList
......
...@@ -138,12 +138,7 @@ func GetKey(client *client.DataStorageClientImpl, uuid string, keyType api.KeyTy ...@@ -138,12 +138,7 @@ func GetKey(client *client.DataStorageClientImpl, uuid string, keyType api.KeyTy
key := &api.Key{} key := &api.Key{}
log.Printf("OC-16 uuid/api.KeyType.String(keyType): %v", uuid+"/"+api.KeyType.String(keyType)) _, errorsString, err := client.GetData("keys", uuid+"/"+api.KeyType.String(keyType), key)
hasData, errorsString, err := client.GetData("keys", uuid+"/"+api.KeyType.String(keyType), key)
log.Printf("OC-16 key: %v", key)
log.Printf("OC-16 hasData: %v", hasData)
log.Printf("OC-16 errorsString: %v", errorsString)
log.Printf("OC-16 err: %v", err)
if err != nil { if err != nil {
statusList = utils.AddStatus(statusList, "400", api.StatusType_ERROR, errorsString) statusList = utils.AddStatus(statusList, "400", api.StatusType_ERROR, errorsString)
return nil, statusList return nil, statusList
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment