fix: separate DetectSopsYaml function to unhide marshalling errors

camptocamp · Aug 2, 2024 · d0f0fa2 · d0f0fa2
1 parent 20c727a
commit d0f0fa2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/helm_wrapper.go b/helm_wrapper.go
@@ -185,13 +185,13 @@ func (c *HelmWrapper) RunHelm() {
 		}
 
 		var encrypted bool
-		file, err := ReadAndUnmarshalYaml(filename)
+		fileData, err := ReadAndUnmarshalYaml(filename)
 		if err != nil {
 			c.ExitCode = 1
-			_ = c.errorf("failed to read file '%s': %s", filename, err)
+			_ = c.errorf("failed to read or unmarshal file '%s': %s", filename, err)
 			return
 		}
-		encrypted = DetectSopsKey(file)
+		encrypted = DetectSopsKey(fileData)
 		if err != nil {
 			return
 		}

diff --git a/utils_test.go b/utils_test.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-    "testing"
-    "io/ioutil"
-    "os"
+	"io/ioutil"
+	"os"
+	"testing"
 )
 
 func TestDetectSopsFile(t *testing.T) {
@@ -18,7 +18,8 @@ func TestDetectSopsFile(t *testing.T) {
 	tmp.WriteString(`---
 secret: hello
 `)
-	res, err := DetectSopsYaml(tmp.Name())
+	fileData, err := ReadAndUnmarshalYaml(tmp.Name())
+	res := DetectSopsKey(fileData)
 	if res != false || err != nil {
 		t.Errorf("DetectSopsYaml(tmp) = %t, %v; want false, <nil>", res, err)
 	}
@@ -36,7 +37,8 @@ sops:
     pgp: []
     version: 3.6.1
 `)
-	res, err = DetectSopsYaml(tmp.Name())
+	fileData, err = ReadAndUnmarshalYaml(tmp.Name())
+	res = DetectSopsKey(fileData)
 	if res != true || err != nil {
 		t.Errorf("DetectSopsYaml(tmp) = %t, %v; want true, <nil>", res, err)
 	}