Using embedded lock for vault struct

Using an embedded lock instead of an explicit variable

Issue-ID: AAF-92
Change-Id: Ia7bd43a40ec50664b042afa9e46091f14122ba5c
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>

diff --git a/sms-service/src/sms/backend/vault.go b/sms-service/src/sms/backend/vault.go
index ac5cc67..fa8316c 100644 (file)
--- a/sms-service/src/sms/backend/vault.go
+++ b/sms-service/src/sms/backend/vault.go
@@ -31,12 +31,12 @@ import (
 
 // Vault is the main Struct used in Backend to initialize the struct
 type Vault struct {
+       sync.Mutex
        engineType        string
        initRoleDone      bool
        policyName        string
        roleID            string
        secretID          string
-       tokenLock         sync.Mutex
        vaultAddress      string
        vaultClient       *vaultapi.Client
        vaultMount        string
@@ -321,8 +321,8 @@ func (v *Vault) initRole() error {
 // Function checkToken() gets called multiple times to create
 // temporary tokens
 func (v *Vault) checkToken() error {
-       v.tokenLock.Lock()
-       defer v.tokenLock.Unlock()
+       v.Lock()
+       defer v.Unlock()
 
        // Init Role if it is not yet done
        // Role needs to be created before token can be created