Some bug fixes:
- logging: LogToFile shadowed the package-level fileLogger, so IsFileLogger was always false and Shutdown never closed the file - logging: replace IsJSONHandler's unsafe reflection into slog internals with a *slog.JSONHandler type check - cli: fail if the log file can't be opened instead of silently logging to the terminal; return the log shutdown error from Finish - build.sh: -X flags used the wrong module path, so the version, build time and commit were never stamped
This commit is contained in:
1 parent
399eccf2de
commit
dcb714dc19
7 files changed
+24
-45
No files matched your search
@@ -84,7 +84,7 @@ func (conf JobSearchConfig) String() string {
|
||||
var sb strings.Builder
|
||||
for k, v := range conf.Flatten() {
|
||||
typ, _ := conf.TypeOf(k)
|
||||
sb.WriteString(fmt.Sprint(k, " = ", v, " <", typ, ">\n"))
|
||||
fmt.Fprint(&sb, k, " = ", v, " <", typ, ">\n")
|
||||
}
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ func initDir(t *testing.T, env []string, config string) string {
|
||||
|
||||
func writeFile(t *testing.T, path, contents string) {
|
||||
t.Helper()
|
||||
if err := os.WriteFile(path, []byte(contents), 0o644); err != nil {
|
||||
if err := os.WriteFile(path, []byte(contents), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ func useConfigFile(t *testing.T, contents string) string {
|
||||
t.Helper()
|
||||
resetViper(t)
|
||||
path := filepath.Join(t.TempDir(), "config.yaml")
|
||||
if err := os.WriteFile(path, []byte(contents), 0o644); err != nil {
|
||||
if err := os.WriteFile(path, []byte(contents), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
viper.SetConfigFile(path)
|
||||
@@ -92,6 +92,7 @@ func TestStoreValueErrors(t *testing.T) {
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
path := useConfigFile(t, "logging:\n level: warn\n")
|
||||
//nolint:gosec // G304: reading a file the test created in t.TempDir
|
||||
before, _ := os.ReadFile(path)
|
||||
conf := defaultConfig(t)
|
||||
|
||||
@@ -102,6 +103,7 @@ func TestStoreValueErrors(t *testing.T) {
|
||||
if !strings.Contains(err.Error(), tt.wantErr) {
|
||||
t.Errorf("err = %v; want it to mention %q", err, tt.wantErr)
|
||||
}
|
||||
//nolint:gosec // G304: reading a file the test created in t.TempDir
|
||||
if after, _ := os.ReadFile(path); string(after) != string(before) {
|
||||
t.Errorf("config file changed:\n%s", after)
|
||||
}
|
||||
@@ -135,12 +137,14 @@ func TestPurgeValue(t *testing.T) {
|
||||
|
||||
func TestPurgeValueErrors(t *testing.T) {
|
||||
path := useConfigFile(t, "logging:\n level: debug\n")
|
||||
//nolint:gosec // G304: reading a file the test created in t.TempDir
|
||||
before, _ := os.ReadFile(path)
|
||||
conf := defaultConfig(t)
|
||||
|
||||
if err := PurgeValue(&conf, "nope"); err == nil {
|
||||
t.Error("expected an error for an unknown key")
|
||||
}
|
||||
//nolint:gosec // G304: reading a file the test created in t.TempDir
|
||||
if after, _ := os.ReadFile(path); string(after) != string(before) {
|
||||
t.Errorf("config file changed:\n%s", after)
|
||||
}
|
||||
|
||||
@@ -19,14 +19,14 @@ type testEmbedded struct {
|
||||
|
||||
type testSection struct {
|
||||
testEmbedded
|
||||
Str string `cfg:"str" default:"hello"`
|
||||
Int int `cfg:"int" default:"-42"`
|
||||
Str string `cfg:"str" default:"hello"`
|
||||
Int int `cfg:"int" default:"-42"`
|
||||
Int8 int8 `cfg:"int8"`
|
||||
Uint uint `cfg:"uint" default:"7"`
|
||||
Uint uint `cfg:"uint" default:"7"`
|
||||
Uint16 uint16 `cfg:"uint16"`
|
||||
Float float64 `cfg:"float" default:"1.5"`
|
||||
Float float64 `cfg:"float" default:"1.5"`
|
||||
Float32 float32 `cfg:"float32"`
|
||||
Dur time.Duration `cfg:"dur" default:"90s"`
|
||||
Dur time.Duration `cfg:"dur" default:"90s"`
|
||||
When time.Time `cfg:"when"`
|
||||
Slice []string `cfg:"slice"`
|
||||
Inner testInner `cfg:"inner"`
|
||||
|
||||
Reference in new issue
Block a user