kaqing 2.0.56__tar.gz → 2.0.58__tar.gz

{kaqing-2.0.56 → kaqing-2.0.58}/PKG-INFO

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

{kaqing-2.0.56 → kaqing-2.0.58}/adam/commands/cd.py

@@ -72,7 +72,8 @@ class Cd(Command):
                     if not state.sts:
                         ss_and_ns = dir.split('@')
                         state.sts = ss_and_ns[0]
-                        state.namespace = ss_and_ns[1]
+                        if len(ss_and_ns) > 1:
+                            state.namespace = ss_and_ns[1]
                     elif not state.pod:
                         p, _ = KubeContext.is_pod_name(dir)
                         if p:

{kaqing-2.0.56 → kaqing-2.0.58}/adam/commands/ls.py

@@ -86,7 +86,7 @@ class Ls(Command):
         return state
 
     def show_statefulsets(self):
-        ss = StatefulSets.list_sts_names(show_namespace=not KubeContext.in_cluster_namespace())
+        ss = StatefulSets.list_sts_names()
         if len(ss) == 0:
             log2('No cassandra statefulsets found.')
             return

{kaqing-2.0.56 → kaqing-2.0.58}/adam/k8s_utils/secrets.py

@@ -10,6 +10,8 @@ from adam.utils import log2
 # utility collection on secrets; methods are all static
 class Secrets:
     def list_secrets(namespace: str = None, name_pattern: str = None):
+        Config().wait_log('Inspecting Cassandra Instances...')
+
         secrets_names = []
 
         v1 = client.CoreV1Api()

{kaqing-2.0.56 → kaqing-2.0.58}/adam/k8s_utils/statefulsets.py

@@ -28,8 +28,8 @@ class StatefulSets:
     def list_sts_name_and_ns():
         return [(statefulset.metadata.name, statefulset.metadata.namespace) for statefulset in StatefulSets.list_sts()]
 
-    def list_sts_names(show_namespace = True):
-        if show_namespace:
+    def list_sts_names():
+        if not KubeContext.in_cluster_namespace():
             return [f"{sts}@{ns}" for sts, ns in StatefulSets.list_sts_name_and_ns()]
         else:
             return [f"{sts}" for sts, _ in StatefulSets.list_sts_name_and_ns()]

{kaqing-2.0.56 → kaqing-2.0.58}/adam/repl.py

@@ -61,26 +61,30 @@ def enter_repl(state: ReplState):
         return f"{msg}$ " if state.bash_session else f"{msg}> "
 
     Log.log2(f'kaqing {__version__}')
-    ss = StatefulSets.list_sts_name_and_ns()
 
     if state.device == ReplState.C:
+        ss = StatefulSets.list_sts_name_and_ns()
         if not ss:
             raise Exception("no Cassandra clusters found")
-        elif len(ss) == 1 and Config().get('repl.auto-enter-only-cluster', True):
+        elif not state.sts and len(ss) == 1 and Config().get('repl.auto-enter-only-cluster', True):
             cluster = ss[0]
             state.sts = cluster[0]
             state.namespace = cluster[1]
-            Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
+            if KubeContext().in_cluster_namespace:
+                Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}...')
+            else:
+                Config().wait_log(f'Moving to the only Cassandra cluster: {state.sts}@{state.namespace}...')
     elif state.device == ReplState.A:
-        if app := Config().get('repl.auto-enter-app', 'c3/c3'):
-            if app != 'no':
-                ea = app.split('/')
-                state.app_env = ea[0]
-                if len(ea) > 1:
-                    state.app_app = ea[1]
-                    Config().wait_log(f'Moving to {state.app_env}/{state.app_app}...')
-                else:
-                    Config().wait_log(f'Moving to {state.app_env}...')
+        if not state.app_env:
+            if app := Config().get('repl.auto-enter-app', 'c3/c3'):
+                if app != 'no':
+                    ea = app.split('/')
+                    state.app_env = ea[0]
+                    if len(ea) > 1:
+                        state.app_app = ea[1]
+                        Config().wait_log(f'Moving to {state.app_env}/{state.app_app}...')
+                    else:
+                        Config().wait_log(f'Moving to {state.app_env}...')
 
     kb = KeyBindings()
 

{kaqing-2.0.56 → kaqing-2.0.58}/adam/repl_state.py

@@ -1,5 +1,6 @@
 import copy
 from enum import Enum
+import re
 
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.k8s_utils.cassandra_clusters import CassandraClusters
@@ -128,8 +129,30 @@ class ReplState:
             if index < 6:
                 state = copy.copy(state)
 
-                if arg in [f'{ReplState.A}:', f'{ReplState.C}:', f'{ReplState.P}:']:
-                    state.device = arg.strip(':')
+                groups = re.match(r'^([a|c|p]):(.*)$', arg)
+                if groups:
+                    if groups[1] == 'p':
+                        state.device = 'p'
+                        state.pg_path = groups[2]
+                    elif groups[1] == 'c':
+                        state.device = 'c'
+                        if path := groups[2]:
+                            p_and_ns = path.split('@')
+                            sts_and_pod = p_and_ns[0].split('/')
+                            state.sts = sts_and_pod[0]
+                            if len(sts_and_pod) > 1:
+                                state.pod = sts_and_pod[1]
+                            if len(p_and_ns) > 1:
+                                state.namespace = p_and_ns[1]
+                            elif ns := KubeContext.in_cluster_namespace():
+                                state.namespace = ns
+                    else:
+                        state.device = 'a'
+                        if path := groups[2]:
+                            env_and_app = path.split('/')
+                            state.app_env = env_and_app[0]
+                            if len(env_and_app) > 1:
+                                state.app_app = env_and_app[1]
                 else:
                     new_args.append(arg)
             else: