src: return error --env-file if file is not found

arxngr · martenrichter · commit f8a97a748c82 · 2023-11-26T22:29:01.000Z
PR-URL: nodejs#50588 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
diff --git a/src/node.cc b/src/node.cc
@@ -866,7 +866,9 @@ static ExitCode InitializeNodeWithArgsInternal(
 
     for (const auto& file_path : file_paths) {
       std::string path = cwd + kPathSeparator + file_path;
-      per_process::dotenv_file.ParsePath(path);
+      auto path_exists = per_process::dotenv_file.ParsePath(path);
+
+      if (!path_exists) errors->push_back(file_path + ": not found");
     }
 
     per_process::dotenv_file.AssignNodeOptionsIfAvailable(&node_options);
diff --git a/src/node_dotenv.cc b/src/node_dotenv.cc
@@ -64,14 +64,14 @@ void Dotenv::SetEnvironment(node::Environment* env) {
   }
 }
 
-void Dotenv::ParsePath(const std::string_view path) {
+bool Dotenv::ParsePath(const std::string_view path) {
   uv_fs_t req;
   auto defer_req_cleanup = OnScopeLeave([&req]() { uv_fs_req_cleanup(&req); });
 
   uv_file file = uv_fs_open(nullptr, &req, path.data(), 0, 438, nullptr);
   if (req.result < 0) {
     // req will be cleaned up by scope leave.
-    return;
+    return false;
   }
   uv_fs_req_cleanup(&req);
 
@@ -89,7 +89,7 @@ void Dotenv::ParsePath(const std::string_view path) {
     auto r = uv_fs_read(nullptr, &req, file, &buf, 1, -1, nullptr);
     if (req.result < 0) {
       // req will be cleaned up by scope leave.
-      return;
+      return false;
     }
     uv_fs_req_cleanup(&req);
     if (r <= 0) {
@@ -104,6 +104,7 @@ void Dotenv::ParsePath(const std::string_view path) {
   for (const auto& line : lines) {
     ParseLine(line);
   }
+  return true;
 }
 
 void Dotenv::AssignNodeOptionsIfAvailable(std::string* node_options) {
diff --git a/src/node_dotenv.h b/src/node_dotenv.h
@@ -18,7 +18,7 @@ class Dotenv {
   Dotenv& operator=(const Dotenv& d) = default;
   ~Dotenv() = default;
 
-  void ParsePath(const std::string_view path);
+  bool ParsePath(const std::string_view path);
   void AssignNodeOptionsIfAvailable(std::string* node_options);
   void SetEnvironment(Environment* env);
 
diff --git a/test/parallel/test-dotenv-edge-cases.js b/test/parallel/test-dotenv-edge-cases.js
@@ -34,8 +34,8 @@ describe('.env supports edge cases', () => {
       [ '--env-file=.env', '--eval', code ],
       { cwd: __dirname },
     );
-    assert.strictEqual(child.stderr, '');
-    assert.strictEqual(child.code, 0);
+    assert.notStrictEqual(child.stderr.toString(), '');
+    assert.strictEqual(child.code, 9);
   });
 
   it('should not override existing environment variables but introduce new vars', async () => {

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,9 @@ static ExitCode InitializeNodeWithArgsInternal(`
`866`	`866`
`867`	`867`	`for (const auto& file_path : file_paths) {`
`868`	`868`	`std::string path = cwd + kPathSeparator + file_path;`
`869`		`- per_process::dotenv_file.ParsePath(path);`
	`869`	`+ auto path_exists = per_process::dotenv_file.ParsePath(path);`
	`870`	`+`
	`871`	`+ if (!path_exists) errors->push_back(file_path + ": not found");`
`870`	`872`	`}`
`871`	`873`
`872`	`874`	`per_process::dotenv_file.AssignNodeOptionsIfAvailable(&node_options);`
Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,14 @@ void Dotenv::SetEnvironment(node::Environment* env) {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-void Dotenv::ParsePath(const std::string_view path) {`
	`67`	`+bool Dotenv::ParsePath(const std::string_view path) {`
`68`	`68`	`uv_fs_t req;`
`69`	`69`	`auto defer_req_cleanup = OnScopeLeave([&req]() { uv_fs_req_cleanup(&req); });`
`70`	`70`
`71`	`71`	`uv_file file = uv_fs_open(nullptr, &req, path.data(), 0, 438, nullptr);`
`72`	`72`	`if (req.result < 0) {`
`73`	`73`	`// req will be cleaned up by scope leave.`
`74`		`- return;`
	`74`	`+ return false;`
`75`	`75`	`}`
`76`	`76`	`uv_fs_req_cleanup(&req);`
`77`	`77`
`@@ -89,7 +89,7 @@ void Dotenv::ParsePath(const std::string_view path) {`
`89`	`89`	`auto r = uv_fs_read(nullptr, &req, file, &buf, 1, -1, nullptr);`
`90`	`90`	`if (req.result < 0) {`
`91`	`91`	`// req will be cleaned up by scope leave.`
`92`		`- return;`
	`92`	`+ return false;`
`93`	`93`	`}`
`94`	`94`	`uv_fs_req_cleanup(&req);`
`95`	`95`	`if (r <= 0) {`
`@@ -104,6 +104,7 @@ void Dotenv::ParsePath(const std::string_view path) {`
`104`	`104`	`for (const auto& line : lines) {`
`105`	`105`	`ParseLine(line);`
`106`	`106`	`}`
	`107`	`+ return true;`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`void Dotenv::AssignNodeOptionsIfAvailable(std::string* node_options) {`