kaqing 1.98.15__py3-none-any.whl → 2.0.145__py3-none-any.whl

adam/commands/help.py

@@ -23,20 +23,25 @@ class Help(Command):
             return super().run(cmd, state)
 
         def section(cmds : list[ReplCommands]):
-            return [f'  {c.help(state)}' for c in cmds if c.help(state)]
+            sorted_cmds = sorted(cmds, key=lambda cmd: cmd.command())
+            return [f'  {c.help(state)}' for c in sorted_cmds if c.help(state)]
 
         lines = []
         lines.append('NAVIGATION')
-        lines.append('  a: | c: | p:\t switch to another operational device: App, Cassandra or Postgres')
+        lines.append('  a: | c: | l: | p: | x:\t switch to another operational device: App, Cassandra, Audit, Postgres or Export')
         lines.extend(section(ReplCommands.navigation()))
-        lines.append('CHECK CASSANDRA')
-        lines.extend(section(ReplCommands.cassandra_check()))
-        lines.append('CASSANDRA OPERATIONS')
+        lines.append('CASSANDRA')
         lines.extend(section(ReplCommands.cassandra_ops()))
+        lines.append('POSTGRES')
+        lines.extend(section(ReplCommands.postgres_ops()))
+        lines.append('APP')
+        lines.extend(section(ReplCommands.app_ops()))
+        lines.append('EXPORT DB')
+        lines.extend(section(ReplCommands.export_ops()))
+        lines.append('AUDIT')
+        lines.extend(section(ReplCommands.audit_ops()))
         lines.append('TOOLS')
         lines.extend(section(ReplCommands.tools()))
-        lines.append('APP')
-        lines.extend(section(ReplCommands.app()))
         lines.append('')
         lines.extend(section(ReplCommands.exit()))
 

adam/commands/issues.py

@@ -21,11 +21,17 @@ class Issues(Command):
     def command(self):
         return Issues.COMMAND
 
+    def required(self):
+        return ReplState.NON_L
+
     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)
+        if not self.validate_state(state):
+            return state
+
         args, show = Command.extract_options(args, ['-s', '--show'])
 
         results = run_checks(state.sts, state.namespace, state.pod, show_output=show)

adam/commands/kubectl.py

@@ -0,0 +1,41 @@
+import subprocess
+
+from adam.commands.command import Command
+from adam.repl_state import ReplState, RequiredState
+
+class Kubectl(Command):
+    COMMAND = 'k'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(Kubectl, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return Kubectl.COMMAND
+
+    def required(self):
+        return RequiredState.NAMESPACE
+
+    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)
+        if not self.validate_state(state):
+            return state
+
+        subprocess.run(["kubectl"] + args)
+
+        return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+
+    def help(self, _: ReplState):
+        return f'{Kubectl.COMMAND} \t run a kubectl command'

adam/commands/login.py

@@ -1,3 +1,4 @@
+import os
 import signal
 import traceback
 
@@ -7,7 +8,7 @@ from adam.config import Config
 from adam.sso.idp import Idp
 from adam.sso.idp_login import IdpLogin
 from adam.commands.command import Command
-from adam.repl_state import ReplState
+from adam.repl_state import ReplState, RequiredState
 from adam.utils import log, log2
 
 class Login(Command):
@@ -25,6 +26,9 @@ class Login(Command):
     def command(self):
         return Login.COMMAND
 
+    def required(self):
+        return ReplState.NON_L
+
     def run(self, cmd: str, state: ReplState):
         def custom_handler(signum, frame):
             AppSession.ctrl_c_entered = True
@@ -37,9 +41,9 @@ class Login(Command):
         state, args = self.apply_state(args, state)
         args, debug = Command.extract_options(args, ['d'])
         if debug:
-            Config().set('debug.show-out', True)
+            Config().set('debug', True)
 
-        username: str = None
+        username: str = os.getenv('USERNAME')
         if len(args) > 0:
             username = args[0]
 
@@ -58,8 +62,8 @@ class Login(Command):
 
         return state
 
-    def completion(self, _: ReplState):
-        return {}
+    def completion(self, state: ReplState):
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{Login.COMMAND}\t SSO login'

adam/commands/logs.py

@@ -1,6 +1,6 @@
 from adam.commands.command import Command
 from adam.config import Config
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
 from adam.repl_state import ReplState, RequiredState
 
 class Logs(Command):
@@ -33,6 +33,7 @@ class Logs(Command):
         return CassandraNodes.exec(state.pod, state.namespace, f'cat {path}')
 
     def completion(self, _: ReplState):
+        # available only on cli
         return {}
 
     def help(self, _: ReplState):

