Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
- name: golangci-lint
uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
with:
version: v2.0.2
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
4 changes: 3 additions & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ func (c config) LogAttrs() []slog.Attr {
// applying defaults where necessary.
func loadConfig() (*config, error) {
var cfg config
if err := env.Parse(&cfg); err != nil {

err := env.Parse(&cfg)
if err != nil {
return nil, fmt.Errorf("parse env: %w", err)
}

Expand Down
2 changes: 2 additions & 0 deletions config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ func clearConfigEnv(t *testing.T) {
t.Helper()

var cfg config

typ := reflect.TypeOf(cfg)
for i := range typ.NumField() {
field := typ.Field(i)
Expand Down Expand Up @@ -85,6 +86,7 @@ func Test_loadConfig(t *testing.T) {
} {
t.Run("invalid-"+name, func(t *testing.T) {
t.Setenv(name, "invalid")

_, err := loadConfig()
require.Error(t, err)
})
Expand Down
6 changes: 4 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,17 @@ func run() error {
return fmt.Errorf("new reaper: %w", err)
}

if err = r.run(ctx); err != nil {
err = r.run(ctx)
if err != nil {
return fmt.Errorf("run: %w", err)
}

return nil
}

func main() {
if err := run(); err != nil {
err := run()
if err != nil {
slog.Error("run", fieldError, err)
os.Exit(1)
}
Expand Down
Loading
Loading