From f4fa9424ea14406cd6ca4227b5d9637509df90d2 Mon Sep 17 00:00:00 2001 From: fahed dorgaa Date: Thu, 12 Aug 2021 16:28:40 +0200 Subject: [PATCH 1/2] do not ignore WithDotEnv errors Signed-off-by: fahed dorgaa --- cli/options.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cli/options.go b/cli/options.go index fe323cf5..c761f465 100644 --- a/cli/options.go +++ b/cli/options.go @@ -188,6 +188,9 @@ func WithDotEnv(o *ProjectOptions) error { s, err := os.Stat(dotEnvFile) if os.IsNotExist(err) { + if o.EnvFile != "" { + return errors.Errorf("Couldn't find env file: %s", o.EnvFile) + } return nil } if err != nil { @@ -195,7 +198,7 @@ func WithDotEnv(o *ProjectOptions) error { } if s.IsDir() { - return nil + return errors.Errorf("%s is a directory", dotEnvFile) } file, err := os.Open(dotEnvFile) From dce82654efb1e27e8c066665260d33d35f04294b Mon Sep 17 00:00:00 2001 From: fahed dorgaa Date: Thu, 26 Aug 2021 22:51:03 +0200 Subject: [PATCH 2/2] fixes Signed-off-by: fahed dorgaa --- cli/options.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cli/options.go b/cli/options.go index c761f465..68d5a2f8 100644 --- a/cli/options.go +++ b/cli/options.go @@ -198,7 +198,9 @@ func WithDotEnv(o *ProjectOptions) error { } if s.IsDir() { - return errors.Errorf("%s is a directory", dotEnvFile) + if o.EnvFile != "" { + return errors.Errorf("%s is a directory", dotEnvFile) + } } file, err := os.Open(dotEnvFile)