kaqing 2.0.31__tar.gz → 2.0.33__tar.gz

{kaqing-2.0.31 → kaqing-2.0.33}/PKG-INFO

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

{kaqing-2.0.31 → kaqing-2.0.33}/adam/commands/cql_utils.py

@@ -10,18 +10,15 @@ from adam.repl_state import ReplState
 from adam.utils import log2
 
 @functools.lru_cache()
-def keyspaces(sts: str, namespace: str):
+def keyspaces(state: ReplState, on_any=False):
     Config().wait_log("Inspecting Cassandra Keyspaces...")
 
-    user, pw = Secrets.get_user_pass(sts, namespace, secret_path='cql.secret')
-    command = f'cqlsh -u {user} -p {pw} -e "describe keyspaces"'
-
-    r: list[PodExecResult] = CassandraClusters.exec(sts, namespace, command, show_out=False, action='cql', on_any=True)
+    r: list[PodExecResult] = run_cql(state, 'describe keyspaces', show_out=False, on_any=on_any)
     if not r:
         log2('No pod is available')
         return []
 
-    return parse_cql_desc_keyspaces(r[0].stdout)
+    return parse_cql_desc_keyspaces(r.stdout if state.pod else r[0].stdout)
 
 def table_names(state: ReplState):
     return [f'{k}.{t}' for k, ts in tables(state, on_any=True).items() for t in ts]
@@ -33,7 +30,7 @@ def tables(state: ReplState, on_any=False):
         log2('No pod is available')
         return []
 
-    return parse_cql_desc_tables(r[0].stdout)
+    return parse_cql_desc_tables(r.stdout if state.pod else r[0].stdout)
 
 def run_cql(state: ReplState, cql: str, opts: list = [], show_out = False, use_single_quotes = False, on_any = False):
     user, pw = Secrets.get_user_pass(state.sts if state.sts else state.pod, state.namespace, secret_path='cql.secret')

{kaqing-2.0.31 → kaqing-2.0.33}/adam/commands/describe/describe_keyspace.py

@@ -52,7 +52,7 @@ class DescribeKeyspace(Command):
 
     def completion(self, state: ReplState) -> dict[str, any]:
         if state.sts:
-            return super().completion(state, {ks: {'--all-nodes': None} for ks in keyspaces(state.sts, state.namespace)})
+            return super().completion(state, {ks: {'--all-nodes': None} for ks in keyspaces(state, on_any=True)})
 
         return {}
 

{kaqing-2.0.31 → kaqing-2.0.33}/adam/commands/describe/describe_keyspaces.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import keyspaces, run_cql
+from adam.commands.cql_utils import run_cql
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

{kaqing-2.0.31 → kaqing-2.0.33}/adam/commands/describe/describe_table.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import keyspaces, run_cql, table_names, tables
+from adam.commands.cql_utils import run_cql, table_names
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

{kaqing-2.0.31 → kaqing-2.0.33}/adam/commands/describe/describe_tables.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.cql_utils import keyspaces, run_cql, table_names, tables
+from adam.commands.cql_utils import run_cql
 from adam.pod_exec_result import PodExecResult
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2

kaqing-2.0.33/adam/version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__version__ = "2.0.33"  #: the working version
+__release__ = "1.0.0"  #: the release version

{kaqing-2.0.31 → kaqing-2.0.33}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.31 → kaqing-2.0.33}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaqing',
-    version='2.0.31',
+    version='2.0.33',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

kaqing-2.0.31/adam/version.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-__version__ = "2.0.31"  #: the working version
-__release__ = "1.0.0"  #: the release version