kaqing 2.0.32__py3-none-any.whl → 2.0.34__py3-none-any.whl

adam/batch.py

@@ -8,6 +8,7 @@ from adam.commands.command_helpers import ClusterCommandHelper, ClusterOrPodComm
 from adam.commands.cqlsh import CqlCommandHelper, Cqlsh
 from adam.commands.deploy.deploy import Deploy, DeployCommandHelper
 from adam.commands.deploy.undeploy import Undeploy, UndeployCommandHelper
+from adam.commands.describe.describe import Describe, DescribeCommandHelper
 from adam.commands.issues import Issues
 from adam.commands.login import Login
 from adam.commands.logs import Logs
@@ -86,6 +87,19 @@ def deploy(kubeconfig: str, config: str, param: list[str], namespace: str, extra
     run_command(Deploy(), kubeconfig, config, param, None, namespace, None, extra_args)
 
 
+@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=DescribeCommandHelper, help='Describe keyspace(s) or table(s).')
+@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.option('--cluster', '-c', required=False, metavar='statefulset', help='Kubernetes statefulset name')
+@click.option('--namespace', '-n', required=False, metavar='namespace', help='Kubernetes namespace')
+@click.option('--pod', '-p', required=False, metavar='pod', help='Kubernetes pod name')
+@click.option('--all-nodes', '-a', is_flag=True, help='execute on all Cassandra nodes')
+@click.argument('extra_args', nargs=-1, metavar='<cluster|pod>', type=click.UNPROCESSED)
+def describe(kubeconfig: str, config: str, param: list[str], cluster: str, namespace: str, pod: str, all_nodes: bool, extra_args):
+    run_command(Describe(), kubeconfig, config, param, cluster, namespace, pod, ('--all-nodes',) + extra_args if all_nodes else extra_args)
+
+
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterOrPodCommandHelper, help="Print Qing's issues.")
 @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/command.py

@@ -3,8 +3,9 @@ import copy
 import subprocess
 import sys
 
-from adam.config import Config
+from adam.commands.command_helpers import ClusterCommandHelper
 from adam.repl_state import ReplState, RequiredState
+from adam.utils import lines_to_tabular, log, log2
 
 repl_cmds: list['Command'] = []
 
@@ -41,9 +42,8 @@ class Command:
     def validate_state(self, state: ReplState, pg_required: RequiredState = None, app_required: RequiredState = None):
         return state.validate(self.required(), pg_required=pg_required, app_required=app_required)
 
-    @abstractmethod
-    def help(self, state: ReplState) -> str:
-        pass
+    def help(self, _: ReplState) -> str:
+        return None
 
     def args(self, cmd: str):
         a = list(filter(None, cmd.split(' ')))
@@ -102,4 +102,30 @@ class Command:
         while s := cmd._successor:
             print(f'-> {s.command()}', end = '')
             cmd = s
-        print()
+        print()
+
+    def intermediate_run(self, cmd: str, state: ReplState, args: list[str], cmds: list['Command'], separator='\t'):
+        state, _ = self.apply_state(args, state)
+
+        if state.in_repl:
+            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()
+
+        return state
+
+    def intermediate_help(super_help: str, cmd: str, cmd_list: list['Command'], separator='\t', show_cluster_help=False):
+        log(super_help)
+        log()
+        log('Sub-Commands:')
+
+        log(lines_to_tabular([c.help(ReplState()).replace(f'{cmd} ', '  ', 1) for c in cmd_list], separator=separator))
+        if show_cluster_help:
+            log()
+            ClusterCommandHelper.cluster_help()

adam/commands/cql_utils.py

@@ -10,18 +10,15 @@ from adam.repl_state import ReplState
 from adam.utils import log2
 
 @functools.lru_cache()
-def keyspaces(sts: str, namespace: str):
+def keyspaces(state: ReplState, on_any=False):
     Config().wait_log("Inspecting Cassandra Keyspaces...")
 
