Skip to content

Allow CLI flags to override config file settings with empty values #2195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toller892 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow CLI flags to override config file settings with empty values #2195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions cmd/sops/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2125,23 +2125,26 @@ func getEncryptConfig(c *cli.Context, fileName string, inputStore common.Store,
}
}
if optionalConfig != nil {
// command line options have precedence
if unencryptedSuffix == "" {
// command line options have precedence over config file settings.
// Use IsSet to distinguish "flag not provided" from "flag explicitly
// set to empty string", so that --encrypted-regex="" properly
// overrides a config file value (fixes #617).
if !c.IsSet("unencrypted-suffix") && unencryptedSuffix == "" {
unencryptedSuffix = optionalConfig.UnencryptedSuffix
}
if encryptedSuffix == "" {
if !c.IsSet("encrypted-suffix") && encryptedSuffix == "" {
encryptedSuffix = optionalConfig.EncryptedSuffix
}
if encryptedRegex == "" {
if !c.IsSet("encrypted-regex") && encryptedRegex == "" {
encryptedRegex = optionalConfig.EncryptedRegex
}
if unencryptedRegex == "" {
if !c.IsSet("unencrypted-regex") && unencryptedRegex == "" {
unencryptedRegex = optionalConfig.UnencryptedRegex
}
if encryptedCommentRegex == "" {
if !c.IsSet("encrypted-comment-regex") && encryptedCommentRegex == "" {
encryptedCommentRegex = optionalConfig.EncryptedCommentRegex
}
if unencryptedCommentRegex == "" {
if !c.IsSet("unencrypted-comment-regex") && unencryptedCommentRegex == "" {
unencryptedCommentRegex = optionalConfig.UnencryptedCommentRegex
}
if !macOnlyEncrypted {
Expand Down