Saimon/include postman when enabled (#284)

Author: saimonation

cterasdk/audit/postman.py

@@ -1,6 +1,7 @@
 import re
 import uuid
 import atexit
+import logging
 import cterasdk.settings
 from ..lib import FileSystem
 from ..common import Object, utf8_decode, utf8_encode
@@ -93,7 +94,7 @@ def deserialize(self, mime_type):
                 elif mime_type == 'text/plain':
                     return Raw.xml(toxmlstr(fromxmlstr(self.data), no_log=True))
                 elif mime_type == 'application/json':
-                    return Raw.json(tojsonstr(fromjsonstr(self.data)))
+                    return Raw.json(tojsonstr(fromjsonstr(self.data), False))
                 elif mime_type.startswith('multipart/form-data'):
                     return form_data_generator(self.data, mime_type)
         return None
@@ -199,7 +200,7 @@ class Raw(Body):
 
     def __init__(self, body, language):
         super().__init__('raw')
-        self.raw = utf8_decode(body)
+        self.raw = body if language == 'json' else utf8_decode(body)
         self.options = Object()
         self.options.raw = Object()
         self.options.language = language
@@ -230,6 +231,10 @@ def audit():
         fs = FileSystem.instance()
         collection = Collection.instance()
         name = cterasdk.settings.sessions.management.audit.postman.name
-        if name is not None:
-            collection.info.name = name
-        fs.save(fs.downloads_directory(), f'{name}.json', utf8_encode(collection.serialize()))
+        collection.info.name = name if name is not None else str(uuid.uuid4())
+        filename = f'{collection.info.name}.json'
+        logging.getLogger('cterasdk.http.trace').info('Saving Postman audit file. %s', {
+            'directory': fs.downloads_directory(),
+            'name': filename
+        })
+        fs.save(fs.downloads_directory(), filename, utf8_encode(collection.serialize()))

cterasdk/clients/async_requests.py

@@ -4,14 +4,14 @@
 import aiohttp
 
 from yarl import URL
-from . import tracers
 
 
 def session_parameters(client_settings):
     return {
         'timeout': aiohttp.ClientTimeout(**client_settings.timeout.kwargs),
         'connector': aiohttp.TCPConnector(**client_settings.connector.kwargs),
-        'cookie_jar': aiohttp.CookieJar(**client_settings.cookie_jar.kwargs)
+        'cookie_jar': aiohttp.CookieJar(**client_settings.cookie_jar.kwargs),
+        'trace_configs': client_settings.trace_configs
     }
 
 
@@ -25,12 +25,7 @@ def __init__(self, settings):
     @property
     def session(self):
         if self.closed:
-            trace_configs = [
-                tracers.logger.trace_config(),
-                tracers.session.trace_config(),
-                tracers.postman.trace_config()
-            ]
-            self._session = aiohttp.ClientSession(trace_configs=trace_configs, **session_parameters(self._settings))
+            self._session = aiohttp.ClientSession(**session_parameters(self._settings))
         return self._session
 
     @property

cterasdk/clients/settings.py

@@ -1,6 +1,12 @@
+import logging
+import cterasdk.settings
+from . import tracers
 from ..common import Object
 
 
+logger = logging.getLogger('cterasdk.http.trace')
+
+
 class ClientSettings(Object):
     """
     Asynchronous HTTP Client Session Settings
@@ -10,6 +16,13 @@ def __init__(self, connector=None, timeout=None, cookie_jar=None):
         self.connector = connector if connector else TCPConnector(True)
         self.timeout = timeout if timeout else ClientTimeout(None, None)
         self.cookie_jar = cookie_jar if cookie_jar else CookieJar(False)
+        self.trace_configs = [
+            tracers.logger.trace_config(),
+            tracers.session.trace_config()
+        ]
+        if cterasdk.settings.sessions.management.audit.postman.enabled:
+            logger.info('Enabling Postman Auditing.')
+            self.trace_configs.append(tracers.postman.trace_config())
 
 
 class TCPConnector(Object):

cterasdk/settings.yml

@@ -11,7 +11,7 @@ sessions:
         ssl: prompt
     audit:
       postman:
-        name: null
+        name: ~
         enabled: false
   ctera_direct:
     api: