kaqing 2.0.83__py3-none-any.whl → 2.0.85__py3-none-any.whl

adam/batch.py

@@ -1,5 +1,6 @@
 import click
 
+from adam.commands.audit.audit import Audit, AuditCommandHelper
 from adam.commands.bash import Bash
 from adam.commands.check import Check, CheckCommandHelper
 from adam.commands.cp import ClipboardCopy, CopyCommandHelper
@@ -29,6 +30,15 @@ from adam.repl import enter_repl
 from adam.repl_state import ReplState
 from adam.cli_group import cli
 
+@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=AuditCommandHelper, help='Run audit functions.')
+@click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
+@click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
+@click.option('--param', '-v', multiple=True, metavar='<key>=<value>', help='parameter override')
+@click.argument('extra_args', nargs=-1, metavar='repair', type=click.UNPROCESSED)
+def audit(kubeconfig: str, config: str, param: list[str], extra_args):
+    run_command(Audit(), kubeconfig, config, param, None, None, None, extra_args)
+
+
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterOrPodCommandHelper, help='Run a single bash command.')
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
 @click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')

adam/commands/audit/audit.py

@@ -0,0 +1,60 @@
+import click
+
+from adam.commands.audit.audit_repair_tables import AuditRepairTables
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+from adam.sql.sql_completer import SqlCompleter
+from adam.utils import log2
+from adam.utils_athena import audit_table_names, run_audit_query
+
+class Audit(Command):
+    COMMAND = 'audit'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(Audit, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return Audit.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        state, args = self.apply_state(args, state)
+
+        r = None
+        if len(args) > 0:
+            r = super().intermediate_run(cmd, state, args, Audit.cmd_list(), display_help=False)
+
+        if not r or isinstance(r, str) and r == 'command-missing':
+            sql = 'select * from audit order by ts desc limit 10'
+            if args:
+                sql = ' '.join(args)
+            else:
+                log2(sql)
+
+            run_audit_query(sql)
+
+        return state
+
+    def completion(self, state: ReplState):
+        if state.device == ReplState.L:
+            return super().completion(state) | SqlCompleter.completions(lambda: audit_table_names())
+
+        return {}
+
+    def cmd_list():
+        return [AuditRepairTables()]
+
+    def help(self, _: ReplState):
+        return f"{Audit.COMMAND} \t run AWS Athena query on audit database"
+
+class AuditCommandHelper(click.Command):
+    def get_help(self, ctx: click.Context):
+        Command.intermediate_help(super().get_help(ctx), Audit.COMMAND, Audit.cmd_list(), show_cluster_help=False)

adam/commands/audit/audit_repair_tables.py

@@ -0,0 +1,42 @@
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+from adam.utils_athena import run_audit_query
+
+class AuditRepairTables(Command):
+    COMMAND = 'audit repair'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(AuditRepairTables, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return AuditRepairTables.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        state, args = self.apply_state(args, state)
+
+        tables = ['audit']
+        if args:
+            tables = args
+
+        for table in tables:
+            run_audit_query(f'MSCK REPAIR TABLE {table}')
+
+        return state
+
+    def completion(self, state: ReplState):
+        if state.device == ReplState.L:
+            return super().completion(state)
+
+        return {}
+
+    def help(self, _: ReplState):
+        return f"{AuditRepairTables.COMMAND} \t run MSCK REPAIR command for new partition discovery"

adam/commands/cd.py

@@ -59,6 +59,8 @@ class Cd(Command):
                         state.app_env = dir.split('@')[0]
                     else:
                         state.app_app = dir
+            elif state.device == ReplState.L:
+                pass
             else:
                 if dir == '':
                     state.sts = None
@@ -103,7 +105,7 @@ class Cd(Command):
                 return {Cd.COMMAND: {'..': None} | {app[0].split('-')[1]: None for app in Apps.apps(state.app_env)}}
             else:
                 return {Cd.COMMAND: {'..': None} | {env[0]: None for env in Apps.envs()}}
-        else:
+        elif state.device == ReplState.C:
             if state.pod:
                 return {Cd.COMMAND: {'..': None}}
             elif state.sts:

adam/commands/command.py

@@ -104,19 +104,22 @@ class Command:
             cmd = s
         print()
 
-    def intermediate_run(self, cmd: str, state: ReplState, args: list[str], cmds: list['Command'], separator='\t'):
+    def intermediate_run(self, cmd: str, state: ReplState, args: list[str], cmds: list['Command'], separator='\t', display_help=True):
         state, _ = self.apply_state(args, state)
 
         if state.in_repl:
-            log(lines_to_tabular([c.help(state) for c in cmds], separator=separator))
+            if display_help:
+                log(lines_to_tabular([c.help(state) for c in cmds], separator=separator))
 
             return 'command-missing'
         else:
             # head with the Chain of Responsibility pattern
             cmds = Command.chain(cmds)
             if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+                if display_help:
+                    log2('* Command is missing.')
+                    Command.display_help()
+                return 'command-missing'
 
         return state
 

adam/commands/devices.py

@@ -1,6 +1,35 @@
 from adam.commands.command import Command
 from adam.repl_state import ReplState
 
+class DeviceAuditLog(Command):
+    COMMAND = f'{ReplState.L}:'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DeviceAuditLog, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return DeviceAuditLog.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not self.args(cmd):
+            return super().run(cmd, state)
+
+        state.device = ReplState.L
+
+        return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{DeviceAuditLog.COMMAND}\t move to Audit Log Operations device'
+
 class DeviceCass(Command):
     COMMAND = f'{ReplState.C}:'
 

adam/commands/ls.py

@@ -14,6 +14,7 @@ from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState
 from adam.utils import lines_to_tabular, log, log2
 from adam.apps import Apps
+from adam.utils_athena import audit_table_names
 
 class Ls(Command):
     COMMAND = 'ls'
@@ -71,6 +72,8 @@ class Ls(Command):
                 svcs = [n for n, ns in Apps.envs()]
 
                 log(lines_to_tabular(svcs, 'ENV', separator=','))
+        elif state.device == ReplState.L:
+            self.show_audit_log_tables()
         else:
             if state.pod:
                 r: PodExecResult = Cqlsh().run(f'cql describe tables', state)
@@ -127,6 +130,9 @@ class Ls(Command):
     def show_pg_tables(self, pg: PostgresSession):
         log(lines_to_tabular(pg_table_names(pg.namespace, pg.directory()), 'NAME', separator=','))
 
+    def show_audit_log_tables(self):
+        log(lines_to_tabular(audit_table_names(), 'NAME', separator=','))
+
     def completion(self, state: ReplState):
         if state.pod:
             return {}

adam/commands/pwd.py

@@ -40,6 +40,8 @@ class Pwd(Command):
                     words.append(f'env/{state.app_env}')
                 if state.app_app:
                     words.append(f'app/{state.app_app}')
+            elif device == ReplState.L:
+                pass
             else:
                 if state.sts:
                     words.append(f'sts/{state.sts}')
@@ -58,6 +60,7 @@ class Pwd(Command):
         log(lines_to_tabular([
             device_line(state, ReplState.A),
             device_line(state, ReplState.C),
+            device_line(state, ReplState.L),
             device_line(state, ReplState.P),
             f'',
             f'HOST\t{host}',

adam/embedded_params.py

@@ -1,2 +1,2 @@
 def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'audit': {'endpoint': 'https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/', 'workers': 3, 'timeout': 10, 'athena': {'region': 'us-west-2', 'catalog': 'AwsDataCatalog', 'database': 'audit', 'output': 's3://s3.ops--audit/ddl/results'}}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}, 'alter-tables': {'excludes': 'system_auth,system_traces,reaper_db,system_distributed,system_views,system,system_schema,system_virtual_schema', 'gc-grace-periods': '3600,86400,864000,7776000', 'batching': True}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops-pg-agent', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing-cloud', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.14', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': False, 'debugs': {'timings': False, 'exit-on-error': False, 'show-parallelism': False}}

adam/repl.py

@@ -51,6 +51,8 @@ def enter_repl(state: ReplState):
                 msg += state.app_env
             if state.app_app:
                 msg += f'/{state.app_app}'
+        elif state.device == ReplState.L:
+            msg = f'{ReplState.L}:'
         else:
             msg = f'{ReplState.C}:'
             if state.pod:
@@ -97,6 +99,9 @@ def enter_repl(state: ReplState):
         event.app.current_buffer.text = ''
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=Config().get('audit.workers', 3)) as executor:
+        # warm up AWS lambda - this log line may timeout and get lost, which is fine
+        executor.submit(audit_log, 'entering kaqing repl', state)
+
         # use sorted command list only for auto-completion
         sorted_cmds = sorted(cmd_list, key=lambda cmd: cmd.command())
         while True:
@@ -142,6 +147,10 @@ def enter_repl(state: ReplState):
                             c_sql_tried = True
                             cmd = f'app {cmd}'
                             cmds.run(cmd, state)
+                    elif state.device == ReplState.L:
+                        c_sql_tried = True
+                        cmd = f'audit {cmd}'
+                        cmds.run(cmd, state)
                     elif state.sts:
                         c_sql_tried = True
                         cmd = f'cql {cmd}'
@@ -178,11 +187,14 @@ def audit_log(cmd: str, state: ReplState):
         'line': cmd.replace('"', '""').replace('\n', ' '),
     }
     audit_endpoint = Config().get("audit.endpoint", "https://4psvtaxlcb.execute-api.us-west-2.amazonaws.com/prod/")
-    response = requests.post(audit_endpoint, json=payload, timeout=Config().get("audit.timeout", 10))
-    if response.status_code in [200, 201]:
-        Config().debug(response.text)
-    else:
-        log2(f"Error: {response.status_code} {response.text}")
+    try:
+        response = requests.post(audit_endpoint, json=payload, timeout=Config().get("audit.timeout", 10))
+        if response.status_code in [200, 201]:
+            Config().debug(response.text)
+        else:
+            log2(f"Error: {response.status_code} {response.text}")
+    except requests.exceptions.Timeout as e:
+        log2(f"Timeout occurred: {e}")
 
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterCommandHelper, help="Enter interactive shell.")
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')

adam/repl_commands.py

@@ -1,6 +1,8 @@
 from adam.commands.alter_tables import AlterTables
 from adam.commands.app import App
 from adam.commands.app_ping import AppPing
+from adam.commands.audit.audit import Audit
+from adam.commands.audit.audit_repair_tables import AuditRepairTables
 from adam.commands.deploy.code_start import CodeStart
 from adam.commands.deploy.code_stop import CodeStop
 from adam.commands.deploy.deploy import Deploy
@@ -24,7 +26,7 @@ from adam.commands.cd import Cd
 from adam.commands.check import Check
 from adam.commands.command import Command
 from adam.commands.cql.cqlsh import Cqlsh
-from adam.commands.devices import DeviceApp, DeviceCass, DevicePostgres
+from adam.commands.devices import DeviceApp, DeviceAuditLog, DeviceCass, DevicePostgres
 from adam.commands.exit import Exit
 from adam.commands.medusa.medusa import Medusa
 from adam.commands.param_get import GetParam
@@ -77,7 +79,7 @@ class ReplCommands:
         return deduped
 
     def navigation() -> list[Command]:
-        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), Cd(), Pwd(), ClipboardCopy(),
+        return [Ls(), PreviewTable(), DeviceApp(), DevicePostgres(), DeviceCass(), DeviceAuditLog(), Cd(), Pwd(), ClipboardCopy(),
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam(), ShowHost()]
 
     def cassandra_check() -> list[Command]:
@@ -89,7 +91,7 @@ class ReplCommands:
 
     def tools() -> list[Command]:
         return [Cqlsh(), Postgres(), Bash(), Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(),
-                DeployPod(), UndeployPod(), DeployPgAgent(), UndeployPgAgent()]
+                DeployPod(), UndeployPod(), DeployPgAgent(), UndeployPgAgent(), AuditRepairTables(), Audit()]
 
     def app() -> list[Command]:
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), AppPing(), App()]

adam/repl_state.py

@@ -48,6 +48,7 @@ class RequiredState(Enum):
 class ReplState:
     A = 'a'
     C = 'c'
+    L = 'l'
     P = 'p'
 
     def __init__(self, device: str = None,
@@ -129,7 +130,7 @@ class ReplState:
             if index < 6:
                 state = copy.copy(state)
 
-                groups = re.match(r'^([a|c|p]):(.*)$', arg)
+                groups = re.match(r'^([a|c|l|p]):(.*)$', arg)
                 if groups:
                     if groups[1] == 'p':
                         state.device = 'p'
@@ -146,6 +147,8 @@ class ReplState:
                                 state.namespace = p_and_ns[1]
                             elif ns := KubeContext.in_cluster_namespace():
                                 state.namespace = ns
+                    elif groups[1] == 'l':
+                        state.device = 'l'
                     else:
                         state.device = 'a'
                         if path := groups[2]:

adam/sql/state_machine.py

@@ -134,7 +134,7 @@ SPEC = [
     'select_a                        > ,                > select_a_comma_',
     'select_a_comma_                 > name|*           > select_a                                ^ *',
     'select_a_                       > from             > select_from                             ^ from',
-    'select_from_                    > name             > select_from_x                           ^ (select,tables',
+    'select_from_                    > name|audit       > select_from_x                           ^ (select,tables',
     '-                               > (                > select_from_lp_',
     '-                               < )                > select_from_sq',
     'select_from_lp_                 > select           > select',
@@ -269,7 +269,8 @@ KEYWORDS = [
     'left join', 'right outer join', 'right join', 'full join', 'full outer join',
     'insert', 'into', 'values',
     'update', 'where', 'set',
-    'delete'
+    'delete',
+    'audit'
 ]
 
 class StateTo:

adam/utils_athena.py

@@ -0,0 +1,62 @@
+import functools
+import time
+import boto3
+
+from adam.config import Config
+from adam.utils import lines_to_tabular, log, log2
+
+@functools.lru_cache()
+def audit_table_names():
+   region_name = Config().get('audit.athena.region', 'us-west-2')
+   database_name = Config().get('audit.athena.database', 'audit')
+   catalog_name = Config().get('audit.athena.catalog', 'AwsDataCatalog')
+
+   athena_client = boto3.client('athena', region_name=region_name)
+   paginator = athena_client.get_paginator('list_table_metadata')
+
+   table_names = []
+   for page in paginator.paginate(CatalogName=catalog_name, DatabaseName=database_name):
+      for table_metadata in page.get('TableMetadataList', []):
+         table_names.append(table_metadata['Name'])
+
+   return table_names
+
+def run_audit_query(sql: str):
+   athena_client = boto3.client('athena')
+
+   database_name = Config().get('audit.athena.database', 'audit')
+   s3_output_location = Config().get('audit.athena.output', 's3://s3.ops--audit/ddl/results')
+
+   response = athena_client.start_query_execution(
+      QueryString=sql,
+      QueryExecutionContext={
+            'Database': database_name
+      },
+      ResultConfiguration={
+            'OutputLocation': s3_output_location
+      }
+   )
+
+   query_execution_id = response['QueryExecutionId']
+
+   while True:
+      query_status = athena_client.get_query_execution(QueryExecutionId=query_execution_id)
+      state = query_status['QueryExecution']['Status']['State']
+      if state in ['SUCCEEDED', 'FAILED', 'CANCELLED']:
+            break
+      time.sleep(1)
+
+   if state == 'SUCCEEDED':
+      results_response = athena_client.get_query_results(QueryExecutionId=query_execution_id)
+      if results_response['ResultSet']['Rows']:
+         column_info = results_response['ResultSet']['Rows'][0]['Data']
+         columns = [col.get('VarCharValue') for col in column_info]
+         lines = []
+         for row in results_response['ResultSet']['Rows'][1:]:
+               row_data = [col.get('VarCharValue') for col in row['Data']]
+               lines.append('\t'.join(row_data))
+
+         log(lines_to_tabular(lines, header='\t'.join(columns), separator='\t'))
+   else:
+      log2(f"Query failed or was cancelled. State: {state}")
+      log2(f"Reason: {query_status['QueryExecution']['Status'].get('StateChangeReason')}")

adam/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "2.0.83"  #: the working version
+__version__ = "2.0.85"  #: the working version
 __release__ = "1.0.0"  #: the release version

{kaqing-2.0.83.dist-info → kaqing-2.0.85.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 2.0.83
+Version: 2.0.85
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-2.0.83.dist-info → kaqing-2.0.85.dist-info}/RECORD

@@ -1,21 +1,22 @@
 adam/__init__.py,sha256=oVw1FNd9HZPJ7wm6BNn5ybyNGJLjJ8kopMeBiwgMaOI,59
 adam/app_session.py,sha256=Klypm4JYHOlovaRCHAZ2P_Mj_nheMlcQgX403R0TJGk,6969
 adam/apps.py,sha256=UTpUJBAMRFvR8kJZwileGC0UmPvsOjJ_AgvWoGmnIFI,6701
-adam/batch.py,sha256=F2FmdYj9bgNAIwT_L9ugafVCBj7j45IHNtbzF3b3zjg,24507
+adam/batch.py,sha256=JIrYtZA797yg6F6KoP5rLjrmj_wCMVs_HkBB8CAiBJc,25251
 adam/cli.py,sha256=03pIZdomAu7IL-GSP6Eun_PKwwISShRAmfx6eVRPGC0,458
 adam/cli_group.py,sha256=W3zy1BghCtVcEXizq8fBH-93ZRVVwgAyGPzy0sHno1Y,593
 adam/config.py,sha256=hDxd86MbKVVKoHhTT077L3YRKYcr0i6xVADLlnoE684,2818
 adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
-adam/embedded_params.py,sha256=I8erO4JG3_i-pOj7K2_RBK1KjztbwYxPOvd4Sv12yAw,4702
+adam/embedded_params.py,sha256=TGZ6j51c8jMjzDbzn4LU01fKZD9BfCfubQFfRNsk3ss,4831
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
 adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
-adam/repl.py,sha256=Y19Ndy2L7wRNirx0MlaXlJGHkp9sLW41M2xShI-PgK4,8793
-adam/repl_commands.py,sha256=NtV4F4aCAw1CkKjPfMDbatsdJQq-bJcc0iUkYBYQ-c8,4785
+adam/repl.py,sha256=gZlakdkKYreK6BQ2NvmTjvIDGVzTkNrmRbP4ZE8fEEI,9323
+adam/repl_commands.py,sha256=1AFE8AJoyQdJd0tlcwtMnwMjV5G7jL9MDkxJZxdo150,4963
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
-adam/repl_state.py,sha256=nZO5CucSIGz68f4JreadGphRzMXPUzkTn-4XcoJJOug,8643
+adam/repl_state.py,sha256=dXyGlWXcSsfCjrYwMhU44PVn_oThSZ8dhJ5HCVE8-qU,8743
 adam/utils.py,sha256=sbsNZP3qGJtb6fXCa4dDXHry5ay9ev583cCZIQzy07s,7382
+adam/utils_athena.py,sha256=_E-Ik-rgpIhDhpwlllH3qlyI3P_8Jcw9b9qSj2Ql2UM,2319
 adam/utils_net.py,sha256=65fhBnWMCkhGtyHqz95qcHaCo35q-WX1RBkkXG8dKpI,416
-adam/version.py,sha256=UfzcKi1_6LgVjFMjLxawqFPIOdh_D_31Y53hVB0gxjo,139
+adam/version.py,sha256=SfFdSx99xjv6dmyMa6T5bmSm3TNRAiaI4-KWzbffs6Q,139
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -52,31 +53,34 @@ adam/commands/alter_tables.py,sha256=Q5vXHE4_1_6v6wtYwqST7_QwpXINb1xq0Sm448Z2Y7Q
 adam/commands/app.py,sha256=7alV8wK801t67_rUe6EmhtHJTl-6K7fGCm6Uz1dDgpM,1963
 adam/commands/app_ping.py,sha256=Xk7cfefphXM2w-UvpnhNUTZ3BU38f0deehUb2FEyLCI,1337
 adam/commands/bash.py,sha256=1O9cCl9JHQdttqNAgdB44rO0NjCqHzHv4psAEQMJcjw,2714
-adam/commands/cd.py,sha256=3Iaerv88wPe5DgiRBIVRmKb8TIjEZrUHz8gx88WOA6s,4633
+adam/commands/cd.py,sha256=GyNyJnbxX7afrk7xwvXDhEtSdWnAgnz0dpDJXO2dO7w,4728
 adam/commands/check.py,sha256=853FPfgTMGxQXI_5UaPAtzaSWB_BvEVm48EkJhsHe4w,2181
 adam/commands/cli_commands.py,sha256=PEEyrG9yz7RAEZwHbbuFpyE3fVi8vrIWbr0d1H0Gp9o,3620
-adam/commands/command.py,sha256=Xq5-nWLcWDq5w9nw-U78RlbwTqHeXchydBcb5rQ7Cj8,3930
+adam/commands/command.py,sha256=w3AthcMShBfhVzRfFq3LhXN76pRNVAuqt5vdMkxHFls,4064
 adam/commands/command_helpers.py,sha256=leOJJK1UXczNTJHN9TGMCbIpUpmpreULvQ-TvnsYS7w,1134
 adam/commands/commands_utils.py,sha256=ShUcxtDSd9B3NM0GDj3NBvKdmjCGY8qXgeUJpzNF63E,3122
 adam/commands/cp.py,sha256=dyQViRDPNqsKRkxPb7WyEVIBNw7YB6IfYa2q3VtfzyA,3107
-adam/commands/devices.py,sha256=_f8j6aQzTL8_pFlWYawRuG2Ju1zPjYSPcRIlLnZng10,2397
+adam/commands/devices.py,sha256=ygpvjYa_NcezM_hctGOAAuBEHiDJtLtJNlOcLGvFJAc,3184
 adam/commands/exit.py,sha256=5MWUAmzYBlsrp0CoiTDB13SUkX9Ya18UlGeOIPia6TA,798
 adam/commands/help.py,sha256=Ey3R1X8w_CMhdADI0t8dSQ28euhDHheJm7NermiGni4,1645
 adam/commands/issues.py,sha256=VS-PC7e-2lywsa-lbmoUX8IY77OPGzFudwbw1g8XmQc,2599
 adam/commands/login.py,sha256=bj95WWIF7mJDJhnyS9T8xvaZUGL37dj7GlH8TgmODbk,1877
 adam/commands/logs.py,sha256=T-O9DYXmWEm4G1I5SM6MwyeRwq2aT-WMqNW0XA2MWmo,1165
-adam/commands/ls.py,sha256=u81ICKedZAqOmgY3-BaYBPnMAcQdriQnP-nDf_mg5lM,5523
+adam/commands/ls.py,sha256=aNBIoUUCFxWMJ9O6IV6qbw5XRHmaQqOD6dgjMf9EWkU,5766
 adam/commands/nodetool.py,sha256=HV9yDzMhRjS4lw6UfV7Hc1pcmeSx5a1jU6cAEKSZ1Bg,2334
 adam/commands/nodetool_commands.py,sha256=5IgWC3rmeDD1cgwqQjiiWzi-wJpJ3n_8pAzz_9phXuk,2635
 adam/commands/param_get.py,sha256=kPAAppK2T0tEFRnSIVFLDPIIGHhgLA7drJhn8TRyvvE,1305
 adam/commands/param_set.py,sha256=QDIuqfU80aWCB16OK49yf7XRaRTWwiLkwMsJuVikq9I,1271
 adam/commands/preview_table.py,sha256=5im47Uk6RclgkZD-Ci0lBs1eosnfvBtKt2lgsb_bohs,3068
-adam/commands/pwd.py,sha256=VlgFjxFl66I7Df1YI6cuiEeY6Q13lEavMKfrzHLESKo,2340
+adam/commands/pwd.py,sha256=izzMhIcbHjky2VA-84w5pt4nQDDUqahg3t34qy5yxMM,2446
 adam/commands/report.py,sha256=Ky45LIzSlB_X4V12JZWjU3SA2u4_FKRencRTq7psOWU,1944
 adam/commands/restart.py,sha256=Hik1t5rjH2ATZv4tzwrGB3e44b3dNuATgY327_Nb8Bs,2044
 adam/commands/rollout.py,sha256=52_4ijna3v-8Oug12et43DRHFDNhiN34p6xLTQmhdbQ,2959
 adam/commands/shell.py,sha256=wY_PIx7Lt6vuxhFArlfxdEnBbrouCJ3yNHhFn17DEqw,848
 adam/commands/watch.py,sha256=mmBFpB8T1V7zrNs5b2YNyDDztMym_ILPDdkrbdAXTas,2438
+adam/commands/audit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+adam/commands/audit/audit.py,sha256=xLXwDSYYTuVr_O5gDo87Wa4qSR71zjnj1Q6vN8dF_dE,1864
+adam/commands/audit/audit_repair_tables.py,sha256=5Glsy29md3KH_4_smuVBeu6c4zygICPK8Jiv-fNRC38,1186
 adam/commands/cql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/cql/cql_completions.py,sha256=dXe51NTWEJis76587IWSn9Av-cjC0J6KMaxlBKfF4wM,411
 adam/commands/cql/cql_table_completer.py,sha256=Tth6lmZ1eCEbJeAVZojTx594ttQeeVf-OjhhkSLyRnI,312
@@ -167,7 +171,7 @@ adam/k8s_utils/statefulsets.py,sha256=5g7KxGRHgEewT8rnZneDTaJDylUf-dHH2edWJEoorr
 adam/k8s_utils/volumes.py,sha256=RIBmlOSWM3V3QVXLCFT0owVOyh4rGG1ETp521a-6ndo,1137
 adam/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/sql/sql_completer.py,sha256=R5boj_bdHlzeJkGEy7XQDz_qtE-VF1yjg8pXn5zYGJA,2510
-adam/sql/state_machine.py,sha256=fJT_RkBNElzrnUOKnWoefILptb7QSSAapmBRzXdFsxM,23187
+adam/sql/state_machine.py,sha256=6wOCVE86S6pPJhLvJudbYhBbKDqOmpcY2lAEK75pbm4,23200
 adam/sql/term_completer.py,sha256=bNnHAVf9NZl52xS_BQpikbOK39gDBJADnT9gSvG0iqI,2539
 adam/sso/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/sso/authenticator.py,sha256=BCm16L9zf5aLU47-sTCnudn2zLPwd8M2wwRminJfsqw,615
@@ -179,8 +183,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-2.0.83.dist-info/METADATA,sha256=OiXhFwvzBn-sFVGZuqn1CiIbQogXu9gtNH1ShGWKM3w,132
-kaqing-2.0.83.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.83.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.83.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.83.dist-info/RECORD,,
+kaqing-2.0.85.dist-info/METADATA,sha256=H9R7Qb1ZTmYMDrzCFBJziK45RLM3IDkx82kFaDk1kpE,132
+kaqing-2.0.85.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.85.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.85.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.85.dist-info/RECORD,,