From 7273545decd3fa3f18954511810662b8ed49263c Mon Sep 17 00:00:00 2001
From: Travis Groth <travis@netfoo.org>
Date: Tue, 6 Aug 2019 18:20:13 -0400
Subject: [PATCH] fix tests

---
 pkg/helmexec/exec.go      | 11 ++++-------
 pkg/helmexec/exec_test.go |  8 +++++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkg/helmexec/exec.go b/pkg/helmexec/exec.go
index fea88f191..9a72f6591 100644
--- a/pkg/helmexec/exec.go
+++ b/pkg/helmexec/exec.go
@@ -132,20 +132,18 @@ func (helm *execer) List(context HelmContext, filter string, flags ...string) (s
 }
 
 func (helm *execer) DecryptSecret(context HelmContext, name string, flags ...string) (string, error) {
-
-	var secret *decryptedSecret
-
 	absPath, err := filepath.Abs(name)
 	if err != nil {
 		return "", err
 	}
 
-	helm.logger.Debugf("Waiting for cache mutext for secret %v", absPath)
+	helm.logger.Debugf("Preparing to decrypt secret %v", absPath)
 	helm.decryptedSecretMutex.Lock()
-	helm.logger.Debugf("Cache mutex for secret %v acquired", absPath)
+
+	secret, ok := helm.decryptedSecrets[absPath]
 
 	// Cache miss
-	if _, ok := helm.decryptedSecrets[absPath]; !ok {
+	if !ok {
 
 		secret = &decryptedSecret{}
 		helm.decryptedSecrets[absPath] = secret
@@ -184,7 +182,6 @@ func (helm *execer) DecryptSecret(context HelmContext, name string, flags ...str
 		// Cache hit
 		helm.logger.Debugf("Found secret in cache %v", absPath)
 
-		secret = helm.decryptedSecrets[absPath]
 		secret.mutex.RLock()
 		helm.decryptedSecretMutex.Unlock()
 		defer secret.mutex.RUnlock()
diff --git a/pkg/helmexec/exec_test.go b/pkg/helmexec/exec_test.go
index fd6452196..59144ae8a 100644
--- a/pkg/helmexec/exec_test.go
+++ b/pkg/helmexec/exec_test.go
@@ -231,11 +231,13 @@ func Test_DecryptSecret(t *testing.T) {
 	// Run again for caching
 	helm.DecryptSecret(HelmContext{}, "secretName")
 
-	expected := fmt.Sprintf(`Decrypting secret %s/secretName
+	expected := fmt.Sprintf(`Preparing to decrypt secret %v/secretName
+Decrypting secret %s/secretName
 exec: helm secrets dec %s/secretName --kube-context dev
 exec: helm secrets dec %s/secretName --kube-context dev: 
-Using cached secret %s/secretName
-`, cwd, cwd, cwd, cwd)
+Preparing to decrypt secret %s/secretName
+Found secret in cache %s/secretName
+`, cwd, cwd, cwd, cwd, cwd, cwd)
 	if buffer.String() != expected {
 		t.Errorf("helmexec.DecryptSecret()\nactual = %v\nexpect = %v", buffer.String(), expected)
 	}