kaqing 2.0.14__py3-none-any.whl → 2.0.189__py3-none-any.whl

adam/commands/rollout.py

@@ -2,9 +2,10 @@ import datetime
 from kubernetes import client
 from kubernetes.client.rest import ApiException
 
+from adam.commands import extract_options
 from adam.commands.command import Command
 from adam.commands.watch import Watch
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.config import Config
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import duration, log2
@@ -31,32 +32,28 @@ class RollOut(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
+        with self.validate(args, state) as (args, state):
+            with extract_options(args, '--force') as (args, forced):
+                restarted, rollingout = StatefulSets.restarted_at(state.sts, state.namespace)
+                if rollingout and not forced:
+                    log2(f"* Cluster is being rolled out for {duration(restarted)}. Please wait until it's done or use --force.")
 
-        args, forced = Command.extract_options(args, '--force')
+                    return state
 
-        restarted, rollingout = StatefulSets.restarted_at(state.sts, state.namespace)
-        if rollingout and not forced:
-            log2(f"* Cluster is being rolled out for {duration(restarted)}. Please wait until it's done or use --force.")
+                self.rolling_restart(state.sts, state.namespace)
 
-            return state
+                auto_watch = False
+                if (auto_watch_cmds := Config().get('watch.auto', 'rollout')):
+                    cmds = [c.strip(' ') for c in auto_watch_cmds.split(',')]
+                    if self.command() in cmds:
+                        auto_watch = True
+                        log2('Rolling out cluster with auto watch...')
+                        Watch().run('watch', state)
 
-        self.rolling_restart(state.sts, state.namespace)
+                if not auto_watch:
+                    log2('Rolling out cluster...')
 
-        auto_watch = False
-        if (auto_watch_cmds := Config().get('watch.auto', 'rollout')):
-            cmds = [c.strip(' ') for c in auto_watch_cmds.split(',')]
-            if self.command() in cmds:
-                auto_watch = True
-                log2('Rolling out cluster with auto watch...')
-                Watch().run('watch', state)
-
-        if not auto_watch:
-            log2('Rolling out cluster...')
-
-        return state
+                return state
 
     def rolling_restart(self, statefulset, namespace):
         # kubectl rollout restart statefulset <statefulset-name>
@@ -82,9 +79,7 @@ class RollOut(Command):
             log2("Exception when calling AppsV1Api->read_namespaced_statefulset_status: %s\n" % e)
 
     def completion(self, state: ReplState):
-        if state.pod:
-            return {}
-        elif state.sts:
+        if super().completion(state):
             return {RollOut.COMMAND: None}
 
         return {}

adam/commands/shell.py

@@ -1,7 +1,9 @@
 import os
 
+from adam.commands import validate_args
 from adam.commands.command import Command
 from adam.repl_state import ReplState
+from adam.utils import log2
 
 class Shell(Command):
     COMMAND = ':sh'
@@ -18,13 +20,19 @@ class Shell(Command):
     def command(self):
         return Shell.COMMAND
 
-    def run(self, cmd: str, s0: ReplState):
+    def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
-            return super().run(cmd, s0)
+            return super().run(cmd, state)
 
-        _, args = self.apply_state(args, s0)
+        with self.validate(args, state) as (args, _):
+            with validate_args(args, state, at_least=0) as args_str:
+                if args_str:
+                    os.system(args_str)
+                    log2()
+                else:
+                    os.system('QING_DROPPED=true bash')
 
-        os.system('QING_DROPPED=true bash')
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/show/show.py

@@ -1,23 +1,23 @@
 import click
 
-from adam.commands.command import Command
-from adam.commands.command_helpers import ClusterCommandHelper
-from adam.commands.show.show_app_actions import ShowAppActions
-from adam.commands.show.show_app_queues import ShowAppQueues
+from adam.commands.app.show_app_actions import ShowAppActions
+from adam.commands.app.show_app_id import ShowAppId
+from adam.commands.app.show_app_queues import ShowAppQueues
+from adam.commands.intermediate_command import IntermediateCommand
+from adam.commands.medusa.medusa_show_backupjobs import MedusaShowBackupJobs
+from adam.commands.medusa.medusa_show_restorejobs import MedusaShowRestoreJobs
+from adam.commands.show.show_host import ShowHost
 from adam.commands.show.show_login import ShowLogin
 from .show_params import ShowParams
-from .show_app_id import ShowAppId
 from .show_cassandra_status import ShowCassandraStatus
 from .show_cassandra_version import ShowCassandraVersion
-from .show_commands import ShowKubectlCommands
+from .show_cli_commands import ShowKubectlCommands
 from .show_processes import ShowProcesses
-from .show_repairs import ShowRepairs
+from .show_cassandra_repairs import ShowCassandraRepairs
 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):
