kaqing 2.0.92__tar.gz → 2.0.94__tar.gz

{kaqing-2.0.92 → kaqing-2.0.94}/PKG-INFO

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

{kaqing-2.0.92 → kaqing-2.0.94}/adam/apps.py

@@ -5,10 +5,10 @@ from typing import cast
 import yaml
 
 from adam.config import Config
-from adam.k8s_utils.ingresses import Ingresses
+from adam.utils_k8s.ingresses import Ingresses
 
 from . import __version__
-from adam.k8s_utils.services import Services
+from adam.utils_k8s.services import Services
 from adam.utils import copy_config_file
 
 class AppAction:

{kaqing-2.0.92 → kaqing-2.0.94}/adam/batch.py

@@ -25,7 +25,7 @@ from adam.commands.restart import Restart
 from adam.commands.rollout import RollOut
 from adam.commands.show.show import Show, ShowCommandHelper
 from adam.commands.watch import Watch
-from adam.k8s_utils.kube_context import KubeContext
+from adam.utils_k8s.kube_context import KubeContext
 from adam.repl import enter_repl
 from adam.repl_state import ReplState
 from adam.cli_group import cli

{kaqing-2.0.92 → kaqing-2.0.94}/adam/checks/check_utils.py

@@ -13,10 +13,10 @@ from adam.checks.issue import Issue
 from adam.checks.memory import Memory
 from adam.checks.status import Status
 from adam.config import Config
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.secrets import Secrets
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.kube_context import KubeContext
+from adam.utils_k8s.secrets import Secrets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.utils import elapsed_time, log2
 
 def all_checks() -> list[Check]:

{kaqing-2.0.92 → kaqing-2.0.94}/adam/checks/compactionstats.py

@@ -5,7 +5,7 @@ from adam.checks.check_context import CheckContext
 from adam.checks.check_result import CheckResult
 from adam.checks.issue import Issue
 from adam.config import Config
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
 
 class CompactionStats(Check):
     def name(self):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/checks/cpu.py

@@ -5,8 +5,8 @@ from adam.checks.check_context import CheckContext
 from adam.checks.check_result import CheckResult
 from adam.checks.issue import Issue
 from adam.config import Config
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
-from adam.k8s_utils.custom_resources import CustomResources
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.custom_resources import CustomResources
 
 class Cpu(Check):
     def name(self):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/checks/disk.py

@@ -6,7 +6,7 @@ from adam.checks.check_context import CheckContext
 from adam.checks.check_result import CheckResult
 from adam.checks.issue import Issue
 from adam.config import Config
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
 
 class Disk(Check):
     def name(self):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/checks/gossip.py

@@ -4,7 +4,7 @@ from adam.checks.check import Check
 from adam.checks.check_context import CheckContext
 from adam.checks.check_result import CheckResult
 from adam.checks.issue import Issue
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
 
 class Gossip(Check):
     def name(self):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/checks/memory.py

@@ -2,9 +2,9 @@ from adam.checks.check import Check
 from adam.checks.check_context import CheckContext
 from adam.checks.check_result import CheckResult
 from adam.checks.issue import Issue
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
-from adam.k8s_utils.custom_resources import CustomResources
-from adam.k8s_utils.pods import Pods
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.custom_resources import CustomResources
+from adam.utils_k8s.pods import Pods
 
 class Memory(Check):
     def name(self):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/checks/status.py

@@ -4,7 +4,7 @@ from adam.checks.check import Check
 from adam.checks.check_context import CheckContext
 from adam.checks.check_result import CheckResult
 from adam.checks.issue import Issue
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
 
 class Status(Check):
     def name(self):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/bash.py

@@ -1,6 +1,7 @@
 from adam.commands.command import Command
-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.pod_exec_result import PodExecResult
 from adam.repl_state import BashSession, ReplState, RequiredState
 
 class Bash(Command):
@@ -51,7 +52,7 @@ class Bash(Command):
 
             return state
 
-    def exec_with_dir(self, state: ReplState, args: list[str]):
+    def exec_with_dir(self, state: ReplState, args: list[str]) -> list[PodExecResult]:
         session_just_created = False
         if not args:
             session_just_created = True

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/cd.py

@@ -1,9 +1,9 @@
 from adam.commands.command import Command
 from adam.commands.postgres.postgres_utils import pg_database_names
 from adam.commands.postgres.postgres_session import PostgresSession
-from adam.k8s_utils.cassandra_clusters import CassandraClusters
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.cassandra_clusters import CassandraClusters
+from adam.utils_k8s.kube_context import KubeContext
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState
 from adam.utils import log2
 from adam.apps import Apps

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/cli_commands.py

@@ -3,9 +3,9 @@ import re
 
 from adam.commands.reaper.reaper_session import ReaperSession
 from adam.config import Config
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.secrets import Secrets
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.kube_context import KubeContext
+from adam.utils_k8s.secrets import Secrets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState
 
 class CliCommands:

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/commands_utils.py

@@ -6,9 +6,9 @@ from typing import List
 from adam.checks.check_utils import run_checks
 from adam.columns.columns import Columns, collect_checks
 from adam.commands.issues import Issues
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.pods import Pods
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState
 from adam.utils import convert_seconds, duration, lines_to_tabular, log, log2
 

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/cql/cql_utils.py

@@ -2,9 +2,9 @@ import functools
 import re
 
 from adam.config import Config
-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.utils_k8s.cassandra_clusters import CassandraClusters
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.secrets import Secrets
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState
 from adam.utils import log2

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/deploy/code_utils.py

@@ -5,8 +5,8 @@ import subprocess
 
 from adam.apps import Apps
 from adam.config import Config
-from adam.k8s_utils.ingresses import Ingresses
-from adam.k8s_utils.services import Services
+from adam.utils_k8s.ingresses import Ingresses
+from adam.utils_k8s.services import Services
 from adam.utils import log2, random_alphanumeric
 
 def start_user_code(namespace: str):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/deploy/deploy_pod.py

@@ -5,12 +5,12 @@ from adam.commands.command import Command
 from adam.commands.deploy.deploy_utils import creating, deploy_frontend, gen_labels
 from adam.commands.deploy.undeploy_pod import UndeployPod
 from adam.config import Config
-from adam.k8s_utils.config_maps import ConfigMaps
-from adam.k8s_utils.deployment import Deployments
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.service_accounts import ServiceAccounts
-from adam.k8s_utils.volumes import ConfigMapMount
+from adam.utils_k8s.config_maps import ConfigMaps
+from adam.utils_k8s.deployment import Deployments
+from adam.utils_k8s.kube_context import KubeContext
+from adam.utils_k8s.pods import Pods
+from adam.utils_k8s.service_accounts import ServiceAccounts
+from adam.utils_k8s.volumes import ConfigMapMount
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/deploy/deploy_utils.py

@@ -1,7 +1,7 @@
 from typing import Callable
 from adam.app_session import AppSession
-from adam.k8s_utils.ingresses import Ingresses
-from adam.k8s_utils.services import Services
+from adam.utils_k8s.ingresses import Ingresses
+from adam.utils_k8s.services import Services
 from adam.utils import log2
 
 def deploy_frontend(name: str, namespace: str, label_selector: str):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/deploy/undeploy_pod.py

@@ -1,10 +1,10 @@
 from adam.commands.command import Command
 from adam.commands.deploy.deploy_utils import undeploy_frontend, deleting
 from adam.config import Config
-from adam.k8s_utils.config_maps import ConfigMaps
-from adam.k8s_utils.deployment import Deployments
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.service_accounts import ServiceAccounts
+from adam.utils_k8s.config_maps import ConfigMaps
+from adam.utils_k8s.deployment import Deployments
+from adam.utils_k8s.pods import Pods
+from adam.utils_k8s.service_accounts import ServiceAccounts
 from adam.repl_state import ReplState, RequiredState
 
 class UndeployPod(Command):

{kaqing-2.0.92 → kaqing-2.0.94}/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):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/ls.py

@@ -6,10 +6,10 @@ from adam.commands.cql.cqlsh import Cqlsh
 from adam.commands.postgres.postgres_utils import pg_database_names, pg_table_names
 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.statefulsets import StatefulSets
+from adam.utils_k8s.custom_resources import CustomResources
+from adam.utils_k8s.ingresses import Ingresses
+from adam.utils_k8s.kube_context import KubeContext
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState
 from adam.utils import lines_to_tabular, log, log2

{kaqing-2.0.92 → kaqing-2.0.94}/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
 
 

{kaqing-2.0.92 → kaqing-2.0.94}/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
 

{kaqing-2.0.92 → kaqing-2.0.94}/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
 
 

{kaqing-2.0.92 → kaqing-2.0.94}/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):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/nodetool.py

@@ -4,12 +4,10 @@ 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.pod_exec_result import PodExecResult
-from adam.repl_session import ReplSession
+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, random_alphanumeric
+from adam.utils import log
 
 class NodeTool(Command):
     COMMAND = 'nodetool'
@@ -41,17 +39,11 @@ class NodeTool(Command):
         command = f"nodetool -u {user} -pw {pw} {' '.join(args)}"
 
         if state.pod:
-            results: PodExecResult = CassandraNodes.exec(state.pod, state.namespace, command, show_out=True)
-            if results and results.log_file and Config().get('repl.history.push-cat-remote-log-file', True):
-                ReplSession().prompt_session.history.append_string(f'bash cat {results.log_file}')
+            return CassandraNodes.exec(state.pod, state.namespace, command, show_out=True)
         elif state.sts:
-            results: list[PodExecResult] = CassandraClusters.exec(state.sts, state.namespace, command, action='nodetool', show_out=True)
-            if results and Config().get('repl.history.push-cat-remote-log-file', True):
-                for result in results:
-                    if result.log_file:
-                        ReplSession().prompt_session.history.append_string(f'bash {result.pod} cat {result.log_file}')
+            return CassandraClusters.exec(state.sts, state.namespace, command, action='nodetool', show_out=True)
 
-        return results
+        return state
 
     def completion(self, state: ReplState):
         if state.pod or state.sts:

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/postgres/postgres_session.py

@@ -3,9 +3,9 @@ import re
 import subprocess
 
 from adam.config import Config
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.secrets import Secrets
+from adam.utils_k8s.kube_context import KubeContext
+from adam.utils_k8s.pods import Pods
+from adam.utils_k8s.secrets import Secrets
 from adam.utils import log2
 
 class PostgresSession:

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/reaper/reaper_restart.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.k8s_utils.pods import Pods
+from adam.utils_k8s.pods import Pods
 from .reaper_session import ReaperSession
 from adam.repl_state import ReplState, RequiredState
 

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/reaper/reaper_session.py

@@ -7,7 +7,7 @@ import requests
 from typing import List, cast
 
 from adam.config import Config
-from adam.k8s_utils.kube_context import KubeContext
+from adam.utils_k8s.kube_context import KubeContext
 from adam.repl_state import ReplState
 from adam.utils import lines_to_tabular, log2
 

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/repair/repair_log.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.k8s_utils.jobs import Jobs
+from adam.utils_k8s.jobs import Jobs
 from adam.repl_state import ReplState, RequiredState
 
 class RepairLog(Command):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/repair/repair_run.py

@@ -1,6 +1,6 @@
 from adam.commands.command import Command
-from adam.k8s_utils.jobs import Jobs
-from adam.k8s_utils.volumes import Volumes
+from adam.utils_k8s.jobs import Jobs
+from adam.utils_k8s.volumes import Volumes
 from adam.repl_state import ReplState, RequiredState
 from adam.config import Config
 from adam.commands.reaper.reaper_session import ReaperSession

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/repair/repair_scan.py

@@ -1,7 +1,7 @@
 import time
 
 from adam.commands.command import Command
-from adam.k8s_utils.pods import Pods
+from adam.utils_k8s.pods import Pods
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 from adam.config import Config

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/repair/repair_stop.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.k8s_utils.jobs import Jobs
+from adam.utils_k8s.jobs import Jobs
 from adam.repl_state import ReplState, RequiredState
 from adam.config import Config
 

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/restart.py

@@ -1,6 +1,6 @@
 from adam.commands.command import Command
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.pods import Pods
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/rollout.py

@@ -4,7 +4,7 @@ from kubernetes.client.rest import ApiException
 
 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

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/show/show_app_id.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.k8s_utils.custom_resources import CustomResources
+from adam.utils_k8s.custom_resources import CustomResources
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log
 

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/show/show_cassandra_status.py

@@ -8,9 +8,9 @@ from adam.columns.columns import Columns
 from adam.commands.command import Command
 from adam.commands.issues import Issues
 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.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.secrets import Secrets
+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.checks.status import parse_nodetool_status

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/show/show_cassandra_version.py

@@ -1,7 +1,7 @@
 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.utils_k8s.cassandra_clusters import CassandraClusters
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.secrets import Secrets
 from adam.repl_state import ReplState, RequiredState
 
 class ShowCassandraVersion(Command):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/show/show_processes.py

@@ -1,7 +1,7 @@
 from adam.commands.command import Command
 from adam.commands.commands_utils import show_table
 from adam.config import Config
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 
 class ShowProcesses(Command):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/show/show_repairs.py

@@ -1,6 +1,6 @@
 from adam.commands.command import Command
-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
 
 class ShowRepairs(Command):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/show/show_storage.py