adam/commands/ls.py

@@ -1,20 +1,8 @@
 import copy
-import re
 
 from adam.commands.command import Command
-from adam.commands.commands_utils import show_pods, show_rollout
-from adam.commands.cqlsh import Cqlsh
-from adam.commands.postgres.postgres_session import PostgresSession
-from adam.config import Config
-from adam.k8s_utils.custom_resources import CustomResources
-from adam.k8s_utils.ingresses import Ingresses
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.services import Services
-from adam.k8s_utils.statefulsets import StatefulSets
-from adam.pod_exec_result import PodExecResult
+from adam.commands.devices.devices import Devices
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log, log2
-from adam.apps import Apps
 
 class Ls(Command):
     COMMAND = 'ls'
@@ -43,103 +31,12 @@ class Ls(Command):
                 state = copy.copy(state)
                 state.device = arg.replace(':', '')
 
-        if state.device == ReplState.P:
-            if state.pg_path:
-                pg = PostgresSession(state.namespace, state.pg_path)
-                if pg.db:
-                    self.show_pg_tables(pg)
-                else:
-                    self.show_pg_databases(pg)
-            else:
-                self.show_pg_hosts(state)
-        elif state.device == ReplState.A:
-            if state.app_env:
-                def line(n: str, ns: str):
-                    host = Ingresses.get_host(Config().get('app.login.ingress', '{app_id}-k8singr-appleader-001').replace('{app_id}', f'{ns}-{n}'), ns)
-                    if not host:
-                        return None
-
-                    endpoint = Config().get('app.login.url', 'https://{host}/{env}/{app}').replace('{host}', host).replace('{env}', state.app_env).replace('{app}', 'c3')
-                    if not endpoint:
-                        return None
-
-                    return f"{n.split('-')[1]},{Ingresses.get_host(f'{ns}-{n}-k8singr-appleader-001', ns)},{endpoint}"
-
-                svcs = [l for l in [line(n, ns) for n, ns in Apps.apps(state.app_env)] if l]
-
-                log(lines_to_tabular(svcs, 'APP,HOST,ENDPOINT', separator=','))
-            else:
-                svcs = [n for n, ns in Apps.envs()]
-
-                log(lines_to_tabular(svcs, 'ENV', separator=','))
-        else:
-            if state.pod:
-                r: PodExecResult = Cqlsh().run(f'cql describe tables', state)
-                if r.stderr:
-                    log(r.stderr)
-                log(r.stdout)
-            elif state.sts and state.namespace:
-                show_pods(StatefulSets.pods(state.sts, state.namespace), state.namespace, show_namespace=not KubeContext.in_cluster_namespace())
-                show_rollout(state.sts, state.namespace)
-            else:
-                self.show_statefulsets()
+        Devices.device(state).ls(cmd, state)
 
         return state
 
-    def show_statefulsets(self):
-        ss = StatefulSets.list_sts_names(show_namespace=not KubeContext.in_cluster_namespace())
-        if len(ss) == 0:
-            log2('No cassandra statefulsets found.')
-            return
-
-        app_ids = CustomResources.get_app_ids()
-        list = []
-        for s in ss:
-            cr_name = CustomResources.get_cr_name(s)
-            app_id = 'Unknown'
-            if cr_name in app_ids:
-                app_id = app_ids[cr_name]
-            list.append(f"{s} {app_id}")
-
-        header = 'STATEFULSET_NAME@NAMESPACE APP_ID'
-        if KubeContext.in_cluster_namespace():
-            header = 'STATEFULSET_NAME APP_ID'
-        log(lines_to_tabular(list, header))
-
-    def show_pg_hosts(self, state: ReplState):
-        if state.namespace:
-            def line(pg: PostgresSession):
-                return f'{pg.directory()},{pg.endpoint()}:{pg.port()},{pg.username()},{pg.password()}'
-
-            lines = [line(PostgresSession(state.namespace, pg)) for pg in PostgresSession.hosts(state.namespace)]
-
-            log(lines_to_tabular(lines, 'NAME,ENDPOINT,USERNAME,PASSWORD', separator=','))
-        else:
-            def line(pg: PostgresSession):
-                return f'{pg.directory()},{pg.namespace},{pg.endpoint()}:{pg.port()},{pg.username()},{pg.password()}'
-
-            lines = [line(PostgresSession(state.namespace, pg)) for pg in PostgresSession.hosts(state.namespace)]
-
-            log(lines_to_tabular(lines, 'NAME,NAMESPACE,ENDPOINT,USERNAME,PASSWORD', separator=','))
-
-    def show_pg_databases(self, pg: PostgresSession):
-        lines = [db["name"] for db in pg.databases() if db["owner"] == PostgresSession.default_owner()]
-
-        log(lines_to_tabular(lines, 'DATABASE', separator=','))
-
-    def show_pg_tables(self, pg: PostgresSession):
-        lines = [db["name"] for db in pg.tables() if db["schema"] == PostgresSession.default_schema()]
-
-        log(lines_to_tabular(lines, 'NAME', separator=','))
-
     def completion(self, state: ReplState):
-        if state.pod:
-            return {}
-
-        if not state.sts:
-            return {Ls.COMMAND: {n: None for n in StatefulSets.list_sts_names()}}
-
-        return {Ls.COMMAND: None}
+        return Devices.device(state).ls_completion(Ls.COMMAND, state, default = super().completion(state))
 
     def help(self, _: ReplState):
-        return f'{Ls.COMMAND} [device:]\t list apps, envs, clusters, nodes, pg hosts or pg databases'
+        return f'{Ls.COMMAND} [device:]\t list apps, envs, clusters, nodes, pg hosts/databases or export databases'

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_backup.py

@@ -2,9 +2,9 @@ from datetime import datetime
 import re
 
 from adam.commands.command import Command
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
-from adam.k8s_utils.custom_resources import CustomResources
+from adam.utils_k8s.custom_resources import CustomResources
 from adam.utils import log2
 
 

adam/commands/medusa/medusa_restore.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 
 from adam.commands.command import Command
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
-from adam.k8s_utils.custom_resources import CustomResources
+from adam.utils_k8s.custom_resources import CustomResources
 from adam.config import Config
 from adam.utils import lines_to_tabular, log2
 
@@ -59,8 +59,7 @@ class MedusaRestore(Command):
         now_dtformat = datetime.now().strftime("%Y-%m-%d.%H.%M.%S")
         rtname = 'medusa-' + now_dtformat + '-restore-from-' + bkname
         try:
-            print('SEAN doing')
-            # CustomResources.create_medusa_restorejob(rtname, bkname, dc, ns)
+            CustomResources.create_medusa_restorejob(rtname, bkname, dc, ns)
         except Exception as e:
             log2("Exception: MedusaRestore failed: %s\n" % e)
 

adam/commands/medusa/medusa_show_backupjobs.py

@@ -1,7 +1,7 @@
 from adam.commands.command import Command
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
-from adam.k8s_utils.custom_resources import CustomResources
+from adam.utils_k8s.custom_resources import CustomResources
 from adam.utils import lines_to_tabular, log2
 
 
@@ -29,6 +29,7 @@ class MedusaShowBackupJobs(Command):
         state, args = self.apply_state(args, state)
         if not self.validate_state(state):
             return state
+
         ns = state.namespace
         dc = StatefulSets.get_datacenter(state.sts, ns)
         if not dc:
