Skip to content
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

fix: Load root dir before loading config #2266

Merged
merged 1 commit into from
Jan 29, 2024
Merged

fix: Load root dir before loading config #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cli/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
// loadConfig loads the rootDir containing the configuration file,
// otherwise warn about it and load a default configuration.
func loadConfig(cfg *config.Config) error {
if err := cfg.LoadRootDirFromFlagOrDefault(); err != nil {
return err
}

Check warning on line 104 in cli/utils.go

View check run for this annotation

Codecov / codecov/patch

cli/utils.go#L103-L104 

Added lines #L103 - L104 were not covered by tests
return cfg.LoadWithRootdir(cfg.ConfigFileExists())
}

Expand Down
4 changes: 0 additions & 4 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@ func (cfg *Config) LoadWithRootdir(withRootdir bool) error {
return err
}

if err := cfg.LoadRootDirFromFlagOrDefault(); err != nil {
return err
}

if withRootdir {
if err := cfg.v.ReadInConfig(); err != nil {
return NewErrReadingConfigFile(err)
Expand Down
Loading