-    user, pw = Secrets.get_user_pass(sts, namespace, secret_path='cql.secret')
-    command = f'cqlsh -u {user} -p {pw} -e "describe keyspaces"'
-
-    r: list[PodExecResult] = CassandraClusters.exec(sts, namespace, command, show_out=False, action='cql', on_any=True)
+    r: list[PodExecResult] = run_cql(state, 'describe keyspaces', show_out=False, on_any=on_any)
     if not r:
         log2('No pod is available')
         return []
 
-    return parse_cql_desc_keyspaces(r[0].stdout)
+    return parse_cql_desc_keyspaces(r.stdout if state.pod else r[0].stdout)
 
 def table_names(state: ReplState):
     return [f'{k}.{t}' for k, ts in tables(state, on_any=True).items() for t in ts]

adam/commands/cqlsh.py

@@ -56,11 +56,17 @@ class Cqlsh(Command):
         if state.sts or state.pod:
             ts = table_names(state)
             return {Cqlsh.COMMAND: None} | {
-                'delete': {'from': {t: {'where': None} for t in ts}},
+                'delete': {'from': {t: {'where': {'id': {'=': None}}} for t in ts}},
                 'insert': {'into': {t: {'values': None} for t in ts}},
-                'select': {'*': {'from': {t: {'limit': {'1': None}, 'where': None} for t in ts}}},
+                'select': {'*': {'from': {t: {
+                    'limit': {'1': None},
+                    'where': {'id': {'=': None}}
+                } for t in ts}}},
                 'update': {t: {'set': None} for t in ts},
-                'describe': {'keyspaces': None, 'table': {t: None for t in ts}, 'tables': None},
+                'describe': {
+                    'keyspaces': None,
+                    'table': {t: None for t in ts},
+                    'tables': None},
             }
 
         return {}

adam/commands/deploy/deploy.py

@@ -5,7 +5,6 @@ from adam.commands.deploy.deploy_pg_agent import DeployPgAgent
 from adam.commands.deploy.deploy_pod import DeployPod
 from .deploy_frontend import DeployFrontend
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
 
 class Deploy(Command):
     COMMAND = 'deploy'
@@ -27,18 +26,7 @@ class Deploy(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Deploy.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Deploy.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Deploy.cmd_list())
 
     def cmd_list():
         return [DeployFrontend(), DeployPod(), DeployPgAgent()]
@@ -49,13 +37,6 @@ class Deploy(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class DeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Deploy.COMMAND} ', '  ', 1) for c in Deploy.cmd_list()], separator='\t'))
+        Command.intermediate_help(super().get_help(ctx), Deploy.COMMAND, Deploy.cmd_list())

adam/commands/deploy/undeploy.py

@@ -5,7 +5,6 @@ from adam.commands.deploy.undeploy_frontend import UndeployFrontend
 from adam.commands.deploy.undeploy_pg_agent import UndeployPgAgent
 from adam.commands.deploy.undeploy_pod import UndeployPod
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
 
 class Undeploy(Command):
     COMMAND = 'undeploy'
@@ -27,18 +26,7 @@ class Undeploy(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Undeploy.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Undeploy.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Undeploy.cmd_list())
 
     def cmd_list():
         return [UndeployFrontend(), UndeployPod(), UndeployPgAgent()]
@@ -49,13 +37,6 @@ class Undeploy(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class UndeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Undeploy.COMMAND} ', '  ', 1) for c in Undeploy.cmd_list()], separator='\t'))
+        Command.intermediate_help(super().get_help(ctx), Undeploy.COMMAND, Undeploy.cmd_list())

adam/commands/describe/describe.py

