LambdaTest · HRanjan-11 · Nov 15, 2023 · Nov 14, 2023 · Nov 15, 2023 · Nov 15, 2023
diff --git a/commands/utils/set_args.js b/commands/utils/set_args.js
@@ -456,13 +456,20 @@ function sync_args_from_cmd(args) {
         }
       }
     }
-
     if (dot_env_keys_list) { 
       try {
         for (index in dot_env_keys_list) {
           let envKey = dot_env_keys_list[index]
-          let envValue = parsedEnv[envKey]
-          envs[envKey] = envValue
+          if (parsedEnv && parsedEnv[envKey]) {
+            let envValue = parsedEnv[envKey]
+            envs[envKey] = envValue
+            console.log(`Setting custom key ${envKey} from .env file`)
+          } else if (process.env[envKey]){
+            envs[envKey] = process.env[envKey]
+            console.log(`Setting custom key ${envKey} from environment`)
+          } else {
+            console.error(`value of ${envKey} is not found in .env file or environment variable`)
+          }
         }
       } catch (err) {
         console.error("error in fetching environment variables from .env file",err);

diff --git a/commands/utils/validate.js b/commands/utils/validate.js
@@ -381,7 +381,7 @@ module.exports = validate_config = function (lt_config, validation_configs) {
           );
         }
         if (envValue == undefined || envValue === "") {
-          reject("Value of environment variable cannot be left blank");
+          reject(`Value of environment variable ${envKey} cannot be left blank`);
         }
       });
     }

diff --git a/index.js b/index.js
@@ -160,7 +160,7 @@ const argv = require("yargs")
         })
         .option("sys-env-keys", {
           alias: "sys-env-keys",
-          describe: "system environment variables from .env file",
+          describe: "system environment variables from .env file and os environment in order",
           type: "string",
         })
         .option("envfl", {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lambdatest-cypress-cli",
-  "version": "3.0.20",
+  "version": "3.0.21",
   "description": "The lambdatest-cypress-cli is LambdaTest's command-line interface (CLI) aimed to help you run your Cypress tests on LambdaTest platform.",
   "homepage": "https://github.com/LambdaTest/lambdatest-cypress-cli",
   "author": "LambdaTest <[email protected]>",
-Original file line number
+Diff line change
@@ Expand Up @@
               );
             }
             if (envValue == undefined || envValue === "") {
-              reject("Value of environment variable cannot be left blank");
+              reject(`Value of environment variable ${envKey} cannot be left blank`);
             }
           });
         }
@@ Expand Down @@