auditlog: handle new async client

The async client is now a thing of its own.

Author: tehasdf

cloudify_cli/async_commands/audit_log.py

@@ -27,8 +27,6 @@ async def _stream_logs(creator_name,
                        timeout,
                        logger,
                        client):
-    if not hasattr(client.auditlog, 'stream'):
-        raise CloudifyCliError('Streaming requires Python>=3.6.')
     logger.info('Streaming audit log entries...')
     response = await client.auditlog.stream(timeout=timeout,
                                             creator_name=creator_name,

cloudify_cli/commands/audit_log.py

@@ -3,6 +3,7 @@
 
 import click
 
+from cloudify_cli import env
 from cloudify_cli.cli import cfy, helptexts
 from cloudify_cli.exceptions import CloudifyCliError
 from cloudify_cli.table import print_data
@@ -65,18 +66,20 @@ def auditlog():
 @cfy.options.common_options
 @cfy.pass_logger
 @cfy.pass_client()
-def list_logs(creator_name,
-              execution_id,
-              since,
-              follow,
-              timeout,
-              sort_by,
-              descending,
-              pagination_offset,
-              pagination_size,
-              logger,
-              client,
-              ):
+def list_logs(
+    creator_name,
+    execution_id,
+    since,
+    follow,
+    timeout,
+    sort_by,
+    descending,
+    pagination_offset,
+    pagination_size,
+    logger,
+    client,
+):
+    client = env.get_rest_client(async_client=True)
     if follow:
         from cloudify_cli.async_commands.audit_log import stream_logs
         stream_logs(creator_name,
@@ -86,18 +89,20 @@ def list_logs(creator_name,
                     logger,
                     client)
     else:
-        _list_logs(creator_name,
+        import asyncio
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(_list_logs(creator_name,
                    execution_id,
                    since,
                    sort_by,
                    descending,
                    pagination_offset,
                    pagination_size,
                    logger,
-                   client)
+                   client))
 
 
-def _list_logs(creator_name,
+async def _list_logs(creator_name,
                execution_id,
                since,
                sort_by,
@@ -108,7 +113,7 @@ def _list_logs(creator_name,
                client):
     """List audit_log entries"""
     logger.info('Listing audit log entries...')
-    logs = client.auditlog.list(
+    logs = await client.auditlog.list(
         creator_name=creator_name,
         execution_id=execution_id,
         since=since,