@@ -0,0 +1,46 @@
+import click
+
+from adam.commands.command import Command
+from adam.commands.describe.describe_keyspace import DescribeKeyspace
+from adam.commands.describe.describe_keyspaces import DescribeKeyspaces
+from adam.commands.describe.describe_table import DescribeTable
+from adam.commands.describe.describe_tables import DescribeTables
+from adam.repl_state import ReplState, RequiredState
+
+class Describe(Command):
+    COMMAND = 'describe'
+    reaper_login = None
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(Describe, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def required(self):
+        return RequiredState.CLUSTER
+
+    def command(self):
+        return Describe.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        return super().intermediate_run(cmd, state, args, Describe.cmd_list())
+
+    def cmd_list():
+        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeTable(), DescribeTables()]
+
+    def completion(self, state: ReplState):
+        if state.sts:
+            return super().completion(state)
+
+        return {}
+
+class DescribeCommandHelper(click.Command):
+    def get_help(self, ctx: click.Context):
+        Command.intermediate_help(super().get_help(ctx), Describe.COMMAND, Describe.cmd_list(), show_cluster_help=True)

adam/commands/describe/describe_keyspace.py

@@ -52,7 +52,7 @@ class DescribeKeyspace(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {ks: {'--all-nodes': None} for ks in keyspaces(state.sts, state.namespace)})
+            return super().completion(state, {ks: {'--all-nodes': None} for ks in keyspaces(state, on_any=True)})
 
         return {}
 

adam/commands/describe/describe_keyspaces.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import keyspaces, run_cql
+from adam.commands.cql_utils import run_cql
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

adam/commands/describe/describe_table.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import keyspaces, run_cql, table_names, tables
+from adam.commands.cql_utils import run_cql, table_names
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

adam/commands/describe/describe_tables.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import keyspaces, run_cql, table_names, tables
+from adam.commands.cql_utils import run_cql
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

adam/commands/medusa/medusa.py

@@ -1,13 +1,11 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
 from .medusa_backup import MedusaBackup
 from .medusa_restore import MedusaRestore
 from .medusa_show_backupjobs import MedusaShowBackupJobs
 from .medusa_show_restorejobs import MedusaShowRestoreJobs
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
 
 class Medusa(Command):
     COMMAND = 'medusa'
@@ -31,20 +29,7 @@ class Medusa(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Medusa.cmd_list()], separator=':'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Medusa.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Medusa.cmd_list())
 
     def cmd_list():
         return [MedusaBackup(), MedusaRestore(), MedusaShowBackupJobs(), MedusaShowRestoreJobs()]
@@ -55,15 +40,6 @@ class Medusa(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class MedusaCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Medusa.COMMAND} ', '  ', 1) for c in Medusa.cmd_list()], separator=':'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Medusa.COMMAND, Medusa.cmd_list(), show_cluster_help=True)

adam/commands/medusa/medusa_show_backupjobs.py

@@ -49,4 +49,4 @@ class MedusaShowBackupJobs(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{MedusaShowBackupJobs.COMMAND}\t show backups'
+        return f'{MedusaShowBackupJobs.COMMAND}\t show Medusa backups'

adam/commands/medusa/medusa_show_restorejobs.py

@@ -49,4 +49,4 @@ class MedusaShowRestoreJobs(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{MedusaShowRestoreJobs.COMMAND}\t show restores'
+        return f'{MedusaShowRestoreJobs.COMMAND}\t show Medusa restores'

adam/commands/postgres/postgres.py

@@ -1,12 +1,11 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
 from .postgres_session import PostgresSession
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
+from adam.utils import log, log2
 
 class Postgres(Command):
     COMMAND = 'pg'
@@ -100,13 +99,7 @@ class Postgres(Command):
 
 class PostgresCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Postgres.COMMAND} ', '  ', 1) for c in Postgres.cmd_list()], separator='\t'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Postgres.COMMAND, Postgres.cmd_list(), show_cluster_help=True)
         log('PG-Name:  Kubernetes secret for Postgres credentials')
         log('          e.g. stgawsscpsr-c3-c3-k8spg-cs-001')
         log('Database: Postgres database name within a host')

adam/commands/reaper/reaper.py

@@ -1,7 +1,6 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
 from .reaper_forward import ReaperForward
 from .reaper_forward_stop import ReaperForwardStop
 from .reaper_restart import ReaperRestart
@@ -14,7 +13,6 @@ from .reaper_schedule_stop import ReaperScheduleStop
 from .reaper_schedules import ReaperSchedules
 from .reaper_status import ReaperStatus
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
 
 class Reaper(Command):
     COMMAND = 'reaper'
@@ -39,24 +37,12 @@ class Reaper(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Reaper.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Reaper.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Reaper.cmd_list())
 
     def cmd_list():
         return [ReaperSchedules(), ReaperScheduleStop(), ReaperScheduleActivate(), ReaperScheduleStart(),
-                ReaperForwardStop(), ReaperForward(), ReaperRunAbort(), ReaperRunsAbort(), ReaperRestart(), ReaperRuns(), ReaperStatus()]
+                ReaperForwardStop(), ReaperForward(), ReaperRunAbort(), ReaperRunsAbort(), ReaperRestart(),
+                ReaperRuns(), ReaperStatus()]
 
     def completion(self, state: ReplState):
         if state.sts:
@@ -64,15 +50,6 @@ class Reaper(Command):
 
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class ReaperCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Reaper.COMMAND} ', '  ', 1) for c in Reaper.cmd_list()], separator='\t'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Reaper.COMMAND, Reaper.cmd_list(), show_cluster_help=True)

adam/commands/repair/repair.py

@@ -1,13 +1,11 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
 from .repair_run import RepairRun
 from .repair_scan import RepairScan
 from .repair_stop import RepairStop
 from .repair_log import RepairLog
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
 
 class Repair(Command):
     COMMAND = 'repair'
@@ -31,20 +29,7 @@ class Repair(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Repair.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Repair.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Repair.cmd_list())
 
     def cmd_list():
         return [RepairRun(), RepairScan(), RepairStop(), RepairLog()]
@@ -54,15 +39,6 @@ class Repair(Command):
             return super().completion(state)
         return {}
 
-    def help(self, _: ReplState):
-        return None
-
 class RepairCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Sub-Commands:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Repair.COMMAND} ', '  ', 1) for c in Repair.cmd_list()], separator='\t'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Repair.COMMAND, Repair.cmd_list(), show_cluster_help=True)

adam/commands/show/show.py

@@ -1,7 +1,8 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
+from adam.commands.medusa.medusa_show_backupjobs import MedusaShowBackupJobs
+from adam.commands.medusa.medusa_show_restorejobs import MedusaShowRestoreJobs
 from adam.commands.show.show_app_actions import ShowAppActions
 from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.show.show_login import ShowLogin
@@ -15,7 +16,6 @@ from .show_repairs import ShowRepairs
 from .show_storage import ShowStorage
 from .show_adam import ShowAdam
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
 
 class Show(Command):
     COMMAND = 'show'
@@ -36,35 +36,16 @@ class Show(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, args = self.apply_state(args, state)
-
-        if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Show.cmd_list()], separator='\t'))
-
-            return 'command-missing'
-        else:
-            # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Show.cmd_list())
-            if not cmds.run(cmd, state):
-                log2('* Command is missing.')
-                Command.display_help()
+        return super().intermediate_run(cmd, state, args, Show.cmd_list())
 
     def cmd_list():
-        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowLogin(), ShowKubectlCommands(), ShowParams(), ShowProcesses(), ShowRepairs(),
-                ShowStorage(), ShowAdam(), ShowCassandraStatus(), ShowCassandraVersion()]
+        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowLogin(), ShowKubectlCommands(),
+                ShowParams(), ShowProcesses(), ShowRepairs(), ShowStorage(), ShowAdam(),
+                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
 
     def completion(self, state: ReplState):
         return super().completion(state)
 
-    def help(self, _: ReplState):
-        return f"{Show.COMMAND}\t show kubectl commands"
-
 class ShowCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        log(super().get_help(ctx))
-        log()
-        log('Catogories:')
-
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Show.COMMAND} ', '  ', 1) for c in Show.cmd_list()], separator=':'))
-        log()
-        ClusterCommandHelper.cluster_help()
+        Command.intermediate_help(super().get_help(ctx), Show.COMMAND, Show.cmd_list(), show_cluster_help=True)

adam/repl_commands.py

@@ -11,6 +11,7 @@ from adam.commands.deploy.undeploy import Undeploy
 from adam.commands.deploy.undeploy_frontend import UndeployFrontend
 from adam.commands.deploy.undeploy_pg_agent import UndeployPgAgent
 from adam.commands.deploy.undeploy_pod import UndeployPod
+from adam.commands.describe.describe import Describe
 from adam.commands.describe.describe_keyspace import DescribeKeyspace
 from adam.commands.describe.describe_keyspaces import DescribeKeyspaces
 from adam.commands.describe.describe_table import DescribeTable
@@ -58,7 +59,7 @@ class ReplCommands:
         cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_check() + ReplCommands.cassandra_ops() + \
             ReplCommands.tools() + ReplCommands.app() + ReplCommands.exit()
 
-        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Show(), Undeploy()]
+        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Describe(), Show(), Undeploy()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -79,7 +80,7 @@ class ReplCommands:
                 GetParam(), SetParam(), ShowParams(), ShowKubectlCommands(), ShowLogin(), ShowAdam()]
 
     def cassandra_check() -> list[Command]:
