kdebug 0.3.3__tar.gz → 0.4.0__tar.gz

{kdebug-0.3.3 → kdebug-0.4.0}/.gitignore

@@ -1,3 +1,7 @@
+backups/
+temp/
+.vscode/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[codz]

{kdebug-0.3.3 → kdebug-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kdebug
-Version: 0.3.3
+Version: 0.4.0
 Summary: Universal Kubernetes Debug Container Utility
 Project-URL: Homepage, https://github.com/jessegoodier/kdebug
 Project-URL: Repository, https://github.com/jessegoodier/kdebug

{kdebug-0.3.3 → kdebug-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kdebug"
-version = "0.3.3"
+version = "0.4.0"
 description = "Universal Kubernetes Debug Container Utility"
 readme = "README.md"
 license = "MIT"

{kdebug-0.3.3 → kdebug-0.4.0}/src/kdebug/__init__.py

@@ -1,4 +1,4 @@
-from importlib.metadata import version, PackageNotFoundError
+from importlib.metadata import PackageNotFoundError, version
 
 try:
     __version__ = version("kdebug")

{kdebug-0.3.3 → kdebug-0.4.0}/src/kdebug/cli.py

@@ -138,6 +138,19 @@ def get_current_namespace() -> str:
     return output if output else "default"
 
 
+def validate_cluster_connection(namespace: str) -> Optional[str]:
+    """Validate kubectl can connect to the cluster and namespace exists.
+
+    Returns None on success, or an error message string on failure.
+    """
+    cmd = f"{kubectl_base_cmd()} get namespace {namespace} -o name"
+    print_debug_command(cmd)
+    result = subprocess.run(cmd, shell=True, capture_output=True, text=True)
+    if result.returncode != 0:
+        return result.stderr.strip()
+    return None
+
+
 def get_pod_by_name(pod_name: str, namespace: str) -> Optional[Dict]:
     """Get pod information by name."""
     print(
@@ -450,6 +463,12 @@ def select_pod(args) -> Optional[Dict]:
     """Select a pod based on provided arguments."""
     namespace = args.namespace or get_current_namespace()
 
+    # Validate cluster connection and namespace before proceeding
+    error = validate_cluster_connection(namespace)
+    if error:
+        print(f"{colorize('✗ Error:', Colors.RED)} {error}")
+        return None
+
     # Direct pod selection
     if args.pod:
         return get_pod_by_name(args.pod, namespace)
@@ -474,12 +493,12 @@ def select_pod(args) -> Optional[Dict]:
         return pods[0]
 
     # Interactive mode - no pod or controller specified
-    print(f"\n{colorize('Starting interactive pod selection...', Colors.BRIGHT_CYAN)}")
+    print(f"\n{colorize('Starting interactive pod selection...', Colors.CYAN)}")
 
     # Direct pod selection via TUI
     pod_name = select_pod_interactive(namespace)
     if not pod_name:
-        print(f"\n{colorize('Selection cancelled', Colors.YELLOW)}")
+        print(f"\n{colorize('Selection cancelled', Colors.CYAN)}")
         return None
 
     return {"name": pod_name, "namespace": namespace}
@@ -682,6 +701,42 @@ def check_pod_security_context(pod_name: str, namespace: str) -> Dict:
         return {"can_run_as_root": True, "reason": "Unable to parse pod spec"}
 
 
+def get_container_run_as_user(
+    pod_name: str, namespace: str, target_container: Optional[str]
+) -> Optional[int]:
+    """Detect the runAsUser UID from the target container or pod security context."""
+    cmd = f"{kubectl_base_cmd()} get pod {pod_name} -n {namespace} -o json"
+    output = run_command(cmd, check=False)
+
+    if not output:
+        return None
+
+    try:
+        pod_data = json.loads(output)
+        spec = pod_data.get("spec", {})
+
+        # Check container-level securityContext first (overrides pod-level)
+        if target_container:
+            for container in spec.get("containers", []):
+                if container.get("name") == target_container:
+                    container_uid = container.get("securityContext", {}).get(
+                        "runAsUser"
+                    )
+                    if container_uid is not None:
+                        return int(container_uid)
+                    break
+
+        # Fall back to pod-level securityContext
+        pod_uid = spec.get("securityContext", {}).get("runAsUser")
+        if pod_uid is not None:
+            return int(pod_uid)
+
+    except (json.JSONDecodeError, ValueError, TypeError):
+        pass
+
+    return None
+
+
 def launch_debug_container(
     pod_name: str,
     namespace: str,
@@ -689,6 +744,7 @@ def launch_debug_container(
     target_container: Optional[str],
     existing_containers: List[str],
     as_root: bool = False,
+    run_as_user: Optional[int] = None,
 ) -> Optional[str]:
     """Launch a debug container attached to the pod and return its name."""
     print(f"Launching debug container for pod {colorize(pod_name, Colors.CYAN)}...")
@@ -706,12 +762,16 @@ def launch_debug_container(
                 file=sys.stderr,
             )
             print(f"{colorize('Tip:', Colors.CYAN)} Try without --as-root flag\n")
-
-    if existing_containers:
+    elif run_as_user is not None:
         print(
-            f"Existing ephemeral containers: {colorize(', '.join(existing_containers), Colors.BRIGHT_BLACK)}"
+            f"Running as UID {colorize(str(run_as_user), Colors.CYAN)} (matching target container)"
         )
 
+    # if existing_containers:
+    #     print(
+    #         f"Existing ephemeral containers: {colorize(', '.join(existing_containers), Colors.BRIGHT_BLACK)}"
+    #     )
+
     # Build kubectl debug command
     cmd_parts = [
         f"nohup {kubectl_base_cmd()} debug -i --tty",
@@ -731,6 +791,10 @@ def launch_debug_container(
 
     if as_root:
         cmd_parts.append('--custom=<(echo \'{"securityContext":{"runAsUser":0}}\')')
+    elif run_as_user is not None:
+        cmd_parts.append(
+            f'--custom=<(echo \'{{"securityContext":{{"runAsUser":{run_as_user}}}}}\')'
+        )
 
     cmd_parts.extend(
         [
@@ -777,13 +841,12 @@ def exec_interactive(
 ) -> int:
     """Execute an interactive command in the debug container."""
     print(f"\n{colorize('=' * 60, Colors.BLUE)}")
-    print(
-        f"{colorize('Starting interactive session', Colors.BOLD)} in pod {colorize(pod_name, Colors.CYAN)}"
-    )
+    print(f"{colorize('Starting interactive session', Colors.BOLD)} in:")
+    print(f"Pod: {colorize(pod_name, Colors.CYAN)}")
     print(f"Container: {colorize(container_name, Colors.CYAN)}")
-    print(f"Command: {colorize(cmd, Colors.YELLOW)}")
+    print(f"Command: {colorize(cmd, Colors.CYAN)}")
     if cd_into:
-        print(f"Directory: {colorize(cd_into, Colors.MAGENTA)}")
+        print(f"Directory: {colorize(cd_into, Colors.CYAN)}")
     print(f"{colorize('=' * 60, Colors.BLUE)}\n")
 
     # If cd_into is specified, wrap command to cd first
@@ -1022,7 +1085,7 @@ def parse_controller_arg(value: str) -> Tuple[str, str]:
     controller_type, controller_name = value.split("/", 1)
     if not controller_name:
         raise argparse.ArgumentTypeError(
-            f"Missing controller name after '/'. Expected TYPE/NAME (e.g. sts/myapp)."
+            "Missing controller name after '/'. Expected TYPE/NAME (e.g. sts/myapp)."
         )
     if controller_type.lower() not in CONTROLLER_ALIASES:
         valid_types = ", ".join(sorted(CONTROLLER_ALIASES.keys()))
@@ -1179,15 +1242,13 @@ Usage:
         )
 
     print(f"\n{colorize('=' * 60, Colors.BLUE)}")
+    print(f"{colorize('Namespace:', Colors.BOLD)} {colorize(namespace, Colors.CYAN)}")
     print(f"{colorize('Target Pod:', Colors.BOLD)} {colorize(pod_name, Colors.CYAN)}")
-    print(
-        f"{colorize('Namespace:', Colors.BOLD)} {colorize(namespace, Colors.MAGENTA)}"
-    )
     print(
         f"{colorize('Target Container:', Colors.BOLD)} {colorize(target_container, Colors.CYAN)}"
     )
     print(
-        f"{colorize('Debug Image:', Colors.BOLD)} {colorize(args.debug_image, Colors.BRIGHT_BLACK)}"
+        f"{colorize('Debug Image:', Colors.BOLD)} {colorize(args.debug_image, Colors.CYAN)}"
     )
     print(f"{colorize('=' * 60, Colors.BLUE)}\n")
 
@@ -1201,7 +1262,12 @@ Usage:
             f"Found existing ephemeral containers: {colorize(', '.join(existing_containers), Colors.BRIGHT_BLACK)}"
         )
         # For simplicity, we'll create a new one. In production, you might want to reuse.
-        print(f"{colorize('Creating new debug container...', Colors.YELLOW)}")
+        print(f"{colorize('Creating new debug container...', Colors.MAGENTA)}")
+
+    # Detect target container UID for the debug container
+    run_as_user = None
+    if not args.as_root:
+        run_as_user = get_container_run_as_user(pod_name, namespace, target_container)
 
     # Launch debug container
     debug_container = launch_debug_container(
@@ -1211,6 +1277,7 @@ Usage:
         target_container,
         existing_containers,
         args.as_root,
+        run_as_user,
     )
 
     if not debug_container: