kaqing 1.98.138__tar.gz → 1.98.139__tar.gz

{kaqing-1.98.138 → kaqing-1.98.139}/PKG-INFO

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

{kaqing-1.98.138 → kaqing-1.98.139}/adam/batch.py

@@ -22,7 +22,6 @@ from adam.commands.report import Report
 from adam.commands.restart import Restart
 from adam.commands.rollout import RollOut
 from adam.commands.show.show import Show, ShowCommandHelper
-from adam.commands.user_entry import UserEntry
 from adam.commands.watch import Watch
 from adam.k8s_utils.kube_context import KubeContext
 from adam.repl import enter_repl
@@ -261,16 +260,6 @@ def undeploy(kubeconfig: str, config: str, param: list[str], namespace: str, ext
     run_command(Undeploy(), kubeconfig, config, param, None, namespace, None, extra_args)
 
 
-@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=PodCommandHelper, help='Get cassandra log.')
-@click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
-@click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
-@click.option('--param', '-v', multiple=True, metavar='<key>=<value>', help='parameter override')
-@click.option('--namespace', '-n', required=False, metavar='namespace', help='Kubernetes namespace')
-@click.argument('extra_args', nargs=-1, metavar='<pod>', type=click.UNPROCESSED)
-def entry(kubeconfig: str, config: str, param: list[str], namespace: str, extra_args):
-    run_command(UserEntry(), kubeconfig, config, param, None, namespace, None, extra_args)
-
-
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterOrPodCommandHelper, help='Watch pods in cluster.')
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
 @click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
@@ -283,7 +272,7 @@ def watch(kubeconfig: str, config: str, param: list[str], cluster: str, namespac
 
 
 def run_command(cmd: Command, kubeconfig: str, config: str, params: list[str], cluster:str, namespace: str, pod: str, extra_args):
-    is_user_entry = cmd.command() == UserEntry().command()
+    is_user_entry = False
 
     KubeContext.init_config(kubeconfig, is_user_entry=is_user_entry)
     if not KubeContext.init_params(config, params, is_user_entry=is_user_entry):

kaqing-1.98.139/adam/version.py

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

{kaqing-1.98.138 → kaqing-1.98.139}/kaqing.egg-info/PKG-INFO

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

{kaqing-1.98.138 → kaqing-1.98.139}/kaqing.egg-info/SOURCES.txt

@@ -78,7 +78,6 @@ adam/commands/report.py
 adam/commands/restart.py
 adam/commands/rollout.py
 adam/commands/shell.py
-adam/commands/user_entry.py
 adam/commands/watch.py
 adam/commands/deploy/__init__.py
 adam/commands/deploy/code_start.py

{kaqing-1.98.138 → kaqing-1.98.139}/setup.py

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

kaqing-1.98.138/adam/commands/user_entry.py

@@ -1,133 +0,0 @@
-from functools import partial
-from http.server import BaseHTTPRequestHandler, HTTPServer
-import os
-import re
-import subprocess
-import signal
-import threading
-import traceback
-
-from adam.commands.deploy.code_utils import get_available_port
-from adam.config import Config
-from adam.sso.idp import Idp
-from adam.app_session import AppSession, IdpLogin
-from adam.apps import Apps
-from adam.commands.command import Command
-from adam.repl_state import ReplState
-from adam.utils import log2
-
-class TokenHandler(BaseHTTPRequestHandler):
-    def __init__(self, port: int, user: str, idp_token: str, *args, **kwargs):
-        self.port = port
-        self.user = user
-        self.idp_token = idp_token
-        super().__init__(*args, **kwargs)
-
-    def log_request(self, code='-', size='-'):
-        pass
-
-    def do_GET(self):
-        Config().debug(f'Token request from cient: {self.client_address}\r')
-        ports = self.get_user_ports()
-        Config().debug(f'ports: {ports}\r')
-        if os.getenv('CHECK_CLIENT_PORT', 'true').lower() != 'true' or self.client_address[1] in ports:
-            self.send_response(200)
-            self.send_header('Content-type', 'text/plain')
-            self.end_headers()
-            self.wfile.write(self.idp_token.encode('utf8'))
-        else:
-            self.send_response(403)
-            self.send_header('Content-type', 'text/plain')
-            self.end_headers()
-            self.wfile.write(f'Port: {self.port} has not been opened by you.\n'.encode('utf8'))
-
-    def get_user_ports(self):
-        # this needs SYS_PTRACE capability with the container
-        ports = []
-
-        # curl 627299 sahn 5u IPv4 542049941 0t0 TCP localhost:39524->localhost:8001 (ESTABLISHED)
-        command = ['bash', '-c', f"lsof -i -P 2> /dev/null | grep {self.user} | grep localhost" + " | awk '{print $9}'"]
-        result = subprocess.run(command, capture_output=True, text=True, check=True)
-        for line in result.stdout.split('\n'):
-            groups = re.match(r'localhost:(.*?)->localhost:(.*)$', line)
-            if groups:
-                ports.append(int(groups[1]))
-
-        return ports
-
-class UserEntry(Command):
-    COMMAND = 'entry'
-
-    # the singleton pattern
-    def __new__(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'): cls.instance = super(UserEntry, cls).__new__(cls)
-
-        return cls.instance
-
-    def __init__(self, successor: Command=None):
-        super().__init__(successor)
-
-    def command(self):
-        return UserEntry.COMMAND
-
-    def run_token_server(port: int, user: str, idp_token: str):
-        server_address = ('localhost', port)
-        handler = partial(TokenHandler, port, user, idp_token)
-        httpd = HTTPServer(server_address, handler)
-        Config().debug(f"Serving on port {port}")
-        httpd.serve_forever()
-
-    def run(self, cmd: str, state: ReplState):
-        def custom_handler(signum, frame):
-            AppSession.ctrl_c_entered = True
-
-        signal.signal(signal.SIGINT, custom_handler)
-
-        if not(args := self.args(cmd)):
-            return super().run(cmd, state)
-
-        state, args = self.apply_state(args, state)
-        args, debug = Command.extract_options(args, 'd')
-        if debug:
-            Config().set('debug.show-out', True)
-
-        username: str = None
-        if len(args) > 0:
-            username = args[0]
-
-        login: IdpLogin = None
-        while not login:
-            try:
-                if not(host := Apps.app_host('c3', 'c3', state.namespace)):
-                    log2('Cannot locate ingress for app.')
-                    username = None
-                    continue
-
-                if not (login := Idp.login(host, username=username, use_token_from_env=False, use_cached_creds=False)):
-                    log2('Invalid username/password. Please try again.')
-                    username = None
-            except Exception as e:
-                log2(e)
-
-                Config().debug(traceback.format_exc())
-
-        server_port = get_available_port()
-        server_thread = threading.Thread(target=UserEntry.run_token_server, args=(server_port, login.shell_user(), login.ser()), daemon=True)
-        server_thread.start()
-
-        sh = f'{os.getcwd()}/login.sh'
-        if not os.path.exists(sh):
-            sh = f'{os.getcwd()}/docker/login.sh'
-
-        if os.getenv('PASS_DOWN_IDP_TOKEN', "false").lower() == "true":
-            os.system(f'{sh} {login.shell_user()} {server_port} {login.ser()}')
-        else:
-            os.system(f'{sh} {login.shell_user()} {server_port}')
-
-        return state
-
-    def completion(self, _: ReplState):
-        return {}
-
-    def help(self, _: ReplState):
-        return f'{UserEntry.COMMAND}\t ttyd user entry'

kaqing-1.98.138/adam/version.py

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