Skip to content

Commit

Permalink
Lowercase readConfig.
Browse files Browse the repository at this point in the history
  • Loading branch information
sbruens committed Jun 14, 2024
1 parent 7114434 commit f9f325c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions cmd/outline-ss-server/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ type Config struct {
Keys []LegacyKeyService
}

// Reads a config from a filename and parses it as a [Config].
func ReadConfig(filename string) (*Config, error) {
// readConfig attempts to read a config from a filename and parses it as a [Config].
func readConfig(filename string) (*Config, error) {
config := Config{}
configData, err := os.ReadFile(filename)
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions cmd/outline-ss-server/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestReadConfig(t *testing.T) {
}

func TestReadConfigParsesDeprecatedFormat(t *testing.T) {
config, err := ReadConfig("./config_example.deprecated.yml")
config, err := readConfig("./config_example.deprecated.yml")

require.NoError(t, err)
expected := Config{
Expand All @@ -77,14 +77,14 @@ func TestReadConfigParsesDeprecatedFormat(t *testing.T) {
func TestReadConfigFromEmptyFile(t *testing.T) {
file, _ := os.CreateTemp("", "empty.yaml")

config, err := ReadConfig(file.Name())
config, err := readConfig(file.Name())

require.NoError(t, err)
require.ElementsMatch(t, Config{}, config)
}

func TestReadConfigFromNonExistingFileFails(t *testing.T) {
config, err := ReadConfig("./foo")
config, err := readConfig("./foo")

require.Error(t, err)
require.ElementsMatch(t, nil, config)
Expand All @@ -94,7 +94,7 @@ func TestReadConfigFromIncorrectFormatFails(t *testing.T) {
file, _ := os.CreateTemp("", "empty.yaml")
file.WriteString("foo")

config, err := ReadConfig(file.Name())
config, err := readConfig(file.Name())

require.Error(t, err)
require.ElementsMatch(t, Config{}, config)
Expand Down
2 changes: 1 addition & 1 deletion cmd/outline-ss-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func (s *SSServer) remove(addr string) error {
}

func (s *SSServer) loadConfig(filename string) error {
config, err := ReadConfig(filename)
config, err := readConfig(filename)
if err != nil {
return fmt.Errorf("failed to load config (%v): %w", filename, err)
}
Expand Down

0 comments on commit f9f325c

Please sign in to comment.