kaqing 2.0.31__py3-none-any.whl → 2.0.33__py3-none-any.whl

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')

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 {}
 

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

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

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

adam/version.py

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

{kaqing-2.0.31.dist-info → kaqing-2.0.33.dist-info}/METADATA

@@ -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.dist-info → kaqing-2.0.33.dist-info}/RECORD

@@ -14,7 +14,7 @@ adam/repl_commands.py,sha256=Qg5b83NOoVigHB9b5wThhpUUTb-Gxy1b4IkBXQqQJa4,4708
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=591d7gV6uQSFtm7IWdlIYAHjfAzs9bdvIkwlIAeKddE,7540
 adam/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
-adam/version.py,sha256=WSZ2ZAbg3ooZRCiU80NkMKydx70-Lk81JfbRHesWvc8,139
+adam/version.py,sha256=vdudGn3enK3ZNNY3c2K7pEWvNElxynLujmxfTqmtDCI,139
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -58,7 +58,7 @@ adam/commands/command.py,sha256=lULNtaRJ-S9hTBpJY2rjWwZaQi_S4zGqZrsd89M_wik,2879
 adam/commands/command_helpers.py,sha256=leOJJK1UXczNTJHN9TGMCbIpUpmpreULvQ-TvnsYS7w,1134
 adam/commands/commands_utils.py,sha256=ShUcxtDSd9B3NM0GDj3NBvKdmjCGY8qXgeUJpzNF63E,3122
 adam/commands/cp.py,sha256=dyQViRDPNqsKRkxPb7WyEVIBNw7YB6IfYa2q3VtfzyA,3107
-adam/commands/cql_utils.py,sha256=v2qQqDecYOJaurimJta2eUCYiHyIL4jtLSC_vg7931c,4001
+adam/commands/cql_utils.py,sha256=LGRwhGf1bCZ0SS0F9a2dXGcCbcKpoR10wuQyaXuAm-A,3893
 adam/commands/cqlsh.py,sha256=4dcemAdCQvpUAkLTpkOEhrbRHimovxSAG8eJ0i4RQM8,2939
 adam/commands/devices.py,sha256=_f8j6aQzTL8_pFlWYawRuG2Ju1zPjYSPcRIlLnZng10,2397
 adam/commands/exit.py,sha256=5MWUAmzYBlsrp0CoiTDB13SUkX9Ya18UlGeOIPia6TA,798
@@ -92,10 +92,10 @@ adam/commands/deploy/undeploy_frontend.py,sha256=gHekPn7l19JgVbhneKpQ7ModNoDFmzW
 adam/commands/deploy/undeploy_pg_agent.py,sha256=RYME8no1FT94WpVg-HXDGL1NmLlpE1I9R4htitjaxpo,1319
 adam/commands/deploy/undeploy_pod.py,sha256=hTcL8cAh7xYPcSm9sgiVFCxPh3SskefBfTmla310oUA,1905
 adam/commands/describe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/describe/describe_keyspace.py,sha256=9HN6_bJSmfgNl16rYsWkCD7Q3gHhb3lcpUD_Vjosm70,1935
-adam/commands/describe/describe_keyspaces.py,sha256=uXiVgpJlJz-8Q_rB2u3LWQixdECw6VWinfN70a5c3WQ,1585
-adam/commands/describe/describe_table.py,sha256=8jBiTqvZy0xzZdVTSzW6co6Ku-_seLqkdmrA3QXFgSQ,1902
-adam/commands/describe/describe_tables.py,sha256=RbbDhbyNjB1NyHP5LREAMPpXlgd1zmPlFQIp6jUVCdI,1585
+adam/commands/describe/describe_keyspace.py,sha256=CdgDBMlOngp_P5dK4QbqmqEGVZfhrRcFyISSrXoXoa4,1927
+adam/commands/describe/describe_keyspaces.py,sha256=O6ZY3q7H3-fNDEHf_qjgfTQmdYPXExAZh1M1COPJbnM,1574
+adam/commands/describe/describe_table.py,sha256=HL9Bufqj60R7GqqfhMvNgb6-eGPpOOf_okHoNT-2B9s,1883
+adam/commands/describe/describe_tables.py,sha256=2EtkLavSTNy-JHtegR9qUoVYs2NPmAz1Tq-yc-hKzZY,1553
 adam/commands/medusa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/medusa/medusa.py,sha256=Y_yyOZRb6u45wfTVBRp3kuklyYDTSlaAJQdAiymP_8M,2185
 adam/commands/medusa/medusa_backup.py,sha256=j4DTVWFT-4rzs4gG_pBvjE-JuPsVCJIsnyQjIzJ4EbA,1801
@@ -166,8 +166,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-2.0.31.dist-info/METADATA,sha256=SSGMR2e1t9fREOsVU6kFYil93ig3Ei0l2hhV9hlQ8z8,132
-kaqing-2.0.31.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.31.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.31.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.31.dist-info/RECORD,,
+kaqing-2.0.33.dist-info/METADATA,sha256=2xjjG7vET3X8P1KUhCDsfpvHT6G0CBLfXOJyB9y_ErE,132
+kaqing-2.0.33.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.33.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.33.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.33.dist-info/RECORD,,