Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d72a2c2

Browse files
committed
Renamed function to better reflect his behaviour
1 parent ab9d2f0 commit d72a2c2

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

‎internal/cli/configuration/configuration.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ func getDefaultUserDir() string {
101101
}
102102
}
103103

104-
// FindConfigFileInArgsFallbackOnEnv returns the config file path using the
104+
// FindConfigFlagsInArgsOrFallbackOnEnv returns the config file path using the
105105
// argument '--config-file' (if specified), if empty looks for the ARDUINO_CONFIG_FILE env,
106106
// or looking in the current working dir
107-
func FindConfigFileInArgsFallbackOnEnv(args []string) string {
107+
func FindConfigFlagsInArgsOrFallbackOnEnv(args []string) string {
108108
// Look for '--config-dir' argument
109109
for i, arg := range args {
110110
if arg == "--config-dir" {

‎internal/cli/configuration/configuration_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@ func TestInit(t *testing.T) {
4343

4444
func TestFindConfigFile(t *testing.T) {
4545
defaultConfigFile := filepath.Join(getDefaultArduinoDataDir(), "arduino-cli.yaml")
46-
configFile := FindConfigFileInArgsFallbackOnEnv([]string{"--config-file"})
46+
configFile := FindConfigFlagsInArgsOrFallbackOnEnv([]string{"--config-file"})
4747
require.Equal(t, defaultConfigFile, configFile)
4848

49-
configFile = FindConfigFileInArgsFallbackOnEnv([]string{"--config-file", "some/path/to/config"})
49+
configFile = FindConfigFlagsInArgsOrFallbackOnEnv([]string{"--config-file", "some/path/to/config"})
5050
require.Equal(t, "some/path/to/config", configFile)
5151

52-
configFile = FindConfigFileInArgsFallbackOnEnv([]string{"--config-file", "some/path/to/config/arduino-cli.yaml"})
52+
configFile = FindConfigFlagsInArgsOrFallbackOnEnv([]string{"--config-file", "some/path/to/config/arduino-cli.yaml"})
5353
require.Equal(t, "some/path/to/config/arduino-cli.yaml", configFile)
5454

55-
configFile = FindConfigFileInArgsFallbackOnEnv([]string{})
55+
configFile = FindConfigFlagsInArgsOrFallbackOnEnv([]string{})
5656
require.Equal(t, defaultConfigFile, configFile)
5757

5858
t.Setenv("ARDUINO_CONFIG_FILE", "some/path/to/config")
59-
configFile = FindConfigFileInArgsFallbackOnEnv([]string{})
59+
configFile = FindConfigFlagsInArgsOrFallbackOnEnv([]string{})
6060
require.Equal(t, "some/path/to/config", configFile)
6161

6262
// when both env and flag are specified flag takes precedence
63-
configFile = FindConfigFileInArgsFallbackOnEnv([]string{"--config-file", "flag/path"})
63+
configFile = FindConfigFlagsInArgsOrFallbackOnEnv([]string{"--config-file", "flag/path"})
6464
require.Equal(t, "flag/path", configFile)
6565
}

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func main() {
3838
logrus.SetOutput(io.Discard)
3939

4040
// Search for the configuration file in the command line arguments and in the environment
41-
configFile := configuration.FindConfigFileInArgsFallbackOnEnv(os.Args)
41+
configFile := configuration.FindConfigFlagsInArgsOrFallbackOnEnv(os.Args)
4242
ctx := config.SetConfigFile(context.Background(), configFile)
4343

4444
// Create a new ArduinoCoreServer

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /