Skip to content

Commit 1b2dd42

Browse files
committed
Lowercase readConfig.
1 parent 7114434 commit 1b2dd42

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

cmd/outline-ss-server/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ type Config struct {
5858
Keys []LegacyKeyService
5959
}
6060

61-
// Reads a config from a filename and parses it as a [Config].
62-
func ReadConfig(filename string) (*Config, error) {
61+
// readConfig attempts to read a config from a filename and parses it as a [Config].
62+
func readConfig(filename string) (*Config, error) {
6363
config := Config{}
6464
configData, err := os.ReadFile(filename)
6565
if err != nil {

cmd/outline-ss-server/config_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
)
2323

2424
func TestReadConfig(t *testing.T) {
25-
config, err := ReadConfig("./config_example.yml")
25+
config, err := readConfig("./config_example.yml")
2626

2727
require.NoError(t, err)
2828
expected := Config{
@@ -52,7 +52,7 @@ func TestReadConfig(t *testing.T) {
5252
}
5353

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

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

80-
config, err := ReadConfig(file.Name())
80+
config, err := readConfig(file.Name())
8181

8282
require.NoError(t, err)
8383
require.ElementsMatch(t, Config{}, config)
8484
}
8585

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

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

97-
config, err := ReadConfig(file.Name())
97+
config, err := readConfig(file.Name())
9898

9999
require.Error(t, err)
100100
require.ElementsMatch(t, Config{}, config)

cmd/outline-ss-server/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func (s *SSServer) remove(addr string) error {
129129
}
130130

131131
func (s *SSServer) loadConfig(filename string) error {
132-
config, err := ReadConfig(filename)
132+
config, err := readConfig(filename)
133133
if err != nil {
134134
return fmt.Errorf("failed to load config (%v): %w", filename, err)
135135
}

0 commit comments

Comments
 (0)