Pass env into facts from the current operation.

This means facts will correctly use any `env` provided inside the current
operation executing. There is also a follow up here to relook at the
whole operation kwarg/fact interaction to dedupe a lot of the logic
currently duplicated in facts/operations APIs.

Author: Fizzadar

pyinfra/api/facts.py

@@ -158,6 +158,7 @@ def get_facts(
     ignore_errors = state.config.IGNORE_ERRORS
     shell_executable = state.config.SHELL
     use_sudo_password = state.config.USE_SUDO_PASSWORD
+    env = state.config.ENV
 
     # Facts can override the shell (winrm powershell vs cmd support)
     if fact.shell_executable:
@@ -175,10 +176,11 @@ def get_facts(
         su_user = current_global_kwargs['su_user']
         ignore_errors = current_global_kwargs['ignore_errors']
         timeout = current_global_kwargs['timeout']
+        env = current_global_kwargs['env']
 
     # Make a hash which keeps facts unique - but usable cross-deploy/threads.
     # Locks are used to maintain order.
-    fact_hash = make_hash((name, kwargs, sudo, sudo_user, su_user, ignore_errors))
+    fact_hash = make_hash((name, kwargs, sudo, sudo_user, su_user, ignore_errors, env))
 
     # Already got this fact? Unlock and return them
     current_facts = state.facts.get(fact_hash, {})
@@ -223,6 +225,7 @@ def get_facts(
                 use_sudo_password=use_sudo_password,
                 su_user=su_user,
                 timeout=timeout,
+                env=env,
                 shell_executable=shell_executable,
                 print_output=state.print_fact_output,
                 print_input=state.print_fact_input,

tests/test_api/test_api_facts.py

@@ -37,6 +37,7 @@ def test_get_fact(self):
             sudo=False,
             sudo_user=None,
             timeout=None,
+            env={},
             use_sudo_password=False,
             return_combined_output=True,
         )
@@ -55,6 +56,7 @@ def test_get_fact_current_op_meta(self):
             'su_user': 'someuser',
             'ignore_errors': False,
             'timeout': 10,
+            'env': {'HELLO': 'WORLD'},
         }
 
         with patch('pyinfra.api.connectors.ssh.run_shell_command') as fake_run_command:
@@ -74,6 +76,7 @@ def test_get_fact_current_op_meta(self):
             sudo=True,
             sudo_user='someuser',
             timeout=10,
+            env={'HELLO': 'WORLD'},
             use_sudo_password=True,
             return_combined_output=True,
         )
@@ -105,6 +108,7 @@ def test_get_fact_error(self):
             sudo=False,
             sudo_user=None,
             timeout=None,
+            env={},
             use_sudo_password=False,
             return_combined_output=True,
         )
@@ -123,6 +127,7 @@ def test_get_fact_error_ignore(self):
             'su_user': None,
             'ignore_errors': True,
             'timeout': None,
+            'env': {},
         }
 
         with patch('pyinfra.api.connectors.ssh.run_shell_command') as fake_run_command:
@@ -142,6 +147,7 @@ def test_get_fact_error_ignore(self):
             sudo=False,
             sudo_user=None,
             timeout=None,
+            env={},
             use_sudo_password=False,
             return_combined_output=True,
         )