-        return [DescribeKeyspace(), DescribeKeyspaces(), DescribeTable(), DescribeTables(), ShowCassandraStatus(),
+        return Describe.cmd_list() + [ShowCassandraStatus(),
                 ShowCassandraVersion(), ShowRepairs(), ShowStorage(), ShowProcesses(), Check(), Issues(), NodeTool(), Report()]
 
     def cassandra_ops() -> list[Command]:

adam/version.py

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

{kaqing-2.0.32.dist-info → kaqing-2.0.34.dist-info}/METADATA

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

{kaqing-2.0.32.dist-info → kaqing-2.0.34.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=o82yYDgyoJw1t87QyAfn9jGqIcWX23ehRI21U4JUTv8,23221
+adam/batch.py,sha256=zUVW9PeOIybXY8sJksJfOlEEkeikBsu5PrukAhnGcgc,24503
 adam/cli.py,sha256=03pIZdomAu7IL-GSP6Eun_PKwwISShRAmfx6eVRPGC0,458
 adam/cli_group.py,sha256=W3zy1BghCtVcEXizq8fBH-93ZRVVwgAyGPzy0sHno1Y,593
 adam/config.py,sha256=5v8tf98SPnb9Mmn9EzxV1_EbjVrHo1ElkvyHpFMfbzk,2783
@@ -10,11 +10,11 @@ adam/embedded_params.py,sha256=_9tBKpkSzBfzm-s3tUgZs8DcSVBnPA1iumG0ZRCbZIs,4586
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
 adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
 adam/repl.py,sha256=Yx7paOgzj-KCX8q46nsr9LQJAmoz-Gvnzo7dH9rwh_0,7277
-adam/repl_commands.py,sha256=Qg5b83NOoVigHB9b5wThhpUUTb-Gxy1b4IkBXQqQJa4,4708
+adam/repl_commands.py,sha256=aH7xxbsQGrpL9Ozk9QF54iToK6wbDT3Pu9rMyw9sDBY,4719
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=591d7gV6uQSFtm7IWdlIYAHjfAzs9bdvIkwlIAeKddE,7540
 adam/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
-adam/version.py,sha256=qtphQaScnn_fuEjBWxm_MIQUMnw5QrS97RmQmJfBlrQ,139
+adam/version.py,sha256=0DrCK4Qgn-81E2AOhv1X8dSDYX-GZcodTWUjebMSSKM,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
@@ -54,12 +54,12 @@ adam/commands/bash.py,sha256=1O9cCl9JHQdttqNAgdB44rO0NjCqHzHv4psAEQMJcjw,2714
 adam/commands/cd.py,sha256=XEoiMhbJgA2KVKwhHFcs5BRAlf9qpgbAh6IImpKOtHI,4486
 adam/commands/check.py,sha256=853FPfgTMGxQXI_5UaPAtzaSWB_BvEVm48EkJhsHe4w,2181
 adam/commands/cli_commands.py,sha256=PEEyrG9yz7RAEZwHbbuFpyE3fVi8vrIWbr0d1H0Gp9o,3620
-adam/commands/command.py,sha256=lULNtaRJ-S9hTBpJY2rjWwZaQi_S4zGqZrsd89M_wik,2879
+adam/commands/command.py,sha256=Xq5-nWLcWDq5w9nw-U78RlbwTqHeXchydBcb5rQ7Cj8,3930
 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/cql_utils.py,sha256=jEVFn1_1LjwuJDt7xrL5YDnl4dPXUpAkLUf0XeSSTnU,4028
-adam/commands/cqlsh.py,sha256=4dcemAdCQvpUAkLTpkOEhrbRHimovxSAG8eJ0i4RQM8,2939
+adam/commands/cql_utils.py,sha256=LGRwhGf1bCZ0SS0F9a2dXGcCbcKpoR10wuQyaXuAm-A,3893
+adam/commands/cqlsh.py,sha256=PknA1I13E4L6leSq6TC3fsyJw_bugo6376q0FE0Ufz0,3088
 adam/commands/devices.py,sha256=_f8j6aQzTL8_pFlWYawRuG2Ju1zPjYSPcRIlLnZng10,2397
 adam/commands/exit.py,sha256=5MWUAmzYBlsrp0CoiTDB13SUkX9Ya18UlGeOIPia6TA,798
 adam/commands/help.py,sha256=Ey3R1X8w_CMhdADI0t8dSQ28euhDHheJm7NermiGni4,1645
@@ -82,33 +82,34 @@ adam/commands/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 adam/commands/deploy/code_start.py,sha256=-iH8HThTNM83IfBxT_LqTByuHVatV9d-Il4OYOfrwLI,1370
 adam/commands/deploy/code_stop.py,sha256=ch7ZMgosvTHsGaIcDwQY5XYh_5HYrUjBkZFOI-d2gOU,1696
 adam/commands/deploy/code_utils.py,sha256=5Gp4U8HzKpPkbkHDU7whlvGOK-wWaAbCIIGzVoN9hio,3296
-adam/commands/deploy/deploy.py,sha256=Yy333-bEyTkB0-U5Qb4SXh_QGVUFngrPy99ROPWzn1Q,1874
+adam/commands/deploy/deploy.py,sha256=lDuOb460Wm8RkkX811SPGYv59wP0uc9LgCsVG-71bDI,1254
 adam/commands/deploy/deploy_frontend.py,sha256=S3SvJD4JZQ9kDOOP_mrTnZFDl54AHhio5xxNgIUBZVk,1704
 adam/commands/deploy/deploy_pg_agent.py,sha256=VlOplID4MBABzuXeueyjKOTZjlQlQWLwvLSxpii4FHU,1203
 adam/commands/deploy/deploy_pod.py,sha256=YamltqBcxDpM3Bqhq-pFHxzZDxmEXGmkP5HXlJjRs8o,4663
 adam/commands/deploy/deploy_utils.py,sha256=daJhX2kCg5aGt4ZLQdz5AbR-AS7q2y-bZNVxHzP708c,1524
-adam/commands/deploy/undeploy.py,sha256=HDPFSYTOAmSc11OmgKBxq64S4lqyEC8zL1q69CVDlLQ,1930
+adam/commands/deploy/undeploy.py,sha256=hLrkliNVL7YBQ9sSpJgGeSZiSx7cqkWlv6Y_T3NqR5Y,1308
 adam/commands/deploy/undeploy_frontend.py,sha256=gHekPn7l19JgVbhneKpQ7ModNoDFmzWRMyQv9v4FBxo,1261
 adam/commands/deploy/undeploy_pg_agent.py,sha256=RYME8no1FT94WpVg-HXDGL1NmLlpE1I9R4htitjaxpo,1319
 adam/commands/deploy/undeploy_pod.py,sha256=hTcL8cAh7xYPcSm9sgiVFCxPh3SskefBfTmla310oUA,1905
 adam/commands/describe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/describe/describe_keyspace.py,sha256=9HN6_bJSmfgNl16rYsWkCD7Q3gHhb3lcpUD_Vjosm70,1935
-adam/commands/describe/describe_keyspaces.py,sha256=uXiVgpJlJz-8Q_rB2u3LWQixdECw6VWinfN70a5c3WQ,1585
-adam/commands/describe/describe_table.py,sha256=8jBiTqvZy0xzZdVTSzW6co6Ku-_seLqkdmrA3QXFgSQ,1902
-adam/commands/describe/describe_tables.py,sha256=RbbDhbyNjB1NyHP5LREAMPpXlgd1zmPlFQIp6jUVCdI,1585
+adam/commands/describe/describe.py,sha256=isRQ1z3lrFtaSkeWPndLGvaIbZivlBxI8D1X8ywNe1E,1510
+adam/commands/describe/describe_keyspace.py,sha256=CdgDBMlOngp_P5dK4QbqmqEGVZfhrRcFyISSrXoXoa4,1927
+adam/commands/describe/describe_keyspaces.py,sha256=O6ZY3q7H3-fNDEHf_qjgfTQmdYPXExAZh1M1COPJbnM,1574
+adam/commands/describe/describe_table.py,sha256=HL9Bufqj60R7GqqfhMvNgb6-eGPpOOf_okHoNT-2B9s,1883
+adam/commands/describe/describe_tables.py,sha256=2EtkLavSTNy-JHtegR9qUoVYs2NPmAz1Tq-yc-hKzZY,1553
 adam/commands/medusa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/medusa/medusa.py,sha256=Y_yyOZRb6u45wfTVBRp3kuklyYDTSlaAJQdAiymP_8M,2185
+adam/commands/medusa/medusa.py,sha256=KNFjStvilIuOJt3wTtcWmKvdm8FdCnrDY2ltEWbratk,1402
 adam/commands/medusa/medusa_backup.py,sha256=j4DTVWFT-4rzs4gG_pBvjE-JuPsVCJIsnyQjIzJ4EbA,1801
 adam/commands/medusa/medusa_restore.py,sha256=MU47bmozrjfGJ6GVkj_OVgLH6Uz_fGh03MdLR4ZDKHE,3308
-adam/commands/medusa/medusa_show_backupjobs.py,sha256=anDaXLWcDnXaw07-6bgZwpcjVibEVkueCS1vE08TnH4,1749
-adam/commands/medusa/medusa_show_restorejobs.py,sha256=vEYlsM28XjeodeH1E3826sliux2TscSyEY4s7RU4r3I,1644
+adam/commands/medusa/medusa_show_backupjobs.py,sha256=QekHpKezVJdgfa9hOxfgyx-y4D08tmHzyu_AAa8QPR0,1756
+adam/commands/medusa/medusa_show_restorejobs.py,sha256=wgPonSmC6buDIp3k3WUY-Yu2MyP1xyE3Q_XhvAwpnx4,1651
 adam/commands/postgres/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/postgres/postgres.py,sha256=ugnQulU6h3pSySYRwU801raxqsC8W5DcFLSbqnk7SPo,3597
+adam/commands/postgres/postgres.py,sha256=Q63WomZGXj10q94gG9J9hN6n_ybokMWhf9jBkmtgGb8,3360
 adam/commands/postgres/postgres_ls.py,sha256=HwZTgwGKXUqHX33S8aQPF6FqCrLqtoz4cLyJV2SpoE0,1186
 adam/commands/postgres/postgres_preview.py,sha256=MLzdEc4mvNj6V1Q8jO5OPznXyYELJHgd35_eQgLlNIU,1274
 adam/commands/postgres/postgres_session.py,sha256=8Tb0dHyJv7KmAaLZbR3kV2fkX8MfnDtlzUobpNJjRys,9503
 adam/commands/reaper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/reaper/reaper.py,sha256=SbxXgJ6b4wdXx5a1Fps71iEa1hmycWbArh1oC5bS83M,2677
+adam/commands/reaper/reaper.py,sha256=83R0ZRitEwaYKKssfKxn3zAzLnWIP9QKd1mA6awceS8,1908
 adam/commands/reaper/reaper_forward.py,sha256=mUp409MzT91cVXGxoPfBGceaR3qZ0rVdWKGdyzPNzSA,3177
 adam/commands/reaper/reaper_forward_stop.py,sha256=mllxBGxOUkFYMvF0eaFbL5VGMVAiFuT5KY8rKWTIiOE,1384
 adam/commands/reaper/reaper_restart.py,sha256=fX_ywBBKMo_5I0h2IDb0u7NeCN0Gk6OZeaZELrKb9I4,1290
@@ -122,13 +123,13 @@ adam/commands/reaper/reaper_schedules.py,sha256=-b7eKl0wJT7zMru8qKcLqG5JF0-LfeTc
 adam/commands/reaper/reaper_session.py,sha256=Y-NYEpADhE1XJoaXQKBa8lObtoz4ny8_XB7byV-2RZ0,6650
 adam/commands/reaper/reaper_status.py,sha256=g3Uep1AVYOThAaZoFjn4bWTKHElZnCleJyYYHP9HayY,1967
 adam/commands/repair/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/repair/repair.py,sha256=5jdKVpP03GYNPuqeGlidOcFLTwl9gIzVDbxgXtUjAjw,2100
+adam/commands/repair/repair.py,sha256=Z284AKjUupQ-Uul5xDVr_ljfiXJ0VmAXsrlhLPjRp5A,1315
 adam/commands/repair/repair_log.py,sha256=c7TI9hblpqn1tn7lTxj7VkIQKdNigYIIX-nxiFRZkns,1159
 adam/commands/repair/repair_run.py,sha256=C9F86ia46rBCwkP8BFM5nw-AJ05jm4Bx9wnMnyZXR04,2598
 adam/commands/repair/repair_scan.py,sha256=m6PErrbuQgryCMm_2pbGAwQdKNQvXLahcHXFfNKoU-s,2439
 adam/commands/repair/repair_stop.py,sha256=on3jHmOwtWOL7SJlFd8ryBflzqDsxwJNwtAbhDjYUNc,1193
 adam/commands/show/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/show/show.py,sha256=7dAsliNuDz6QNM24RoWJgKhJf_nuQTugp715vZ8hxh0,2509
+adam/commands/show/show.py,sha256=rPhozvl8Yb7sBRNg_byw15jLRVLeN-mbms3wKyl78xI,1981
 adam/commands/show/show_adam.py,sha256=osuafMipN2My4O7bLdukBLsDHtTKguDfTagmgz7aZvw,1314
 adam/commands/show/show_app_actions.py,sha256=3knASTOIecvdLEJusbsGEGXVxeCpqHozbnFAEq_2pqY,1925
 adam/commands/show/show_app_id.py,sha256=-2hxOUv_Rm_j6d6PWVcHW-w-_alfGrOB4chmVQS48Bs,1384
@@ -166,8 +167,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.32.dist-info/METADATA,sha256=Kopbtb9YdV0spXv3HIfE6X7h3cYXu5nGR2BbWr14vuI,132
-kaqing-2.0.32.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.32.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.32.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.32.dist-info/RECORD,,
+kaqing-2.0.34.dist-info/METADATA,sha256=dKclseXC1V5jp_JD65TwLgCdYNZiaObVfemki32hG6w,132
+kaqing-2.0.34.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.34.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.34.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.34.dist-info/RECORD,,