Skip to content

[env] Fixed env_from bug when it is called from a subdirectory #2355

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 5 commits into from
Oct 16, 2024
Merged

[env] Fixed env_from bug when it is called from a subdirectory #2355

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9336afa
Fixed env_from bug when it is called from a subdirectory
mohsenari Oct 15, 2024
b4045af
Handled the case where env path is absolute
mohsenari Oct 15, 2024
6dbef33
error out if env_from is absolute path
mohsenari Oct 15, 2024
24caaf8
Lint fix
mohsenari Oct 15, 2024
cbf49a0
Allowing absolute path for env_from
mohsenari Oct 16, 2024
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: 6 additions & 3 deletions internal/devconfig/configfile/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ func (c *ConfigFile) ParseEnvsFromDotEnv() (map[string]string, error) {
if !c.IsdotEnvEnabled() {
return nil, fmt.Errorf("env file does not have a .env extension")
}

file, err := os.Open(c.EnvFrom)
envFileAbsPath := c.EnvFrom
if !filepath.IsAbs(c.EnvFrom) {
envFileAbsPath = filepath.Join(filepath.Dir(c.AbsRootPath), c.EnvFrom)
}
file, err := os.Open(envFileAbsPath)
if err != nil {
return nil, fmt.Errorf("failed to open file: %s", c.EnvFrom)
return nil, fmt.Errorf("failed to open file: %s", envFileAbsPath)
}
defer file.Close()

Expand Down