cli2 4.2.8__tar.gz → 4.2.10__tar.gz

{cli2-4.2.8/cli2.egg-info → cli2-4.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 4.2.8
+Version: 4.2.10
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-4.2.8 → cli2-4.2.10}/cli2/ansible/action.py

@@ -186,14 +186,18 @@ class ActionBase(ActionBase):
         self.masked_values = []
         for key in self.masked_keys:
             if self.task_vars.get(key, None):
-                self.masked_values.append(self.task_vars[key])
+                self.masked_values.append(
+                    self._templar.template(self.task_vars[key])
+                )
             if self._task.args.get(key, None):
-                self.masked_values.append(self._task.args[key])
+                self.masked_values.append(
+                    self._templar.template(self._task.args[key])
+                )
 
     async def run_wrapped_async(self):
         self.verbosity = self.task_vars.get('ansible_verbosity', 0)
 
-        if 'LOG_LEVEL' not in os.environ and os.getenv('DEBUG'):
+        if 'LOG_LEVEL' not in os.environ and 'DEBUG' not in os.environ:
             if self.verbosity == 1:
                 os.environ['LOG_LEVEL'] = 'INFO'
             elif self.verbosity >= 2:
@@ -288,7 +292,7 @@ class ActionBase(ActionBase):
         if isinstance(data, dict):
             for key, value in data.items():
                 if key in self.masked_keys:
-                    self.masked_values.append(value)
+                    self.masked_values.append(self._templar.template(value))
                     data[key] = '***MASKED***'
                 else:
                     data[key] = self.mask_data(value)
@@ -329,10 +333,19 @@ class ActionBase(ActionBase):
         :param fail: Allow this test to fail without exception
         """
         from unittest import mock
-        obj = cls(*[mock.Mock()] * 6)
+        from ansible.template import Templar
+        from ansible.parsing.dataloader import DataLoader
+        loader = DataLoader()
+        obj = cls(
+            task=mock.Mock(),
+            connection=mock.Mock(),
+            play_context=mock.Mock(),
+            loader=loader,
+            templar=Templar(loader, variables=facts),
+            shared_loader_obj=mock.Mock(),
+        )
         obj.tmp = None
         obj.result = dict()
-        obj._task = mock.Mock()
         obj._task.args = args or {}
         obj.task_vars = facts or {}
         obj.task_vars.setdefault('ansible_verbosity', 2)

{cli2-4.2.8 → cli2-4.2.10/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cli2
-Version: 4.2.8
+Version: 4.2.10
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-4.2.8 → cli2-4.2.10}/setup.py

@@ -44,7 +44,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='4.2.8',
+    version='4.2.10',
     setup_requires='setupmeta',
     packages=['cli2'],
     install_requires=[