@@ -1,7 +1,7 @@
 from adam.commands.command import Command
 from adam.commands.commands_utils import show_table
 from adam.config import Config
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 
 class ShowStorage(Command):

{kaqing-2.0.92 → kaqing-2.0.94}/adam/commands/watch.py

@@ -6,7 +6,7 @@ from typing import List
 from adam.commands.command import Command
 from adam.commands.commands_utils import show_pods, show_rollout
 from adam.config import Config
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import convert_seconds, log2
 

{kaqing-2.0.92 → kaqing-2.0.94}/adam/config.py

@@ -1,3 +1,4 @@
+import os
 from typing import TypeVar, cast
 import yaml
 
@@ -38,7 +39,7 @@ class Config:
         return get_deep_keys(self.params)
 
     def is_debug(self):
-        return Config().get('debug', False)
+        return os.getenv('QING_DEV').lower() == 'true' or Config().get('debug', False)
 
     def debug(self, s: None):
         if self.is_debug():

{kaqing-2.0.92 → kaqing-2.0.94}/adam/repl.py

@@ -15,8 +15,8 @@ from adam.commands.command_helpers import ClusterCommandHelper
 from adam.commands.help import Help
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.statefulsets import StatefulSets
+from adam.utils_k8s.kube_context import KubeContext
+from adam.utils_k8s.statefulsets import StatefulSets
 from adam.log import Log
 from adam.repl_commands import ReplCommands
 from adam.repl_session import ReplSession

{kaqing-2.0.92 → kaqing-2.0.94}/adam/repl_state.py

@@ -3,10 +3,10 @@ from enum import Enum
 import re
 
 from adam.commands.postgres.postgres_session import PostgresSession
-from adam.k8s_utils.cassandra_clusters import CassandraClusters
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
-from adam.k8s_utils.kube_context import KubeContext
-from adam.k8s_utils.secrets import Secrets
+from adam.utils_k8s.cassandra_clusters import CassandraClusters
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.kube_context import KubeContext
+from adam.utils_k8s.secrets import Secrets
 from adam.utils import display_help, log2, random_alphanumeric
 
 class BashSession:

{kaqing-2.0.92 → kaqing-2.0.94}/adam/sso/cred_cache.py

@@ -4,7 +4,7 @@ import traceback
 from dotenv import load_dotenv
 
 from adam.config import Config
-from adam.k8s_utils.kube_context import KubeContext
+from adam.utils_k8s.kube_context import KubeContext
 
 class CredCache:
     # the singleton pattern

{kaqing-2.0.92 → kaqing-2.0.94}/adam/sso/idp.py

@@ -9,7 +9,7 @@ import requests
 from kubernetes import config
 import yaml
 
-from adam.k8s_utils.secrets import Secrets
+from adam.utils_k8s.secrets import Secrets
 
 from .cred_cache import CredCache
 from .idp_session import IdpSession

{kaqing-2.0.92/adam/k8s_utils → kaqing-2.0.94/adam/utils_k8s}/cassandra_clusters.py

@@ -2,7 +2,7 @@ from concurrent.futures import ThreadPoolExecutor
 import sys
 from typing import TypeVar
 
-from adam.k8s_utils.cassandra_nodes import CassandraNodes
+from adam.utils_k8s.cassandra_nodes import CassandraNodes
 from adam.pod_exec_result import PodExecResult
 from adam.utils import log2
 from .statefulsets import StatefulSets

{kaqing-2.0.92/adam/k8s_utils → kaqing-2.0.94/adam/utils_k8s}/cassandra_nodes.py

@@ -1,12 +1,19 @@
 from adam.config import Config
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.secrets import Secrets
+from adam.utils_k8s.pods import Pods
+from adam.utils_k8s.secrets import Secrets
 from adam.pod_exec_result import PodExecResult
+from adam.repl_session import ReplSession
 
 # utility collection on cassandra nodes; methods are all static
 class CassandraNodes:
     def exec(pod_name: str, namespace: str, command: str, show_out = True, throw_err = False, shell = '/bin/sh') -> PodExecResult:
-        return Pods.exec(pod_name, "cassandra", namespace, command, show_out = show_out, throw_err = throw_err, shell = shell)
+        r = Pods.exec(pod_name, "cassandra", namespace, command, show_out = show_out, throw_err = throw_err, shell = shell)
+
+        if r and Config().get('repl.history.push-cat-remote-log-file', True):
+            if r.log_file:
+                ReplSession().prompt_session.history.append_string(f'bash {r.pod} cat {r.log_file}')
+
+        return r
 
     def get_host_id(pod_name: str, ns: str):
         try: