Skip to content

fix(core): resolve environment loading issues #2827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 22, 2025
Merged

fix(core): resolve environment loading issues #2827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7778e04
fix(core): resolve environment loading issues
ntrevino-virtru Oct 21, 2025
8217bb2
Add a test for server.public_hostname
ntrevino-virtru Oct 21, 2025
0ce8756
Check for -1 from env var.
ntrevino-virtru Oct 21, 2025
d534d84
Add additional LegacyLoader that uses the original behavior
ntrevino-virtru Oct 22, 2025
fdff54f
Add additional tests for undefined-in-YAML snake-case keys.
ntrevino-virtru Oct 22, 2025
2b7eb96
Cleanup lint.
ntrevino-virtru Oct 22, 2025
54d9d39
Ensure all tests use the same value for the key argument
ntrevino-virtru Oct 22, 2025
68df0c6
Clean more lint.
ntrevino-virtru Oct 22, 2025
ff16412
Merge remote-tracking branch 'origin/main' into bug/env-loader-withou…
ntrevino-virtru Oct 22, 2025
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
9 changes: 2 additions & 7 deletions service/cmd/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,7 @@ func migrateService(cmd *cobra.Command, args []string, migrationFunc func(*db.Cl
func migrateDBClient(cmd *cobra.Command, opts ...db.OptsFunc) (*db.Client, error) {
configFile, _ := cmd.Flags().GetString(configFileFlag)
configKey, _ := cmd.Flags().GetString(configKeyFlag)
envLoader, err := config.NewEnvironmentValueLoader(configKey, nil)
if err != nil {
panic(fmt.Errorf("could not load config: %w", err))
}
configFileLoader, err := config.NewConfigFileLoader(configKey, configFile)
legacyLoader, err := config.NewLegacyLoader(configKey, configFile)
if err != nil {
panic(fmt.Errorf("could not load config: %w", err))
}
Expand All @@ -135,8 +131,7 @@ func migrateDBClient(cmd *cobra.Command, opts ...db.OptsFunc) (*db.Client, error
}
conf, err := config.Load(
cmd.Context(),
envLoader,
configFileLoader,
legacyLoader,
defaultSettingsLoader,
)
if err != nil {
Expand Down
9 changes: 2 additions & 7 deletions service/cmd/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ var (
Run: func(cmd *cobra.Command, _ []string) {
configFile, _ := cmd.Flags().GetString(configFileFlag)
configKey, _ := cmd.Flags().GetString(configKeyFlag)
envLoader, err := config.NewEnvironmentValueLoader(configKey, nil)
if err != nil {
panic(fmt.Errorf("could not load config: %w", err))
}
configFileLoader, err := config.NewConfigFileLoader(configKey, configFile)
legacyLoader, err := config.NewLegacyLoader(configKey, configFile)
if err != nil {
panic(fmt.Errorf("could not load config: %w", err))
}
Expand All @@ -49,8 +45,7 @@ var (
}
cfg, err := config.Load(
cmd.Context(),
envLoader,
configFileLoader,
legacyLoader,
defaultSettingsLoader,
)
if err != nil {
Expand Down
9 changes: 2 additions & 7 deletions service/cmd/provisionFixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ You can clear/recycle your database with 'docker compose down' and 'docker compo
Run: func(cmd *cobra.Command, _ []string) {
configFile, _ := cmd.Flags().GetString(configFileFlag)
configKey, _ := cmd.Flags().GetString(configKeyFlag)
envLoader, err := config.NewEnvironmentValueLoader(configKey, nil)
if err != nil {
panic(fmt.Errorf("could not load config: %w", err))
}
configFileLoader, err := config.NewConfigFileLoader(configKey, configFile)
legacyLoader, err := config.NewLegacyLoader(configKey, configFile)
if err != nil {
panic(fmt.Errorf("could not load config: %w", err))
}
Expand All @@ -52,8 +48,7 @@ You can clear/recycle your database with 'docker compose down' and 'docker compo
}
cfg, err := config.Load(
cmd.Context(),
envLoader,
configFileLoader,
legacyLoader,
defaultSettingsLoader,
)
if err != nil {
Expand Down
9 changes: 2 additions & 7 deletions service/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,7 @@ func (c SDKConfig) LogValue() slog.Value {

// Deprecated: Use the `Load` method with your preferred loaders
func LoadConfig(ctx context.Context, key, file string) (*Config, error) {
envLoader, err := NewEnvironmentValueLoader(key, nil)
if err != nil {
return nil, fmt.Errorf("could not load config: %w", err)
}
configFileLoader, err := NewConfigFileLoader(key, file)
legacyLoader, err := NewLegacyLoader(key, file)
if err != nil {
return nil, fmt.Errorf("could not load config: %w", err)
}
Expand All @@ -284,8 +280,7 @@ func LoadConfig(ctx context.Context, key, file string) (*Config, error) {
}
return Load(
ctx,
envLoader,
configFileLoader,
legacyLoader,
defaultSettingsLoader,
)
}
Expand Down
Loading
Loading