fix: correct skip decryption (#106)

buttahtoast · Jan 25, 2024 · 9b32c84 · 9b32c84
1 parent b25fec3
commit 9b32c84
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/argocd-cmp/cmp.yaml b/argocd-cmp/cmp.yaml
@@ -17,6 +17,5 @@ spec:
     - "."
     - --env-regex
     - "^ARGOCD_ENV_.*$"
-    - --must-decrypt
     - --kubeconfig
     - "/etc/kubernetes/kubeconfig"
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -22,7 +22,6 @@ type Configuration struct {
 	SecretNamespace   string        `mapstructure:"secret-namespace"`
 	EjsonKey          []string      `mapstructure:"ejson-key"`
 	SkipDecrypt       bool          `mapstructure:"skip-decrypt"`
-	MustDecrypt       bool          `mapstructure:"must-decrypt"`
 	KubectlTimeout    time.Duration `mapstructure:"kubectl-timeout"`
 	Kubeconfig        string        `mapstructure:"kubeconfig"`
 	KubeAPI           string        `mapstructure:"kube-api"`

diff --git a/subst/cmd/render.go b/subst/cmd/render.go
@@ -48,8 +48,8 @@ func addRenderFlags(flags *flag.FlagSet) {
 	flags.StringSlice("ejson-key", []string{}, heredoc.Doc(`
 			Specify EJSON Private key used for decryption.
 			May be specified multiple times or separate values with commas`))
-	flags.Bool("must-decrypt", false, heredoc.Doc(`
-			Fail if not all ejson files can be decrypted`))
+	flags.Bool("skip-decrypt", false, heredoc.Doc(`
+			Skip decryption`))
 	flags.String("env-regex", "^ARGOCD_ENV_.*$", heredoc.Doc(`
 	        Only expose environment variables that match the given regex`))
 	flags.String("output", "yaml", heredoc.Doc(`