cli2 4.3.0__tar.gz → 4.3.2__tar.gz

{cli2-4.3.0/cli2.egg-info → cli2-4.3.2}/PKG-INFO

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

{cli2-4.3.0 → cli2-4.3.2}/cli2/ansible/action.py

@@ -186,6 +186,7 @@ class ActionBase(ActionBase):
         for value in self.masked_values:
             if value:
                 self.mask.values.add(value)
+        self.mask_initial_values = self.mask.values
 
     async def run_wrapped_async(self):
         self.verbosity = self.task_vars.get('ansible_verbosity', 0)
@@ -232,8 +233,17 @@ class ActionBase(ActionBase):
             self.exc = exc
         finally:
             if self.mask and self.verbosity:
+                # this task has a mask, so it's probably a no_log, we're
+                # running verbose, print masked result
                 self.print_yaml(self.result)
 
+                if self.mask_initial_values != self.mask.values:
+                    # this module has discovered new values to mask, update the
+                    # fact with those values
+                    self.result['ansible_facts'] = dict(
+                        mask_values=self.mask.values,
+                    )
+
             if (
                 self._before_data != UNSET_DEFAULT
                 and self._after_data != UNSET_DEFAULT

{cli2-4.3.0 → cli2-4.3.2}/cli2/client.py

@@ -698,7 +698,8 @@ class ModelCommand(Command):
         return await model.get(id=self['id'].value)
 
     async def post_call(self):
-        await self.client.post_call(self)
+        if self.client:
+            await self.client.post_call(self)
 
 
 class ModelMetaclass(type):
@@ -1294,7 +1295,8 @@ class ClientCommand(Command):
 
     async def post_call(self):
         """ Call :py:meth:`Client.post_call`. """
-        await self.client.post_call(self)
+        if self.client:
+            await self.client.post_call(self)
 
 
 class Client(metaclass=ClientMetaclass):

{cli2-4.3.0 → cli2-4.3.2}/cli2/mask.py

@@ -119,3 +119,6 @@ class Mask:
         if self.values:
             result += f', number_of_values={len(self.values)}'
         return result + ')'
+
+    def __bool__(self):
+        return bool(self.keys or self.values)

{cli2-4.3.0 → cli2-4.3.2/cli2.egg-info}/PKG-INFO

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

{cli2-4.3.0 → cli2-4.3.2}/setup.py

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

{cli2-4.3.0 → cli2-4.3.2}/tests/test_client.py

@@ -1195,3 +1195,12 @@ def test_client_command(client_class, httpx_mock):
     assert Client.cli['model']['get'].client is None
     cmd = Client.cli['model']['find']
     cmd('http://x')
+
+    Client.post_call_called = False
+    cmd = Client.cli['model']['get']
+    cmd()
+    assert not Client.post_call_called
+
+    cmd = Client.cli['request']
+    cmd()
+    assert not Client.post_call_called

{cli2-4.3.0 → cli2-4.3.2}/tests/test_mask.py

@@ -20,3 +20,6 @@ def test_mask():
         'b': ['***MASKED*** foo ***MASKED***']
     }
     assert mask(fixture) == expected
+
+    assert mask
+    assert not cli2.Mask()