+class Show(IntermediateCommand):
     COMMAND = 'show'
 
     # the singleton pattern
@@ -26,45 +26,14 @@ class Show(Command):
 
         return cls.instance
 
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
     def command(self):
         return Show.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)
-
-        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()
-
-    def cmd_list():
-        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowLogin(), ShowKubectlCommands(), ShowParams(), ShowProcesses(), ShowRepairs(),
-                ShowStorage(), ShowAdam(), ShowCassandraStatus(), ShowCassandraVersion()]
-
-    def completion(self, state: ReplState):
-        return super().completion(state)
-
-    def help(self, _: ReplState):
-        return f"{Show.COMMAND}\t show kubectl commands"
+    def cmd_list(self):
+        return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
+                ShowParams(), ShowProcesses(), ShowCassandraRepairs(), ShowStorage(), ShowAdam(),
+                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
 
 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()
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Show.COMMAND, Show().cmd_list(), show_cluster_help=True)

adam/commands/show/show_adam.py

@@ -1,7 +1,7 @@
 import sys
 import os
 
-from adam.utils import lines_to_tabular, log2
+from adam.utils import tabulize, log2
 
 current_dir = os.path.dirname(os.path.abspath(__file__))
 
@@ -34,10 +34,10 @@ class ShowAdam(Command):
 
         package = os.path.dirname(os.path.abspath(__file__))
         package = package.split('/adam/')[0] + '/adam'
-        log2(lines_to_tabular([
+        tabulize([
             f'version\t{__version__}',
             f'source\t{package}'
-        ], separator='\t'))
+        ], separator='\t', to=2)
 
         return state
 

adam/commands/show/show_cassandra_repairs.py

@@ -0,0 +1,37 @@
+from adam.commands import extract_trailing_options
+from adam.commands.command import Command
+from adam.commands.cql.utils_cql import cassandra
+from adam.repl_state import ReplState, RequiredState
+
+class ShowCassandraRepairs(Command):
+    COMMAND = 'show cassandra repairs'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowCassandraRepairs, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowCassandraRepairs.COMMAND
+
+    def required(self):
+        return RequiredState.CLUSTER_OR_POD
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        with self.validate(args, state) as (args, state):
+            with extract_trailing_options(args, '&') as (args, backgrounded):
+                with cassandra(state) as pods:
+                    return pods.nodetool('repair_admin list', backgrounded=backgrounded)
+
+    def completion(self, state: ReplState):
+        return super().completion(state, {'&': None})
+
+    def help(self, _: ReplState):
+        return f'{ShowCassandraRepairs.COMMAND}\t show Cassandra repairs'

adam/commands/show/show_cassandra_status.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 import sys
 
 from adam.checks.check_result import CheckResult
@@ -5,14 +6,15 @@ from adam.checks.check_utils import run_checks
 from adam.checks.compactionstats import CompactionStats
 from adam.checks.gossip import Gossip
 from adam.columns.columns import Columns
+from adam.commands import extract_options, extract_trailing_options
 from adam.commands.command import Command
-from adam.commands.issues import Issues
+from adam.commands.cql.utils_cql import cassandra
 from adam.config import Config
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
-from adam.k8s_utils.secrets import Secrets
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.repl_session import ReplSession
+from adam.utils_issues import IssuesUtils
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import lines_to_tabular, log, log2
+from adam.utils import SORT, tabulize, log2, log_exc
 from adam.checks.status import parse_nodetool_status
 
 class ShowCassandraStatus(Command):
@@ -37,51 +39,44 @@ class ShowCassandraStatus(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
+        with self.validate(args, state) as (args, state):
+            with extract_trailing_options(args, '&') as (args, backgrounded):
+                with extract_options(args, ['-s', '--show']) as (args, show_out):
+                    if state.namespace and state.pod:
+                        self.show_single_pod(state, show_out=show_out, backgrounded=backgrounded)
+                    elif state.namespace and state.sts:
+                        self.merge(state, Config().get('nodetool.samples', sys.maxsize), show_output=show_out, backgrounded=backgrounded)
 
-        args, show_output = Command.extract_options(args, ['-s', '--show'])
+                    return state
 
-        if state.namespace and state.pod:
-            # self.show_table(state, [state.pod], state.namespace, show_output=show_output)
-            self.show_single_pod(state.sts, state.pod, state.namespace, show_output=show_output)
-        elif state.namespace and state.sts:
-            self.merge(state.sts, StatefulSets.pod_names(state.sts, state.namespace), state.namespace, Config().get('nodetool.samples', sys.maxsize), show_output=show_output)
-
-        return state
-
-    def show_single_pod(self, statefulset: str, pod_name: str, ns: str, show_output = False):
-        pod_name = pod_name.split('(')[0]
-        user, pw = Secrets.get_user_pass(pod_name, ns)
-        try:
-            result = CassandraNodes.exec(pod_name, ns, f"nodetool -u {user} -pw {pw} status", show_out=False)
-            status = parse_nodetool_status(result.stdout)
-            check_results = run_checks(cluster=statefulset, namespace=ns, checks=[CompactionStats(), Gossip()], show_output=show_output)
-            self.show_table(status, check_results)
-        except Exception as e:
-            log2(e)
+    def show_single_pod(self, state: ReplState, show_out = False, backgrounded = False):
+        with log_exc(True):
+            with cassandra(state) as pods:
+                result = pods.nodetool('status', show_out=False)
+                status = parse_nodetool_status(result.stdout)
+                check_results = run_checks(cluster=state.sts, namespace=state.namespace, checks=[CompactionStats(), Gossip()], show_out=show_out)
+                self.show_table(status, check_results, backgrounded=backgrounded)
 
-    def merge(self, statefulset: str, pod_names: list[str], ns: str, samples: int, show_output=False):
+    def merge(self, state: ReplState, samples: int, show_output=False, backgrounded = False):
         statuses: list[list[dict]] = []
+
+        pod_names = StatefulSets.pod_names(state.sts, state.namespace)
         for pod_name in pod_names:
             pod_name = pod_name.split('(')[0]
-            user, pw = Secrets.get_user_pass(pod_name, ns)
 
-            try:
-                result = CassandraNodes.exec(pod_name, ns, f"nodetool -u {user} -pw {pw} status", show_out=False)
-                status = parse_nodetool_status(result.stdout)
-                if status:
-                    statuses.append(status)
-                if samples <= len(statuses) and len(pod_names) != len(statuses):
-                    break
-            except Exception as e:
-                log2(e)
+            with log_exc(True):
+                with cassandra(state, pod=pod_name) as pods:
+                    result = pods.nodetool('status', show_out=False)
+                    status = parse_nodetool_status(result.stdout)
+                    if status:
+                        statuses.append(status)
+                    if samples <= len(statuses) and len(pod_names) != len(statuses):
+                        break
 
         combined_status = self.merge_status(statuses)
         log2(f'Showing merged status from {len(statuses)}/{len(pod_names)} nodes...')
-        check_results = run_checks(cluster=statefulset, namespace=ns, checks=[CompactionStats(), Gossip()], show_output=show_output)
-        self.show_table(combined_status, check_results)
+        check_results = run_checks(cluster=state.sts, namespace=state.namespace, checks=[CompactionStats(), Gossip()], show_out=show_output)
+        self.show_table(combined_status, check_results, backgrounded=backgrounded)
 
         return combined_status
 
@@ -102,27 +97,28 @@ class ShowCassandraStatus(Command):
 
         return combined
 
-    def show_table(self, status: list[dict[str, any]], check_results: list[CheckResult]):
+    def show_table(self, status: list[dict[str, any]], check_results: list[CheckResult], backgrounded=False):
         cols = Config().get('status.columns', 'status,address,load,tokens,owns,host_id,gossip,compactions')
         header = Config().get('status.header', '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS')
         columns = Columns.create_columns(cols)
 
-        def line(status: dict):
-            cells = [c.host_value(check_results, status) for c in columns]
-            return ','.join(cells)
+        r = tabulize(status, lambda s: ','.join([c.host_value(check_results, s) for c in columns]), header=header, separator=',', sorted=SORT, to = 0 if backgrounded else 1)
 
-        lines = [line(d) for d in status]
-        lines.sort()
+        if backgrounded:
+            log_prefix = Config().get('log-prefix', '/tmp/qing')
+            log_file = f'{log_prefix}-{datetime.now().strftime("%d%H%M%S")}.log'
 
-        log(lines_to_tabular(lines, header, separator=','))
+            with open(log_file, 'w') as f:
+                f.write(r)
 
-        Issues.show(check_results)
+            ReplSession().append_history(f':sh cat {log_file}')
 
-    def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
+            r = log_file
 
-        return {}
+        IssuesUtils.show(check_results)
+
+    def completion(self, state: ReplState):
+        return super().completion(state, {'-s': {'&': None}, '&': None})
 
     def help(self, _: ReplState):
         return f'{ShowCassandraStatus.COMMAND} [-s]\t show merged nodetool status  -s show commands on nodes'

adam/commands/show/show_cassandra_version.py

@@ -1,7 +1,5 @@
 from adam.commands.command import Command
-from adam.k8s_utils.cassandra_clusters import CassandraClusters
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
-from adam.k8s_utils.secrets import Secrets
+from adam.commands.cql.utils_cql import cassandra
 from adam.repl_state import ReplState, RequiredState
 
 class ShowCassandraVersion(Command):
@@ -26,23 +24,12 @@ class ShowCassandraVersion(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        state, _ = state.apply_args(args)
-        if not self.validate_state(state):
-            return state
-
-        user, pw = Secrets.get_user_pass(state.sts if state.sts else state.pod, state.namespace, secret_path='cql.secret')
-        command = f'cqlsh -u {user} -p {pw} -e "show version"'
-
-        if state.pod:
-            return CassandraNodes.exec(state.pod, state.namespace, command)
-        else:
-            return CassandraClusters.exec(state.sts, state.namespace, command, action='cql')
+        with self.validate(args, state) as (_, state):
+            with cassandra(state) as pods:
+                return pods.cql('show version', show_out=True, on_any=True)
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state)
 
     def help(self, _: ReplState):
         return f'{ShowCassandraVersion.COMMAND}\t show Cassandra version'

adam/commands/show/show_cli_commands.py

@@ -0,0 +1,56 @@
+from adam.commands.command import Command
+from adam.commands.cli_commands import CliCommands
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import tabulize, log
+
+class ShowKubectlCommands(Command):
+    COMMAND = 'show cli-commands'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowKubectlCommands, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowKubectlCommands.COMMAND
+
+    def required(self):
+        return RequiredState.CLUSTER_OR_POD
+
+    def run(self, cmd: str, state: ReplState):
+        if not (args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        with self.validate(args, state) as (args, state):
+            v = CliCommands.values(state, collapse=True)
+            # node-exec-?, nodetool-?, cql-?, reaper-exec, reaper-forward, reaper-ui, reaper-username, reaper-password
+            cmds = [
+                f'bash,{v["node-exec-?"]}',
+                f'nodetool,{v["nodetool-?"]}',
+                f'cql,{v["cql-?"]}',
+            ]
+
+            if 'reaper-exec' in v:
+                cmds += [
+                    f'reaper,{v["reaper-exec"]}',
+                    f',{v["reaper-forward"]}  * should be run from your laptop',
+                    f',{v["reaper-ui"]}',
+                    f',{v["reaper-username"]}',
+                    f',{v["reaper-password"]}',
+                ]
+
+            cmds += [f'{k},{v0}' for k, v0 in v.items() if k.startswith('pg-')]
+
+            tabulize(cmds, separator=',')
+
+            return cmds
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f"{ShowKubectlCommands.COMMAND}\t show kubectl commands"

adam/commands/show/show_host.py

@@ -0,0 +1,33 @@
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+from adam.utils import log
+from adam.utils_net import get_my_host
+
+class ShowHost(Command):
+    COMMAND = 'show host'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(ShowHost, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return ShowHost.COMMAND
+
+    def run(self, cmd: str, state: ReplState):
+        if not self.args(cmd):
+            return super().run(cmd, state)
+
+        log(get_my_host())
+
+        return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{ShowHost.COMMAND}\t show host'

adam/commands/show/show_login.py

@@ -1,13 +1,11 @@
 import time
-import traceback
 
 from adam.apps import Apps
-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.utils import duration, lines_to_tabular, log, log2
+from adam.utils import duration, tabulize, log, log2, log_exc
 
 class ShowLogin(Command):
     COMMAND = 'show login'
@@ -24,34 +22,32 @@ class ShowLogin(Command):
     def command(self):
         return ShowLogin.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)
-
-        login: IdpLogin = None
-        try:
-            if not(host := Apps.app_host('c3', 'c3', state.namespace)):
-                log2('Cannot locate ingress for app.')
-                return state
-
-            login = Idp.login(host, use_token_from_env=True)
-            if login and login.id_token_obj:
-                it = login.id_token_obj
-                lines = [
-                    f'email\t{it.email}',
-                    f'user\t{it.username}',
-                    f'IDP expires in\t{duration(time.time(), it.exp)}',
-                    f'IDP Groups\t{",".join(it.groups)}'
-                ]
-                log(lines_to_tabular(lines, separator='\t'))
-        except Exception as e:
-            log2(e)
-            if Config().is_debug():
-                log2(traceback.format_exc())
-
-        return state
+        with self.validate(args, state) as (args, state):
+            login: IdpLogin = None
+            with log_exc(True):
+                if not(host := Apps.app_host('c3', 'c3', state.namespace)):
+                    log2('Cannot locate ingress for app.')
+                    return state
+
+                login = Idp.login(host, use_token_from_env=True)
+                if login and login.id_token_obj:
+                    it = login.id_token_obj
+                    lines = [
+                        f'email\t{it.email}',
+                        f'user\t{it.username}',
+                        f'IDP expires in\t{duration(time.time(), it.exp)}',
+                        f'IDP Groups\t{",".join(it.groups)}'
+                    ]
+                    tabulize(lines, separator='\t')
+
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)

adam/commands/show/show_params.py

@@ -1,7 +1,7 @@
 from adam.commands.command import Command
 from adam.config import Config
 from adam.repl_state import ReplState
-from adam.utils import lines_to_tabular, log
+from adam.utils import tabulize
 
 class ShowParams(Command):
     COMMAND = 'show params'
@@ -22,10 +22,7 @@ class ShowParams(Command):
         if not self.args(cmd):
             return super().run(cmd, state)
 
-        lines = [f'{key}\t{Config().get(key, None)}' for key in Config().keys()]
-        log(lines_to_tabular(lines, separator='\t'))
-
-        return lines
+        return tabulize(Config().keys(), lambda k: f'{k}\t{Config().get(k, None)}', separator='\t')
 
     def completion(self, state: ReplState):
         return super().completion(state)