From 74c1f9e9a0248dfba75a1a74f32c592343d6f882 Mon Sep 17 00:00:00 2001
From: Adam Gardner <adam.gardner@magicmemories.com>
Date: Wed, 29 Jun 2022 15:31:07 -1000
Subject: [PATCH] fix: use helm secrets view rather than helm secrets dec to
 decrypt

Signed-off-by: Adam Gardner <adam.gardner@magicmemories.com>

chore: fix test case broken by change of helm subcommand

Signed-off-by: Adam Gardner <adam.gardner@magicmemories.com>
---
 pkg/helmexec/exec.go      | 26 +-------------------------
 pkg/helmexec/exec_test.go |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/pkg/helmexec/exec.go b/pkg/helmexec/exec.go
index dc1668c6..ca52d054 100644
--- a/pkg/helmexec/exec.go
+++ b/pkg/helmexec/exec.go
@@ -281,38 +281,14 @@ func (helm *execer) DecryptSecret(context HelmContext, name string, flags ...str
 		helm.logger.Infof("Decrypting secret %v", absPath)
 		preArgs := context.GetTillerlessArgs(helm)
 		env := context.getTillerlessEnv()
-		out, err := helm.exec(append(append(preArgs, "secrets", "dec", absPath), flags...), env)
-		helm.info(out)
+		secretBytes, err := helm.exec(append(append(preArgs, "secrets", "view", absPath), flags...), env)
 		if err != nil {
 			secret.err = err
 			return "", err
 		}
 
-		// HELM_SECRETS_DEC_SUFFIX is used by the helm-secrets plugin to define the output file
-		decSuffix := os.Getenv("HELM_SECRETS_DEC_SUFFIX")
-		if len(decSuffix) == 0 {
-			decSuffix = ".yaml.dec"
-		}
-
-		// helm secrets replaces the extension with its suffix ONLY when the extension is ".yaml"
-		var decFilename string
-		if strings.HasSuffix(absPath, ".yaml") {
-			decFilename = strings.Replace(absPath, ".yaml", decSuffix, 1)
-		} else {
-			decFilename = absPath + decSuffix
-		}
-
-		secretBytes, err := os.ReadFile(decFilename)
-		if err != nil {
-			secret.err = err
-			return "", err
-		}
 		secret.bytes = secretBytes
 
-		if err := os.Remove(decFilename); err != nil {
-			return "", err
-		}
-
 	} else {
 		// Cache hit
 		helm.logger.Debugf("Found secret in cache %v", absPath)
diff --git a/pkg/helmexec/exec_test.go b/pkg/helmexec/exec_test.go
index a00950c6..52b9bcc6 100644
--- a/pkg/helmexec/exec_test.go
+++ b/pkg/helmexec/exec_test.go
@@ -376,7 +376,7 @@ func Test_DecryptSecret(t *testing.T) {
 
 	expected := fmt.Sprintf(`Preparing to decrypt secret %v/secretName
 Decrypting secret %s/secretName
-exec: helm --kube-context dev secrets dec %s/secretName
+exec: helm --kube-context dev secrets view %s/secretName
 Preparing to decrypt secret %s/secretName
 Found secret in cache %s/secretName
 `, cwd, cwd, cwd, cwd, cwd)