Skip to content

Commit b3119d1

Browse files
committed
refactor: don't do config validation in fx providers
1 parent a8a9ef7 commit b3119d1

2 files changed

Lines changed: 13 additions & 18 deletions

File tree

cmd/backend/dependencies.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"github.com/database-playground/backend-v2/internal/workers"
3333
"github.com/gin-contrib/cors"
3434
"github.com/gin-gonic/gin"
35-
"github.com/joho/godotenv"
3635
"github.com/posthog/posthog-go"
3736
"github.com/ravilushqa/otelgqlgen"
3837
"github.com/redis/rueidis"
@@ -48,23 +47,7 @@ import (
4847

4948
// BackendConfig loads the environment variables from the .env file and returns a config.BackendConfig.
5049
func BackendConfig() (config.BackendConfig, error) {
51-
err := godotenv.Load()
52-
if err != nil {
53-
slog.Warn("error loading .env file", "error", err)
54-
}
55-
56-
cfg, err := config.LoadBackendConfig()
57-
if err != nil {
58-
slog.Error("error creating config", "error", err)
59-
return config.BackendConfig{}, err
60-
}
61-
62-
if err := cfg.Validate(); err != nil {
63-
slog.Error("error validating config", "error", err)
64-
return config.BackendConfig{}, err
65-
}
66-
67-
return cfg, nil
50+
return config.LoadBackendConfig()
6851
}
6952

7053
// EntClient creates an ent.Client.

internal/config/parse.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ func LoadBackendConfig() (BackendConfig, error) {
1818
return BackendConfig{}, err
1919
}
2020

21+
if err := cfg.Validate(); err != nil {
22+
return BackendConfig{}, err
23+
}
24+
2125
return cfg, nil
2226
}
2327

@@ -32,6 +36,10 @@ func LoadExporterConfig() (ExporterConfig, error) {
3236
return ExporterConfig{}, err
3337
}
3438

39+
if err := cfg.Validate(); err != nil {
40+
return ExporterConfig{}, err
41+
}
42+
3543
return cfg, nil
3644
}
3745

@@ -46,5 +54,9 @@ func LoadAdminCLIConfig() (AdminCLIConfig, error) {
4654
return AdminCLIConfig{}, err
4755
}
4856

57+
if err := cfg.Validate(); err != nil {
58+
return AdminCLIConfig{}, err
59+
}
60+
4961
return cfg, nil
5062
}

0 commit comments

Comments
 (0)