Setting cachedVersion in a single place

Signed-off-by: Victoria Henry <vhenry@pivotal.io>
cloudfoundry · Nov 13, 2018 · bfbb05b · bfbb05b
1 parent 7fbf154
commit bfbb05b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 29 deletions.
diff --git a/credhub/permissions.go b/credhub/permissions.go
@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 
 	"code.cloudfoundry.org/credhub-cli/credhub/permissions"
-	"github.com/hashicorp/go-version"
 )
 
 type permissionsResponse struct {
@@ -85,7 +84,7 @@ func (ch *CredHub) addV2Permission(path string, actor string, ops []string) (*ht
 }
 
 func (ch *CredHub) AddPermission(path string, actor string, ops []string) (*permissions.Permission, error) {
-	serverVersion, err := ch.getServerVersion()
+	serverVersion, err := ch.ServerVersion()
 	if err != nil {
 		return nil, err
 	}
@@ -117,20 +116,3 @@ func (ch *CredHub) AddPermission(path string, actor string, ops []string) (*perm
 
 	return &response, nil
 }
-
-func (ch *CredHub) getServerVersion() (*version.Version, error) {
-	if ch.cachedServerVersion == "" {
-		serverVersion, err := ch.ServerVersion()
-		if err != nil {
-			return nil, err
-		}
-		ch.cachedServerVersion = serverVersion.String()
-	}
-
-	serverVersion, err := version.NewVersion(ch.cachedServerVersion)
-	if err != nil {
-		return nil, err
-	}
-
-	return serverVersion, nil
-}
diff --git a/credhub/server_version.go b/credhub/server_version.go
@@ -25,6 +25,9 @@ func (ch *CredHub) ServerVersion() (*version.Version, error) {
 			return nil, err
 		}
 	}
+
+	ch.cachedServerVersion = v
+
 	return version.NewVersion(v)
 }
 

diff --git a/credhub/set.go b/credhub/set.go
@@ -8,7 +8,6 @@ import (
 
 	"code.cloudfoundry.org/credhub-cli/credhub/credentials"
 	"code.cloudfoundry.org/credhub-cli/credhub/credentials/values"
-	"github.com/hashicorp/go-version"
 )
 
 // SetValue sets a value credential with a user-provided value.
@@ -81,15 +80,7 @@ func (ch *CredHub) setCredential(name, credType string, value interface{}, cred
 	requestBody["type"] = credType
 	requestBody["value"] = value
 
-	if ch.cachedServerVersion == "" {
-		serverVersion, err := ch.ServerVersion()
-		if err != nil {
-			return err
-		}
-		ch.cachedServerVersion = serverVersion.String()
-	}
-
-	serverVersion, err := version.NewVersion(ch.cachedServerVersion)
+	serverVersion, err := ch.ServerVersion()
 	if err != nil {
 		return err
 	}