Skip to content

cmd/sops: use --config in subcommands #559

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

Closed
q3k wants to merge 1 commit into from
Closed

cmd/sops: use --config in subcommands #559

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: 13 additions & 4 deletions cmd/sops/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func main() {
if c.Bool("verbose") || c.GlobalBool("verbose") {
logging.SetLevel(logrus.DebugLevel)
}
configPath, err := config.FindConfigFile(".")
configPath, err := getConfigPath(c, ".")
if err != nil {
return common.NewExitError(err, codes.ErrorGeneric)
}
Expand Down Expand Up @@ -418,7 +418,7 @@ func main() {
},
}, keyserviceFlags...),
Action: func(c *cli.Context) error {
configPath, err := config.FindConfigFile(".")
configPath, err := getConfigPath(c, ".")
if err != nil {
return common.NewExitError(err, codes.ErrorGeneric)
}
Expand Down Expand Up @@ -958,13 +958,22 @@ func keyGroups(c *cli.Context, file string) ([]sops.KeyGroup, error) {
return []sops.KeyGroup{group}, nil
}

// getConfigPath returns the config path that should be used: either one explicitly set by the 'config' command line flag, or
// by travering up the filesystem.
func getConfigPath(c *cli.Context, root string) (string, error) {
if c.GlobalString("config") != "" {
return c.GlobalString("config"), nil
}
return config.FindConfigFile(root)
}

// loadConfig will look for an existing config file, either provided through the command line, or using config.FindConfigFile.
// Since a config file is not required, this function does not error when one is not found, and instead returns a nil config pointer
func loadConfig(c *cli.Context, file string, kmsEncryptionContext map[string]*string) (*config.Config, error) {
var err error
var configPath string
if c.String("config") != "" {
configPath = c.String("config")
if c.GlobalString("config") != "" {
configPath = c.GlobalString("config")
} else {
// Ignore config not found errors returned from FindConfigFile since the config file is not mandatory
configPath, err = config.FindConfigFile(".")
Expand Down