@@ -49,4 +50,4 @@ class MedusaShowBackupJobs(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{MedusaShowBackupJobs.COMMAND}\t start a restore job'
+        return f'{MedusaShowBackupJobs.COMMAND}\t show Medusa backups'

adam/commands/medusa/medusa_show_restorejobs.py

@@ -1,7 +1,7 @@
 from adam.commands.command import Command
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
-from adam.k8s_utils.custom_resources import CustomResources
+from adam.utils_k8s.custom_resources import CustomResources
 from adam.utils import lines_to_tabular, log2
 
 class MedusaShowRestoreJobs(Command):
@@ -49,4 +49,4 @@ class MedusaShowRestoreJobs(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{MedusaShowRestoreJobs.COMMAND}\t start a restore job'
+        return f'{MedusaShowRestoreJobs.COMMAND}\t show Medusa restores'

adam/commands/nodetool.py

@@ -4,10 +4,11 @@ from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterOrPodCommandHelper
 from adam.commands.nodetool_commands import NODETOOL_COMMANDS
 from adam.config import Config
-from adam.k8s_utils.cassandra_clusters import CassandraClusters
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.cassandra_clusters import CassandraClusters
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log
+from adam.utils_k8s.statefulsets import StatefulSets
 
 class NodeTool(Command):
     COMMAND = 'nodetool'
@@ -43,14 +44,18 @@ class NodeTool(Command):
         elif state.sts:
             return CassandraClusters.exec(state.sts, state.namespace, command, action='nodetool', show_out=True)
 
+        return state
+
     def completion(self, state: ReplState):
         if state.pod or state.sts:
-            return {NodeTool.COMMAND: {'help': None} | {c: None for c in NODETOOL_COMMANDS}}
+            d = {c: {'&': None} for c in NODETOOL_COMMANDS}
+            return {NodeTool.COMMAND: {'help': None} | d} | \
+                   {f'@{p}': {NodeTool.COMMAND: d} for p in StatefulSets.pod_names(state.sts, state.namespace)}
 
         return {}
 
     def help(self, _: ReplState):
-        return f'{NodeTool.COMMAND} <sub-command>\t run nodetool with arguments'
+        return f'{NodeTool.COMMAND} <sub-command> [&]\t run nodetool with arguments'
 
 class NodeToolCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):

adam/commands/param_set.py

@@ -38,7 +38,7 @@ class SetParam(Command):
         return value
 
     def completion(self, _: ReplState):
-        return {SetParam.COMMAND: {key: None for key in Config().keys()}}
+        return {SetParam.COMMAND: {key: ({'true': None, 'false': None} if Config().get(key, None) in [True, False] else None) for key in Config().keys()}}
 
     def help(self, _: ReplState):
         return f"{SetParam.COMMAND} <key> <value>\t sets a Kaqing parameter to a different value"

adam/commands/postgres/postgres.py

@@ -1,12 +1,13 @@
 import click
 
 from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
+from adam.commands.postgres.psql_completions import psql_completions
+from adam.commands.postgres.postgres_utils import pg_table_names
 from .postgres_ls import PostgresLs
 from .postgres_preview import PostgresPreview
-from .postgres_session import PostgresSession
+from .postgres_context import PostgresContext
 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'
@@ -30,35 +31,27 @@ class Postgres(Command):
 
         state, args = self.apply_state(args, state)
 
-        if state.in_repl:
-            if not args:
+        if not args:
+            if state.in_repl:
                 log2('Please use SQL statement. e.g. pg \l')
-
-                return 'command-missing'
             else:
-                self.run_sql(state, args)
-        else:
-            if not args:
                 log2('* Command or SQL statements is missing.')
                 Command.display_help()
 
-                return 'command-missing'
-            else:
-                # head with the Chain of Responsibility pattern
-                cmds = Command.chain(Postgres.cmd_list())
-                if not cmds.run(cmd, state) :
-                    if not args:
-                        log2('* Command or SQL statements is missing.')
-                        Command.display_help()
+            return 'command-missing'
 
-                        return 'command-missing'
-                    else:
-                        self.run_sql(state, args)
+        if state.in_repl:
+            self.run_sql(state, args)
+        else:
+            # head with the Chain of Responsibility pattern
+            cmds = Command.chain(Postgres.cmd_list())
+            if not cmds.run(cmd, state) :
+                self.run_sql(state, args)
 
         return state
 
     def cmd_list():
-        return [PostgresLs(), PostgresPreview()]
+        return [PostgresLs(), PostgresPreview(), PostgresPg()]
 
     def run_sql(self, state: ReplState, args: list[str]):
         if not state.pg_path:
@@ -69,21 +62,23 @@ class Postgres(Command):
 
             return state
 
-        PostgresSession(state.namespace, state.pg_path).run_sql(' '.join(args))
+        background = False
+        if args and args[-1] == '&':
+            args = args[:-1]
+            background = True
+
+        PostgresContext.apply(state.namespace, state.pg_path).run_sql(' '.join(args), background=background)
 
     def completion(self, state: ReplState):
+        if state.device != state.P:
+            # conflicts with cql completions
+            return {}
+
         leaf = {}
-        if PostgresSession(state.namespace, state.pg_path).db:
-            leaf = {
-                '\h': None,
-                '\d': None,
-                '\dt': None,
-                '\du': None,
-                'delete': {'from': None},
-                'insert': {'into': None},
-                'select': None,
-                'update': None,
-            }
+        session = PostgresContext.apply(state.namespace, state.pg_path)
+        if session.db:
+          if pg_table_names(state.namespace, state.pg_path):
+            leaf = psql_completions(state.namespace, state.pg_path)
         elif state.pg_path:
             leaf = {
                 '\h': None,
@@ -96,18 +91,22 @@ class Postgres(Command):
             return {}
 
     def help(self, _: ReplState):
-        return f'[{Postgres.COMMAND}] <sql-statements>\t run psql with queries'
+        return f'<sql-statements> [&]\t run queries on Postgres databases'
 
 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')
-        log('          e.g. stgawsscpsr_c3_c3')
+        log('          e.g. stgawsscpsr_c3_c3')
+
+# No action body, only for a help entry and auto-completion
+class PostgresPg(Command):
+    COMMAND = 'pg'
+
+    def command(self):
+        return PostgresPg.COMMAND
+
+    def help(self, _: ReplState):
+        return f'pg <sql-statements>\t run queries on Postgres databases'