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
23 changes: 19 additions & 4 deletions cli/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,27 @@ func GetEnvFromFile(currentEnv map[string]string, workingDir string, filenames [
}
dotEnvFile = abs

b, err := os.ReadFile(dotEnvFile)
s, err := os.Stat(dotEnvFile)
if os.IsNotExist(err) {
if len(filenames) > 0 {
return nil, errors.Errorf("Couldn't read env file: %s", dotEnvFile)
if len(filenames) == 0 {
return envMap, nil
}
return envMap, nil
return envMap, errors.Errorf("Couldn't find env file: %s", dotEnvFile)
}
if err != nil {
return envMap, err
}

if s.IsDir() {
if len(filenames) == 0 {
return envMap, nil
}
return envMap, errors.Errorf("%s is a directory", dotEnvFile)
}

b, err := os.ReadFile(dotEnvFile)
if os.IsNotExist(err) {
return nil, errors.Errorf("Couldn't read env file: %s", dotEnvFile)
}
if err != nil {
return envMap, err
Expand Down
14 changes: 14 additions & 0 deletions cli/options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"fmt"
"os"
"path/filepath"
"strings"
"testing"

"gotest.tools/v3/assert"
Expand Down Expand Up @@ -308,3 +309,16 @@ func TestEnvMap(t *testing.T) {
m = utils.GetAsEqualsMap(l)
assert.Equal(t, m["foo"], "bar")
}

func TestGetEnvFromFile(t *testing.T) {
wd := t.TempDir()
f := filepath.Join(wd, ".env")
err := os.Mkdir(f, 0o700)
assert.NilError(t, err)

_, err = GetEnvFromFile(nil, wd, nil)
assert.NilError(t, err)

_, err = GetEnvFromFile(nil, wd, []string{f})
assert.Check(t, strings.HasSuffix(err.Error(), ".env is a directory"))
}