glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-04-27 17:17:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make getEnvConfig private

Browse source
This commit is contained in:
Ville Skyttä 2023-12-11 17:37:09 +02:00
parent 97b70019e9
commit 7aa559d693
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
completions.go
View file

@ -212,7 +212,7 @@ func (c *Command) initCompleteCmd(args []string) {
// 2- Even without completions, we need to print the directive // 2- Even without completions, we need to print the directive
} }
noDescriptions := cmd.CalledAs() == ShellCompNoDescRequestCmd || GetEnvConfig(cmd, configEnvVarSuffixDescriptions) == configEnvVarDescriptionsOff noDescriptions := cmd.CalledAs() == ShellCompNoDescRequestCmd || getEnvConfig(cmd, configEnvVarSuffixDescriptions) == configEnvVarDescriptionsOff
noActiveHelp := GetActiveHelpConfig(finalCmd) == activeHelpGlobalDisable noActiveHelp := GetActiveHelpConfig(finalCmd) == activeHelpGlobalDisable
out := finalCmd.OutOrStdout() out := finalCmd.OutOrStdout()
for _, comp := range completions { for _, comp := range completions {
@ -920,12 +920,12 @@ func configEnvVar(name, suffix string) string {
return v return v
} }
// GetEnvConfig returns the value of the configuration environment variable // getEnvConfig returns the value of the configuration environment variable
// <PROGRAM>_<SUFFIX> where <PROGRAM> is the name of the root command in upper // <PROGRAM>_<SUFFIX> where <PROGRAM> is the name of the root command in upper
// case, with all non-ASCII-alphanumeric characters replaced by `_`. // case, with all non-ASCII-alphanumeric characters replaced by `_`.
// If the value is empty or not set, the value of the environment variable // If the value is empty or not set, the value of the environment variable
// COBRA_<SUFFIX> is returned instead. // COBRA_<SUFFIX> is returned instead.
func GetEnvConfig(cmd *Command, suffix string) string { func getEnvConfig(cmd *Command, suffix string) string {
v := os.Getenv(configEnvVar(cmd.Root().Name(), suffix)) v := os.Getenv(configEnvVar(cmd.Root().Name(), suffix))
if v == "" { if v == "" {
v = os.Getenv(configEnvVar(configEnvVarGlobalPrefix, suffix)) v = os.Getenv(configEnvVar(configEnvVarGlobalPrefix, suffix))

2
completions_test.go
View file

@ -3586,7 +3586,7 @@ func TestGetEnvConfig(t *testing.T) {
defer assertNoErr(t, os.Unsetenv(tc.globalVar)) defer assertNoErr(t, os.Unsetenv(tc.globalVar))
assertNoErr(t, err) assertNoErr(t, err)
cmd := &Command{Use: tc.use} cmd := &Command{Use: tc.use}
got := GetEnvConfig(cmd, tc.suffix) got := getEnvConfig(cmd, tc.suffix)
if got != tc.expected { if got != tc.expected {
t.Errorf("expected: %q, got: %q", tc.expected, got) t.Errorf("expected: %q, got: %q", tc.expected, got)
} }