cli2 4.0.2__tar.gz → 4.0.4__tar.gz

{cli2-4.0.2/cli2.egg-info → cli2-4.0.4}/PKG-INFO

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

{cli2-4.0.2 → cli2-4.0.4}/cli2/ansible/action.py

@@ -127,8 +127,8 @@ class ActionBase(ActionBase):
         The client object generated by :py:meth:`client_factory` if you
         implement it.
     """
-    def get(self, arg_name, fact_name=None, default=UNSET_DEFAULT):
-        if arg_name in self._task.args:
+    def get(self, arg_name=None, fact_name=None, default=UNSET_DEFAULT):
+        if arg_name and arg_name in self._task.args:
             return self._task.args[arg_name]
         if fact_name and fact_name in self.task_vars:
             return self.task_vars[fact_name]
@@ -240,12 +240,11 @@ class ActionBase(ActionBase):
         from unittest import mock
         obj = cls(*[mock.Mock()] * 6)
         obj.tmp = None
-        obj.task_vars = mock.Mock()
         obj.result = dict()
         obj._task = mock.Mock()
         obj._task.args = args or {}
         obj.task_vars = facts or {}
-        obj.task_vars['ansible_verbosity'] = 1
+        obj.task_vars.setdefault('ansible_verbosity', 2)
         obj.exc = False
         if client:
             async def _factory():

{cli2-4.0.2 → cli2-4.0.4}/cli2/client.py

@@ -1565,6 +1565,8 @@ class Client(metaclass=ClientMetaclass):
                     data[key] = '***MASKED***'
                 if isinstance(value, dict):
                     data[key] = self.mask_data(value, mask)
+                if isinstance(value, list):
+                    data[key] = [self.mask_data(item, mask) for item in value]
             return data
 
         return data

{cli2-4.0.2 → cli2-4.0.4/cli2.egg-info}/PKG-INFO

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

{cli2-4.0.2 → cli2-4.0.4}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='4.0.2',
+    version='4.0.4',
     setup_requires='setupmeta',
     install_requires=[
         'docstring_parser',

{cli2-4.0.2 → cli2-4.0.4}/tests/test_ansible.py

@@ -39,30 +39,34 @@ async def test_response_error(httpx_mock):
 @pytest.mark.asyncio
 async def test_option():
     class Action(ansible.ActionBase):
-        name = ansible.Option('name', 'object_name', 'Test object')
+        fact = ansible.Option(fact='fact', default='default fact')
+        arg = ansible.Option(arg='arg', fact='arg_fact')
 
         async def run_async(self):
-            self.result['name'] = self.name
-
-    module = await Action.run_test_async(args=dict(name='foo'))
-    assert module.result['name'] == 'foo'
+            self.result['arg'] = self.arg
+            self.result['fact'] = self.fact
 
-    module = await Action.run_test_async(facts=dict(object_name='foo'))
-    assert module.result['name'] == 'foo'
 
-    module = await Action.run_test_async()
-    assert module.result['name'] == 'Test object'
-
-    class Action(ansible.ActionBase):
-        name = ansible.Option('name', 'object_name')
+    # test setting arg and fact
+    module = await Action.run_test_async(
+        args=dict(arg='arg'),
+        facts=dict(fact='fact'),
+    )
+    assert module.result['arg'] == 'arg'
+    assert module.result['fact'] == 'fact'
 
-        async def run_async(self):
-            self.result['name'] = self.name
+    # test default
+    module = await Action.run_test_async(
+        args=dict(arg='arg'),
+    )
+    assert module.result['arg'] == 'arg'
+    assert module.result['fact'] == 'default fact'
 
+    # test failing for missing default
     module = await Action.run_test_async(fail=True)
     assert module.result == dict(
         failed=True,
-        error="Missing arg `name` or fact `object_name`",
+        error="Missing arg `arg` or fact `arg_fact`",
     )
 
     class Action(ansible.ActionBase):

{cli2-4.0.2 → cli2-4.0.4}/tests/test_client.py

@@ -854,6 +854,36 @@ def test_datetime_default_fmt(client_class):
     assert model.data['dt'] == str_dt
 
 
+@pytest.mark.asyncio
+async def test_mask_recursive(client_class):
+    client = client_class(mask=['scrt', 'password'])
+    client.client.send = mock.AsyncMock()
+
+    client.logger = mock.Mock()
+    response = httpx.Response(
+        status_code=200,
+        content='{"pub": 1, "foo": [{"scrt": "pass"}]}',
+    )
+    data = [dict(foo=[dict(src='pass')])]
+    response.request = httpx.Request('POST', '/', json=data)
+    client.client.send.return_value = response
+    await client.post('/', json=data)
+    client.logger.bind.assert_called_once_with(
+        method='POST',
+        url='http://lol/',
+    )
+    log = client.logger.bind.return_value
+    log.debug.assert_called_once_with(
+        'request',
+        json=[{'foo': [{'src': 'pass'}]}],
+    )
+    log.info.assert_called_once_with(
+        'response',
+        status_code=200,
+        json={'pub': 1, 'foo': [{'scrt': '***MASKED***'}]},
+    )
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     'key', ('json', 'data'),