kaqing 2.0.115__py3-none-any.whl → 2.0.172__py3-none-any.whl

adam/commands/report.py

@@ -29,35 +29,33 @@ class Report(Command):
         if not(args := self.args(cmd)):
             return super().run(cmd, state)
 
-        output: dict[str, any] = {}
-        state, args = self.apply_state(args, state)
-        if not self.validate_state(state):
-            return state
-
-        if state.in_repl:
-            args, show = Command.extract_options(args, ['-s', '--show'])
-
-            args, redirect = Command.extract_options(args, ['>'])
-            if not redirect or not args:
-                log2('Please specify file name: e.g. report > /tmp/report.log')
-                return 'no-report-destination'
-
-            results = run_checks(state.sts, state.namespace, state.pod, show_output=show)
-            output = CheckResult.report(results)
-            with open(args[0], "w") as json_file:
-                json.dump(output, json_file, indent=2)
-                log2(f'Report stored in {args[0]}.')
-        else:
-            args, show = Command.extract_options(args, ['-s', '--show'])
-
-            results = run_checks(state.sts, state.namespace, state.pod, show_output=show)
-            output = CheckResult.report(results)
-            click.echo(json.dumps(output, indent=2))
-
-        return output
-
-    def completion(self, _: ReplState):
-        return {Report.COMMAND: {">": None}}
+        with self.validate(args, state) as (args, state):
+            output: dict[str, any] = {}
+
+            if state.in_repl:
+                args, show = Command.extract_options(args, ['-s', '--show'])
+
+                args, redirect = Command.extract_options(args, ['>'])
+                if not redirect or not args:
+                    log2('Please specify file name: e.g. report > /tmp/report.log')
+                    return 'no-report-destination'
+
+                results = run_checks(state.sts, state.namespace, state.pod, show_out=show)
+                output = CheckResult.report(results)
+                with open(args[0], "w") as json_file:
+                    json.dump(output, json_file, indent=2)
+                    log2(f'Report stored in {args[0]}.')
+            else:
+                args, show = Command.extract_options(args, ['-s', '--show'])
+
+                results = run_checks(state.sts, state.namespace, state.pod, show_out=show)
+                output = CheckResult.report(results)
+                click.echo(json.dumps(output, indent=2))
+
+            return output
+
+    def completion(self, state: ReplState):
+        return super().completion(state, {">": None})
 
     def help(self, _: ReplState):
         return f"{Report.COMMAND} > <file-name>\t generate report"

adam/commands/restart.py

@@ -1,3 +1,4 @@
+from adam.commands import extract_options
 from adam.commands.command import Command
 from adam.utils_k8s.pods import Pods
 from adam.utils_k8s.statefulsets import StatefulSets
@@ -26,34 +27,32 @@ class Restart(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
-
-        args, forced = Command.extract_options(args, '--force')
-        if not args:
-            if state.pod:
-                log2(f'Restarting {state.pod}...')
-                Pods.delete(state.pod, state.namespace)
-            else:
-                if not forced:
-                    log2('Please add --force for restarting all nodes in a cluster.')
-                    return 'force-needed'
-
-                log2(f'Restarting all pods from {state.sts}...')
-                for pod_name in StatefulSets.pod_names(state.sts, state.namespace):
-                    Pods.delete(pod_name, state.namespace)
-        else:
-            for arg in args:
-                Pods.delete(arg, state.namespace)
-
-        return state
+        with self.validate(args, state) as (args, state):
+            with extract_options(args, '--force') as (args, forced):
+                if not args:
+                    if state.pod:
+                        log2(f'Restarting {state.pod}...')
+                        Pods.delete(state.pod, state.namespace)
+                    else:
+                        if not forced:
+                            log2('Please add --force for restarting all nodes in a cluster.')
+                            return 'force-needed'
+
+                        log2(f'Restarting all pods from {state.sts}...')
+                        for pod_name in StatefulSets.pod_names(state.sts, state.namespace):
+                            Pods.delete(pod_name, state.namespace)
+                else:
+                    for arg in args:
+                        Pods.delete(arg, state.namespace)
+
+                return state
 
     def completion(self, state: ReplState):
-        if state.pod:
-            return {Restart.COMMAND: None}
-        elif state.sts:
-            return {Restart.COMMAND: {p: None for p in StatefulSets.pod_names(state.sts, state.namespace)}}
+        if super().completion(state):
+            if state.pod:
+                return {Restart.COMMAND: None}
+            elif state.sts:
+                return {Restart.COMMAND: {p: None for p in StatefulSets.pod_names(state.sts, state.namespace)}}
 
         return {}
 

adam/commands/rollout.py

@@ -2,6 +2,7 @@ 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.utils_k8s.statefulsets import StatefulSets
@@ -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

@@ -2,6 +2,7 @@ import os
 
 from adam.commands.command import Command
 from adam.repl_state import ReplState
+from adam.utils import log2
 
 class Shell(Command):
     COMMAND = ':sh'
@@ -18,13 +19,18 @@ 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, _):
+            if args:
+                os.system(' '.join(args))
+                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,25 +1,23 @@
 import click
 
