Merge pull request #220 from nlamirault/feat/sops-errors

Add SOPS user error to logs
fluxcd · Dec 17, 2020 · f0a3147 · f0a3147
2 parents 5efc068 + 460eae2
commit f0a3147
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/controllers/kustomization_decryptor.go b/controllers/kustomization_decryptor.go
@@ -25,6 +25,7 @@ import (
 	"os/exec"
 
 	securejoin "github.com/cyphar/filepath-securejoin"
+	"go.mozilla.org/sops/v3"
 	"go.mozilla.org/sops/v3/aes"
 	"go.mozilla.org/sops/v3/cmd/sops/common"
 	"go.mozilla.org/sops/v3/cmd/sops/formats"
@@ -87,6 +88,9 @@ func (kd *KustomizeDecryptor) Decrypt(res *resource.Resource) (*resource.Resourc
 			},
 		)
 		if err != nil {
+			if userErr, ok := err.(sops.UserError); ok {
+				err = fmt.Errorf(userErr.UserError())
+			}
 			return nil, fmt.Errorf("GetDataKey: %w", err)
 		}