Fix env=None introduced in #572 (#601)

Author: xen0l

aws_gate/utils.py

@@ -126,8 +126,10 @@ def execute(cmd, args, **kwargs):
     ret, result = None, None
 
     env_path = DEFAULT_GATE_BIN_PATH + os.pathsep + os.environ["PATH"]
-    env = os.environ.copy().update({"PATH": env_path})
+    env = os.environ.copy()
+    env.update({"PATH": env_path})
     try:
+        logger.debug('PATH in environment: "%s"', os.environ["PATH"])
         logger.debug('Executing "%s"', " ".join([cmd] + args))
         result = subprocess.run([cmd] + args, env=env, check=True, **kwargs)
     except subprocess.CalledProcessError as e:

tests/unit/test_utils.py

@@ -1,15 +1,9 @@
 import errno
 import os
-import subprocess
-from subprocess import PIPE
-
 import pytest
-from botocore import credentials
-from botocore.exceptions import ClientError
-from hypothesis import given
-from hypothesis.strategies import lists, text
-
+import subprocess
 from aws_gate import __version__
+from aws_gate.constants import DEFAULT_GATE_BIN_PATH
 from aws_gate.exceptions import AWSConnectionError
 from aws_gate.utils import (
     is_existing_profile,
@@ -23,6 +17,11 @@
     fetch_instance_details_from_config,
     get_instance_details,
 )
+from botocore import credentials
+from botocore.exceptions import ClientError
+from hypothesis import given
+from hypothesis.strategies import lists, text
+from subprocess import PIPE
 
 
 # pylint: disable=too-few-public-methods
@@ -138,6 +137,16 @@ def test_execute(mocker, cmd, args):
     assert execute(cmd, args) == "output"
 
 
+def test_execute_environment(mocker):
+    mock_output = mocker.MagicMock(stdout=b"output")
+    m = mocker.patch("aws_gate.utils.subprocess.run", return_value=mock_output)
+
+    execute("ls", ["-l"])
+
+    assert m.call_args_list[0][1]["env"] is not None
+    assert DEFAULT_GATE_BIN_PATH in m.call_args_list[0][1]["env"]["PATH"]
+
+
 def test_execute_command_exited_with_nonzero_rc(mocker):
     mock = mocker.patch(
         "aws_gate.utils.subprocess.run",