-from adam.commands.audit.show_last10 import ShowLast10
-from adam.commands.command import Command
+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_app_actions import ShowAppActions
-from adam.commands.show.show_app_queues import ShowAppQueues
 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_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
 
-class Show(Command):
+class Show(IntermediateCommand):
     COMMAND = 'show'
 
     # the singleton pattern
@@ -28,27 +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)
-
-        return super().intermediate_run(cmd, state, args, Show.cmd_list())
-
-    def cmd_list():
+    def cmd_list(self):
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), ShowHost(), ShowLogin(), ShowKubectlCommands(),
-                ShowParams(), ShowProcesses(), ShowRepairs(), ShowStorage(), ShowAdam(),
-                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs(),
-                ShowLast10()]
-
-    def completion(self, state: ReplState):
-        return super().completion(state)
+                ShowParams(), ShowProcesses(), ShowCassandraRepairs(), ShowStorage(), ShowAdam(),
+                ShowCassandraStatus(), ShowCassandraVersion(), MedusaShowRestoreJobs(), MedusaShowBackupJobs()]
 
 class ShowCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
-        Command.intermediate_help(super().get_help(ctx), Show.COMMAND, Show.cmd_list(), show_cluster_help=True)
+        IntermediateCommand.intermediate_help(super().get_help(ctx), Show.COMMAND, Show().cmd_list(), show_cluster_help=True)

adam/commands/show/show_cassandra_repairs.py

@@ -0,0 +1,35 @@
+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 cassandra(state) as pods:
+                return pods.nodetool('repair_admin list')
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{ShowCassandraRepairs.COMMAND}\t show Cassandra repairs'

adam/commands/show/show_cassandra_status.py

@@ -5,14 +5,14 @@ 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
 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.utils_k8s.cassandra_nodes import CassandraNodes
-from adam.utils_k8s.secrets import Secrets
+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 lines_to_tabular, log, log2, log_exc
 from adam.checks.status import parse_nodetool_status
 
 class ShowCassandraStatus(Command):
@@ -37,50 +37,42 @@ 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_options(args, ['-s', '--show']) as (args, show_out):
+                if state.namespace and state.pod:
+                    self.show_single_pod(state, show_out=show_out)
+                elif state.namespace and state.sts:
+                    self.merge(state, Config().get('nodetool.samples', sys.maxsize), show_output=show_out)
 
-        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):
+        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)
 
-    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):
         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)
+        check_results = run_checks(cluster=state.sts, namespace=state.namespace, checks=[CompactionStats(), Gossip()], show_out=show_output)
         self.show_table(combined_status, check_results)
 
         return combined_status
@@ -116,13 +108,10 @@ class ShowCassandraStatus(Command):
 
         log(lines_to_tabular(lines, header, separator=','))
 
-        Issues.show(check_results)
+        IssuesUtils.show(check_results)
 
     def completion(self, state: ReplState):
-        if state.sts:
-            return super().completion(state)
-
-        return {}
+        return super().completion(state, {'-s': 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.utils_k8s.cassandra_clusters import CassandraClusters
-from adam.utils_k8s.cassandra_nodes import CassandraNodes
-from adam.utils_k8s.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_commands.py

@@ -25,36 +25,31 @@ class ShowKubectlCommands(Command):
         if not self.args(cmd):
             return super().run(cmd, state)
 
-        if not self.validate_state(state):
-            return 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"]}',
+        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-?"]}',
             ]
 
-        cmds += [f'{k},{v0}' for k, v0 in v.items() if k.startswith('pg-')]
+            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"]}',
+                ]
 
-        log(lines_to_tabular(cmds, separator=','))
+            cmds += [f'{k},{v0}' for k, v0 in v.items() if k.startswith('pg-')]
 
-        return cmds
+            log(lines_to_tabular(cmds, separator=','))
 
-    def completion(self, state: ReplState):
-        if not state.sts:
-            return {}
+            return cmds
 
+    def completion(self, state: ReplState):
         return super().completion(state)
 
     def help(self, _: ReplState):

adam/commands/show/show_host.py

@@ -19,7 +19,7 @@ class ShowHost(Command):
         return ShowHost.COMMAND
 
     def run(self, cmd: str, state: ReplState):
-        if not(args := self.args(cmd)):
+        if not self.args(cmd):
             return super().run(cmd, state)
 
         log(get_my_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, lines_to_tabular, log, log2, log_exc
 
 class ShowLogin(Command):
     COMMAND = 'show login'
@@ -31,30 +29,25 @@ class ShowLogin(Command):
         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)}'
+                    ]
+                    log(lines_to_tabular(lines, separator='\t'))
+
+            return state
 
     def completion(self, state: ReplState):
         return super().completion(state)