go/conf
go/conf
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

chore: update golangci-lint conf

Browse source
This commit is contained in:
Bruno Carlin 2024-05-04 22:01:57 +02:00
parent fa8a0c95ee
commit 1d4690fce1
Signed by: bcarlin
GPG key ID: 8E254EA0FFEB9B6D
2 changed files with 1726 additions and 511 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2184
.golangci.yml
View file

File diff suppressed because it is too large Load diff

43
config_test.go
View file

@ -1,4 +1,4 @@
package conf package conf_test
import ( import (
"os" "os"
@ -7,6 +7,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"code.bcarlin.xyz/go/conf"
) )
type testconf struct { type testconf struct {
@ -36,7 +38,7 @@ func TestLoadFile(t *testing.T) {
file := "test_data/valid.json" file := "test_data/valid.json"
err := LoadFile(file, &c) err := conf.LoadFile(file, &c)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, "config string", c.String) assert.Equal(t, "config string", c.String)
@ -55,7 +57,7 @@ func TestLoadFile(t *testing.T) {
file := "test_data/invalid.json" file := "test_data/invalid.json"
err := LoadFile(file, &c) err := conf.LoadFile(file, &c)
require.Error(t, err) require.Error(t, err)
assert.Equal(t, "default string", c.String) assert.Equal(t, "default string", c.String)
@ -74,7 +76,7 @@ func TestLoadFile(t *testing.T) {
file := "does-not-exist.conf" file := "does-not-exist.conf"
err := LoadFile(file, &c) err := conf.LoadFile(file, &c)
require.Error(t, err) require.Error(t, err)
assert.Equal(t, "default string", c.String) assert.Equal(t, "default string", c.String)
@ -104,7 +106,7 @@ func TestLoadFiles(t *testing.T) {
err = os.WriteFile(paths[1], content2, 0o600) err = os.WriteFile(paths[1], content2, 0o600)
require.NoError(t, err) require.NoError(t, err)
err = LoadFiles(&c, paths...) err = conf.LoadFiles(&c, paths...)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, "foo", c.String) assert.Equal(t, "foo", c.String)
@ -129,7 +131,7 @@ func TestLoadFiles(t *testing.T) {
err = os.WriteFile(paths[1], content2, 0o600) err = os.WriteFile(paths[1], content2, 0o600)
require.NoError(t, err) require.NoError(t, err)
err = LoadFiles(&c, paths...) err = conf.LoadFiles(&c, paths...)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, "bar", c.String) assert.Equal(t, "bar", c.String)
@ -150,7 +152,7 @@ func TestLoadFiles(t *testing.T) {
err := os.WriteFile(paths[1], content2, 0o600) err := os.WriteFile(paths[1], content2, 0o600)
require.NoError(t, err) require.NoError(t, err)
err = LoadFiles(&c, paths...) err = conf.LoadFiles(&c, paths...)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, "bar", c.String) assert.Equal(t, "bar", c.String)
@ -174,7 +176,7 @@ func TestLoadFiles(t *testing.T) {
err = os.WriteFile(paths[1], content2, 0o600) err = os.WriteFile(paths[1], content2, 0o600)
require.NoError(t, err) require.NoError(t, err)
err = LoadFiles(&c, paths...) err = conf.LoadFiles(&c, paths...)
require.Error(t, err) require.Error(t, err)
assert.Equal(t, "", c.String) assert.Equal(t, "", c.String)
@ -195,7 +197,7 @@ func TestSaveFile(t *testing.T) {
tmpDir := t.TempDir() tmpDir := t.TempDir()
file := filepath.Join(tmpDir, "test.conf") file := filepath.Join(tmpDir, "test.conf")
err := SaveFile(file, &c) err := conf.SaveFile(file, &c)
require.NoError(t, err) require.NoError(t, err)
assert.FileExists(t, file) assert.FileExists(t, file)
@ -212,7 +214,7 @@ func TestSaveFile(t *testing.T) {
tmpDir := t.TempDir() tmpDir := t.TempDir()
file := filepath.Join(tmpDir, "test.conf") file := filepath.Join(tmpDir, "test.conf")
err := SaveFile(file, func() error { return nil }) err := conf.SaveFile(file, func() error { return nil })
require.Error(t, err) require.Error(t, err)
assert.NoFileExists(t, file) assert.NoFileExists(t, file)
@ -228,7 +230,7 @@ func TestSaveFile(t *testing.T) {
} }
file := "cannot/write/here.conf" file := "cannot/write/here.conf"
err := SaveFile(file, &c) err := conf.SaveFile(file, &c)
require.Error(t, err) require.Error(t, err)
assert.NoFileExists(t, file) assert.NoFileExists(t, file)
@ -251,11 +253,11 @@ func TestLoadAndUpdateFile(t *testing.T) {
tmpDir := t.TempDir() tmpDir := t.TempDir()
file := filepath.Join(tmpDir, "test.conf") file := filepath.Join(tmpDir, "test.conf")
err := LoadAndUpdateFile(file, &c) err := conf.LoadAndUpdateFile(file, &c)
require.NoError(t, err) require.NoError(t, err)
var c2 testconf var c2 testconf
err = read(file, &c2) err = conf.LoadFile(file, &c2)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, c.String, c2.String) assert.Equal(t, c.String, c2.String)
assert.Equal(t, c.Int, c2.Int) assert.Equal(t, c.Int, c2.Int)
@ -277,7 +279,7 @@ func TestLoadAndUpdateFile(t *testing.T) {
tmpDir := t.TempDir() tmpDir := t.TempDir()
file := filepath.Join(tmpDir, "does-not-exist", "test.conf") file := filepath.Join(tmpDir, "does-not-exist", "test.conf")
err := LoadAndUpdateFile(file, &c) err := conf.LoadAndUpdateFile(file, &c)
require.Error(t, err) require.Error(t, err)
assert.NoFileExists(t, file) assert.NoFileExists(t, file)
@ -302,7 +304,7 @@ func TestLoadAndUpdateFile(t *testing.T) {
err := os.WriteFile(file, content, 0o644) err := os.WriteFile(file, content, 0o644)
require.NoError(t, err) require.NoError(t, err)
err = LoadAndUpdateFile(file, &c) err = conf.LoadAndUpdateFile(file, &c)
require.Error(t, err) require.Error(t, err)
assert.False(t, updated) assert.False(t, updated)
@ -325,11 +327,11 @@ func TestLoadAndUpdateFile(t *testing.T) {
err := os.WriteFile(file, content, 0o644) err := os.WriteFile(file, content, 0o644)
require.NoError(t, err) require.NoError(t, err)
err = LoadAndUpdateFile(file, &c) err = conf.LoadAndUpdateFile(file, &c)
require.NoError(t, err) require.NoError(t, err)
var c2 testconf var c2 testconf
err = read(file, &c2) err = conf.LoadFile(file, &c2)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, "config string", c2.String) assert.Equal(t, "config string", c2.String)
assert.Equal(t, 42, c2.Int) assert.Equal(t, 42, c2.Int)
@ -354,12 +356,13 @@ func TestLoadAndUpdateFile(t *testing.T) {
err := os.WriteFile(file, content, 0o644) err := os.WriteFile(file, content, 0o644)
require.NoError(t, err) require.NoError(t, err)
err = LoadAndUpdateFile(file, &c) err = conf.LoadAndUpdateFile(file, &c)
require.NoError(t, err) require.NoError(t, err)
newContent, err := os.ReadFile(file) newContent, err := os.ReadFile(file)
require.NoError(t, err) require.NoError(t, err)
assert.Contains(t, string(newContent), "Int")
assert.Contains(t, string(newContent), "Int") //nolint:usestdlibvars // not the constant here
assert.Contains(t, string(newContent), "Invariant") assert.Contains(t, string(newContent), "Invariant")
assert.True(t, updated) assert.True(t, updated)
@ -382,7 +385,7 @@ func TestLoadAndUpdateFile(t *testing.T) {
err := os.WriteFile(file, content, 0o644) err := os.WriteFile(file, content, 0o644)
require.NoError(t, err) require.NoError(t, err)
err = LoadAndUpdateFile(file, &c) err = conf.LoadAndUpdateFile(file, &c)
require.NoError(t, err) require.NoError(t, err)
newContent, err := os.ReadFile(file) newContent, err := os.ReadFile(file)