cloudsnake 0.8.0__tar.gz → 0.10.0__tar.gz

{cloudsnake-0.8.0 → cloudsnake-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudsnake
-Version: 0.8.0
+Version: 0.10.0
 Summary: Some AWS CLI commands with a beautiful TUI
 License: GPL-3.0
 License-File: LICENSE
@@ -32,7 +32,8 @@ Requires-Dist: moto (>=5.0.9,<6.0.0)
 Requires-Dist: requests (>=2.32.5,<3.0.0)
 Requires-Dist: rich (>=14.2.0,<15.0.0)
 Requires-Dist: simple-term-menu (>=1.6.4,<2.0.0)
-Requires-Dist: typer (>=0.20.0,<0.21.0)
+Requires-Dist: textual (>=7.2.0,<8.0.0)
+Requires-Dist: typer (>=0.20,<0.22)
 Requires-Dist: typing-extensions (>=4.12.0,<5.0.0)
 Project-URL: Documentation, https://github.com/containerscrew/cloudsnake#readme
 Project-URL: Repository, https://github.com/containerscrew/cloudsnake
@@ -40,7 +41,7 @@ Description-Content-Type: text/markdown
 
 <p align="center" >
     <h3 align="center">cloudsnake 🐍</h3>
-    <p align="center">Wrapping some useful AWS cli commands to operate AWS like EC2 SSM instance connection or RDS connection using IAM authentication</p>
+    <p align="center">Wrapping some useful AWS cli commands to operate some services like EC2, SSO and more</p>
 </p>
 
 ---
@@ -57,6 +58,7 @@ Description-Content-Type: text/markdown
     <img alt="PyPiP version" src="https://img.shields.io/pypi/v/cloudsnake">
     <img alt="License" src="https://img.shields.io/github/license/containerscrew/cloudsnake">
     <img alt="Linter" src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json">
+    <img alt="PyPip downloads" src="https://img.shields.io/pypi/dm/cloudsnake">
 </p>
 
 ---
@@ -72,7 +74,7 @@ In your terminal, set the corresponding `AWS_PROFILE=MyProfile` if not using the
 ---
 <br><br>
 <p align="center">
-    <img align="center" alt="SSM session" src="docs/img//cloudsnake-ssm-session.gif">
+    <img align="center" alt="SSM session" src="docs/img/cloudsnake-ssm-session.gif">
 <h3 align="center">SSM session</h3>
 </p>
 
@@ -100,7 +102,7 @@ cloudsnake --region us-east-1 ssm get-parameters # specify region
 
 <br><br>
 <p align="center">
-    <img align="center" alt="SSO get-credentials" src="docs/img/cloudsnake-sso-get-credentials.png">
+    <img align="center" alt="SSO get-credentials" src="docs/img/cloudsnake-sso-credentials.png">
 <h3 align="center">SSO get-credentials</h3>
 </p>
 
@@ -112,6 +114,21 @@ cloudsnake --region eu-west-1 sso get-credentials --start-url https://myapp.awsa
 > This command will open your default browser. You will need to approve manually the authentication.
 > More use cases and examples for `cloudsnake sso get-credentials` can be found in [`docs/sso-get-credentials.md`](./docs/sso-get-credentials.md).
 
+---
+
+<br><br>
+<p align="center">
+    <img align="center" alt="Cloudwatch log stream" src="docs/img/cloudsnake-logs-stream.gif">
+<h3 align="center">Cloudwatch log stream</h3>
+</p>
+
+```shell
+cloudsnake logs stream
+cloudsnake logs stream --filter-pattern "ERROR"
+```
+> [!NOTE]
+> By the moment, `logs stream` only supports viewing logs from the moment you start the command. Future versions will include the ability to view historical logs.
+
 # Installation
 
 ## Using pipx (Recommended)
@@ -159,6 +176,12 @@ hint: See PEP 668 for the detailed specification.
 </pre>
 </details>
 
+# Upgrade
+
+```bash
+pipx upgrade cloudsnake
+```
+
 # Uninstall
 
 ```bash

{cloudsnake-0.8.0 → cloudsnake-0.10.0}/README.md

@@ -1,6 +1,6 @@
 <p align="center" >
     <h3 align="center">cloudsnake 🐍</h3>
-    <p align="center">Wrapping some useful AWS cli commands to operate AWS like EC2 SSM instance connection or RDS connection using IAM authentication</p>
+    <p align="center">Wrapping some useful AWS cli commands to operate some services like EC2, SSO and more</p>
 </p>
 
 ---
@@ -17,6 +17,7 @@
     <img alt="PyPiP version" src="https://img.shields.io/pypi/v/cloudsnake">
     <img alt="License" src="https://img.shields.io/github/license/containerscrew/cloudsnake">
     <img alt="Linter" src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json">
+    <img alt="PyPip downloads" src="https://img.shields.io/pypi/dm/cloudsnake">
 </p>
 
 ---
@@ -32,7 +33,7 @@ In your terminal, set the corresponding `AWS_PROFILE=MyProfile` if not using the
 ---
 <br><br>
 <p align="center">
-    <img align="center" alt="SSM session" src="docs/img//cloudsnake-ssm-session.gif">
+    <img align="center" alt="SSM session" src="docs/img/cloudsnake-ssm-session.gif">
 <h3 align="center">SSM session</h3>
 </p>
 
@@ -60,7 +61,7 @@ cloudsnake --region us-east-1 ssm get-parameters # specify region
 
 <br><br>
 <p align="center">
-    <img align="center" alt="SSO get-credentials" src="docs/img/cloudsnake-sso-get-credentials.png">
+    <img align="center" alt="SSO get-credentials" src="docs/img/cloudsnake-sso-credentials.png">
 <h3 align="center">SSO get-credentials</h3>
 </p>
 
@@ -72,6 +73,21 @@ cloudsnake --region eu-west-1 sso get-credentials --start-url https://myapp.awsa
 > This command will open your default browser. You will need to approve manually the authentication.
 > More use cases and examples for `cloudsnake sso get-credentials` can be found in [`docs/sso-get-credentials.md`](./docs/sso-get-credentials.md).
 
+---
+
+<br><br>
+<p align="center">
+    <img align="center" alt="Cloudwatch log stream" src="docs/img/cloudsnake-logs-stream.gif">
+<h3 align="center">Cloudwatch log stream</h3>
+</p>
+
+```shell
+cloudsnake logs stream
+cloudsnake logs stream --filter-pattern "ERROR"
+```
+> [!NOTE]
+> By the moment, `logs stream` only supports viewing logs from the moment you start the command. Future versions will include the ability to view historical logs.
+
 # Installation
 
 ## Using pipx (Recommended)
@@ -119,6 +135,12 @@ hint: See PEP 668 for the detailed specification.
 </pre>
 </details>
 
+# Upgrade
+
+```bash
+pipx upgrade cloudsnake
+```
+
 # Uninstall
 
 ```bash

{cloudsnake-0.8.0 → cloudsnake-0.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "cloudsnake"
-version = "0.8.0"
+version = "0.10.0"
 description = 'Some AWS CLI commands with a beautiful TUI'
 authors = ["containerscrew <info@containerscrew.com>"]
 repository = "https://github.com/containerscrew/cloudsnake"
@@ -26,7 +26,7 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
-include = [{ path = "tests", format = "sdist" }, { path = "CHANGELOG.md" }]
+include = [{ path = "tests", format = "sdist" }, { path = "CHANGELOG.md" }, { path = "src/cloudsnake/styles/*.tcss"}]
 
 [tool.poetry.scripts]
 cloudsnake = 'cloudsnake.__main__:main'
@@ -45,7 +45,7 @@ boto3 = "^1.42.10"
 click = "<8.4.0"
 dacite = "^1.8.1"
 simple-term-menu = "^1.6.4"
-typer = "^0.20.0"
+typer = ">=0.20,<0.22"
 typing-extensions = "^4.12.0"
 rich = "^14.2.0"
 jmespath = "^1.0.1"
@@ -53,3 +53,4 @@ moto = "^5.0.9"
 requests = "^2.32.5"
 boto3-stubs = "~=1.42.8"
 configparser = "^7.2.0"
+textual = "^7.2.0"

{cloudsnake-0.8.0 → cloudsnake-0.10.0}/src/cloudsnake/cli/cli.py

@@ -2,7 +2,10 @@ import os
 import typer
 from typing import Optional
 from importlib.metadata import version
+
+
 from cloudsnake.cli.dto import Common, LoggingLevel
+from cloudsnake.cli.logs import cw_logs
 from cloudsnake.cli.ssm import ssm
 from cloudsnake.cli.sso import sso
 from cloudsnake.sdk.session import SessionWrapper
@@ -26,6 +29,7 @@ app = typer.Typer(
 
 app.add_typer(ssm, name="ssm", help="Manage SSM operations")
 app.add_typer(sso, name="sso", help="Manage SSO operations")
+app.add_typer(cw_logs, name="logs", help="Manage CloudWatch Logs operations")
 
 
 @app.callback()

cloudsnake-0.10.0/src/cloudsnake/cli/logs.py

@@ -0,0 +1,74 @@
+import signal
+import sys
+import typer
+
+from cloudsnake.helpers import (
+    log_groups_to_items,
+    normalize_log_group_arn_for_live_tail,
+)
+from cloudsnake.sdk.cloudwatch import CloudWatchLogsWrapper, print_colored_log
+from cloudsnake.tui_v2 import SelectorApp
+
+DEFAULT_LOG_FILTER = "[].{logGroupName: logGroupName, size: storedBytes, arn: arn}"
+
+
+def signal_handler(sig, frame):
+    typer.secho("You pressed Ctrl+C! Exiting gracefully...", fg="bright_red")
+    sys.exit(0)
+
+
+cw_logs = typer.Typer(
+    no_args_is_help=True,
+    pretty_exceptions_short=True,
+    pretty_exceptions_show_locals=False,
+)
+
+
+@cw_logs.command(
+    "stream", help="Live stream logs from a CloudWatch log group", no_args_is_help=False
+)
+def start_session(
+    ctx: typer.Context,
+    filter_pattern: str = typer.Option(
+        None,
+        "--filter-pattern",
+        "-f",
+        help="Filter pattern for log events",
+    ),
+):
+    signal.signal(signal.SIGINT, signal_handler)
+    cw = CloudWatchLogsWrapper(
+        session=ctx.obj.session,
+        profile=ctx.obj.profile,
+        region=ctx.obj.region,
+        query=DEFAULT_LOG_FILTER,
+    )
+    log_groups = cw.list_log_groups()
+    items = log_groups_to_items(log_groups)
+    app = SelectorApp(
+        items=items,
+        title=f"🚀 AWS Cloudwatch log groups — {ctx.obj.profile}",
+        placeholder="Type to filter log groups...",
+    )
+    selected_log_group = app.run()
+
+    if selected_log_group:
+        log_group_arn = next(
+            g["arn"] for g in log_groups if g["logGroupName"] == selected_log_group
+        )
+        typer.secho(
+            f"~> Starting live tail for log group: {selected_log_group}",
+            fg="bright_green",
+        )
+        try:
+            for event in cw.tail_log_group_live(
+                log_group_arn=normalize_log_group_arn_for_live_tail(log_group_arn),
+                filter_pattern=filter_pattern,
+            ):
+                print_colored_log(event, highlight_term=filter_pattern)
+        except KeyboardInterrupt:
+            typer.secho("\nStopped.", fg="bright_yellow")
+    else:
+        typer.secho("~> No log group selected", fg="bright_yellow")
+        raise typer.Exit(1)
+    return

cloudsnake-0.10.0/src/cloudsnake/cli/ssm.py

@@ -0,0 +1,135 @@
+import signal
+import sys
+from typing import Optional
+from cloudsnake.helpers import ec2_targets_to_items, ssm_parameters_to_items
+from cloudsnake.sdk.ssm_parameters import SSMParameterStoreWrapper
+from cloudsnake.tui import EC2Tui, SSMTui
+import typer
+
+from cloudsnake.sdk.ec2 import EC2InstanceWrapper
+from cloudsnake.sdk.ssm_session import SSMStartSessionWrapper
+from cloudsnake.tui_v2 import SelectorApp
+
+EC2_RUNNING_FILTER = "Name=instance-state-name,Values=running"
+
+EC2_INSTANCE_SELECTOR_QUERY = "[].{TargetId: InstanceId, Name: Tags[?Key=='Name'].Value | [0], Ip: PrivateIpAddress}"
+
+# TUI
+ec2_tui = EC2Tui()
+ssm_tui = SSMTui()
+
+
+def signal_handler(sig, frame):
+    typer.secho("You pressed Ctrl+C! Exiting gracefully...", fg="bright_red")
+    sys.exit(0)
+
+
+ssm = typer.Typer(
+    no_args_is_help=True,
+    pretty_exceptions_short=True,
+    pretty_exceptions_show_locals=False,
+)
+
+
+@ssm.command(
+    "start-session", help="Start session with the given target id", no_args_is_help=True
+)
+def start_session(
+    ctx: typer.Context,
+    target: Optional[str] = typer.Option(None, help="Target id of the instance"),
+    reason: Optional[str] = typer.Option(
+        "ssm-new-connection", help="Reason of the connection"
+    ),
+    with_instance_selector: Optional[bool] = typer.Option(
+        False,
+        "--with-instance-selector",
+        "-is",
+        help="Prompt a terminal menu and select the instance you want to connect. --target flag is no longer used",
+    ),
+):
+    signal.signal(signal.SIGINT, signal_handler)
+    ssm_wrapper = SSMStartSessionWrapper(
+        session=ctx.obj.session,
+        profile=ctx.obj.profile,
+        region=ctx.obj.region,
+    )
+
+    if with_instance_selector:
+        ec2 = EC2InstanceWrapper(
+            session=ctx.obj.session,
+            filters=EC2_RUNNING_FILTER,
+            query=EC2_INSTANCE_SELECTOR_QUERY,
+            profile=ctx.obj.profile,
+            region=ctx.obj.region,
+        )
+
+        # Fake data for testing
+        # instances = [
+        #     {"TargetId": "i-003a434fb9c00f0f8", "Name": "WebServer-01", "Ip": "10.100.0.2"},
+        #     {"TargetId": "i-0c7cca12079e449a5", "Name": "eks-instance-nodegroup-apps", "Ip": "10.100.0.3"},
+        #     {"TargetId": "i-06ad6856a7ca778c6", "Name": "Database-Primary", "Ip": "10.100.0.4"},
+        #     {"TargetId": "i-050ed4067698e7d26", "Name": "Cache-Server-01", "Ip": "10.100.0.5"},
+        # ]
+
+        instances = ec2.describe_ec2_instances()
+
+        if not instances:
+            typer.secho("~> No running instances found", fg="bright_yellow")
+            raise typer.Exit(1)
+
+        items = ec2_targets_to_items(instances)
+
+        app = SelectorApp(
+            items=items,
+            title=f"🚀 EC2 Instances — {ctx.obj.profile}",
+            placeholder="Type to filter by name or ID...",
+        )
+
+        result_id = app.run()
+
+        if result_id:
+            selected = next(item for item in instances if item["TargetId"] == result_id)
+            instance_id = selected["TargetId"]
+            return ssm_wrapper.start_session(instance_id, reason)
+        else:
+            typer.secho("~> No instance selected", fg="bright_yellow")
+            raise typer.Exit(1)
+
+    return ssm_wrapper.start_session(target, reason)
+
+
+@ssm.command("get-parameters", help="Get secrets from parameter store")
+def get_parameters(
+    ctx: typer.Context,
+):
+    signal.signal(signal.SIGINT, signal_handler)
+    ssm_wrapper = SSMParameterStoreWrapper(
+        session=ctx.obj.session,
+        profile=ctx.obj.profile,
+        region=ctx.obj.region,
+    )
+
+    parameters = ssm_wrapper.describe_parameters()
+
+    # fake_parameters= [
+    #     {"Name": "/myapp/db_password", "Type": "SecureString"},
+    #     {"Name": "/myapp/db_endpoint", "Type": "SecureString"},
+    #     {"Name": "/myapp/redis_password", "Type": "SecureString"},
+    #     {"Name": "/myapp/google_oauth", "Type": "SecureString"},
+    # ]
+
+    items = ssm_parameters_to_items(parameters)
+
+    if not parameters:
+        typer.echo("No parameters found.")
+        raise typer.Exit(1)
+
+    app = SelectorApp(
+        items=items,
+        title=f"🚀 SSM Parameter — {ctx.obj.profile}",
+        placeholder="Type to filter by name ...",
+    )
+
+    result_id = app.run()
+    parameter = ssm_wrapper.get_parameter_by_name(result_id)
+    typer.secho(f"~> {parameter}", fg="bright_green")

{cloudsnake-0.8.0 → cloudsnake-0.10.0}/src/cloudsnake/helpers.py

@@ -3,9 +3,10 @@ from datetime import datetime
 import os
 import signal
 import sys
-
 from typing_extensions import List, Dict
 
+from cloudsnake.models.selector import SelectorItem
+
 
 def parse_filters(filters: str) -> List[Dict[str, List[str]]]:
     """Parse filters passed in commands like cloudsnake ec2 describe-instances --filters Name=instance-state-name,
@@ -91,3 +92,78 @@ def ensure_is_valid_dir(dirpath):
     """
     if not os.path.isdir(dirpath):
         raise NotADirectoryError(f"'{dirpath}' is not a directory.")
+
+
+def ec2_targets_to_items(targets: list[dict]) -> list[SelectorItem]:
+    return [
+        SelectorItem(
+            id=t["TargetId"],
+            label=t.get("Name", t["TargetId"]),
+            meta=[t["Ip"]],
+        )
+        for t in targets
+    ]
+
+
+def ssm_parameters_to_items(parameters: list[dict]) -> list[SelectorItem]:
+    return [
+        SelectorItem(
+            id=p["Name"],
+            label=p["Name"],
+            meta=[p.get("Type", "String")],
+        )
+        for p in parameters
+    ]
+
+
+def log_groups_to_items(groups: list[dict]) -> list[SelectorItem]:
+    items: list[SelectorItem] = []
+
+    for g in groups:
+        name = g["logGroupName"]
+        stored_bytes = g.get("size")
+
+        meta = []
+        if stored_bytes is not None:
+            meta.append(format_bytes(stored_bytes))
+
+        items.append(
+            SelectorItem(
+                id=name,
+                label=name,
+                meta=meta,
+            )
+        )
+
+    return items
+
+
+def format_bytes(bytes_size: int) -> str:
+    if bytes_size < 1024:
+        return f"{bytes_size} B"
+    elif bytes_size < 1024**2:
+        return f"{bytes_size / 1024:.2f} KB"
+    elif bytes_size < 1024**3:
+        return f"{bytes_size / 1024**2:.2f} MB"
+    else:
+        return f"{bytes_size / 1024**3:.2f} GB"
+
+
+def normalize_log_group_arn_for_live_tail(arn: str) -> str:
+    """
+    CloudWatch returns log group ARNs ending with ':*'.
+    StartLiveTail requires the ARN WITHOUT ':*'.
+    """
+    if arn.endswith(":*"):
+        return arn[:-2]
+    return arn
+
+
+# def s3_buckets_to_items(buckets: list[dict]) -> list[SelectorItem]:
+#     return [
+#         SelectorItem(
+#             id=b["Name"],
+#             label=b["Name"],
+#         )
+#         for b in buckets
+#     ]

cloudsnake-0.10.0/src/cloudsnake/models/selector.py

@@ -0,0 +1,9 @@
+from dataclasses import dataclass
+from typing import Sequence
+
+
+@dataclass(frozen=True)
+class SelectorItem:
+    id: str
+    label: str
+    meta: Sequence[str] = ()

cloudsnake-0.10.0/src/cloudsnake/sdk/cloudwatch.py

@@ -0,0 +1,119 @@
+from __future__ import annotations
+
+import re
+import time
+
+import jmespath
+from typing import Any, Dict, Optional, Iterator
+
+from rich.console import Console
+from rich.text import Text
+
+from cloudsnake.sdk.aws import App
+from botocore.exceptions import ClientError
+
+console = Console()
+
+
+class CloudWatchLogsWrapper(App):
+    def __init__(
+        self,
+        filters: Optional[str] = None,
+        query: Optional[str] = None,
+        **kwargs,
+    ):
+        super().__init__(filters=filters, query=query, **kwargs)
+        self.log_groups: Dict[str, Any] = {}
+
+    @property
+    def client_name(self) -> str:
+        return "logs"
+
+    def list_log_groups(self) -> Any:
+        self.log_groups = {}
+        try:
+            paginator = self.client.get_paginator("describe_log_groups")
+
+            pagination_args = {}
+
+            if self.filters:
+                pagination_args["logGroupNamePrefix"] = self.filters
+
+            for page in paginator.paginate(**pagination_args):
+                for group in page.get("logGroups", []):
+                    name = group.get("logGroupName")
+                    if name:
+                        self.log_groups[name] = group
+
+            result = list(self.log_groups.values())
+
+            return jmespath.search(self.query, result) if self.query else result
+
+        except ClientError as err:
+            self.log.error(
+                f"CloudWatch Logs describe_log_groups failed: "
+                f"{err.response['Error']['Code']} - "
+                f"{err.response['Error']['Message']}"
+            )
+            raise
+
+    def tail_log_group_live(
+        self,
+        log_group_arn: str,
+        filter_pattern: Optional[str] = None,
+    ) -> Iterator[dict]:
+        """
+        Live tail a CloudWatch log group using start_live_tail (push-based).
+        """
+        try:
+            kwargs = {
+                "logGroupIdentifiers": [log_group_arn],
+            }
+
+            if filter_pattern:
+                kwargs["logEventFilterPattern"] = filter_pattern
+
+            response = self.client.start_live_tail(**kwargs)
+            stream = response["responseStream"]
+
+            for event in stream:
+                if "sessionUpdate" in event:
+                    for log_event in event["sessionUpdate"]["sessionResults"]:
+                        yield log_event
+
+        except ClientError as err:
+            self.log.error(
+                f"CloudWatch Logs start_live_tail failed: "
+                f"{err.response['Error']['Code']} - "
+                f"{err.response['Error']['Message']}"
+            )
+            raise
+
+    # TODO: implement get_historical_logs
+    def get_historical_logs(self):
+        pass
+
+
+def print_colored_log(event: dict, highlight_term: str | None = None) -> None:
+    stream = event.get("logStreamName", "unknown-stream")
+    message = event.get("message", "").rstrip()
+    timestamp = event.get("timestamp", 0)
+
+    time_str = time.strftime("%H:%M:%S", time.localtime(timestamp / 1000))
+
+    line = Text()
+    line.append(f"[{time_str}] ", style="yellow")
+    line.append(f"[{stream}] ", style="cyan")
+
+    if highlight_term:
+        pattern = re.compile(re.escape(highlight_term), re.IGNORECASE)
+        last = 0
+        for match in pattern.finditer(message):
+            line.append(message[last : match.start()])
+            line.append(match.group(), style="bold red on white")
+            last = match.end()
+        line.append(message[last:])
+    else:
+        line.append(message)
+
+    console.print(line)

{cloudsnake-0.8.0 → cloudsnake-0.10.0}/src/cloudsnake/sdk/ssm_parameters.py

@@ -14,7 +14,7 @@ class SSMParameterStoreWrapper(App):
     ):
         super().__init__(**kwargs)
         self.session_response_output = session_response_output
-        self.parameters = {}
+        self.parameters = []
         self.log = logging.getLogger("cloudsnake.ssm")
 
     @property
@@ -24,10 +24,12 @@ class SSMParameterStoreWrapper(App):
     def describe_parameters(self):
         try:
             paginator = self.client.get_paginator("describe_parameters")
+            self.parameters = []
             for page in paginator.paginate():
-                for page in paginator.paginate():
-                    self.parameters.update(page)
-            return self.parameters["Parameters"]
+                if "Parameters" in page:
+                    self.parameters.extend(page["Parameters"])
+            return self.parameters
+
         except ClientError as err:
             self.log.error(
                 "Couldn't register device",

{cloudsnake-0.8.0 → cloudsnake-0.10.0}/src/cloudsnake/sdk/ssm_session.py

@@ -35,16 +35,16 @@ class SSMStartSessionWrapper(App):
         if shutil.which("session-manager-plugin") is None:
             raise FileNotFoundError(PLUGIN_NOT_FOUND_MSG)
 
-    def start_session_response(self, target: str) -> Dict[str, Any]:
+    def start_session_response(self, target: str, reason: str) -> Dict[str, Any]:
         self.log.debug(f"ssm.start_session(Target={target})")
-        res = self.client.start_session(Target=target, Reason="cloudsnake session")
+        res = self.client.start_session(Target=target, Reason=reason)
         self.session_response_output = res
         return res
 
-    def start_session(self, target: str):
+    def start_session(self, target: str, reason: str = "cloudsnake session") -> int:
         self._ensure_plugin_installed()
         self.log.info(f"Starting SSM session for {target}")
-        self.start_session_response(target)
+        self.start_session_response(target, reason)
 
         try:
             with ignore_user_entered_signals():

cloudsnake-0.10.0/src/cloudsnake/styles/tui.tcss

@@ -0,0 +1,58 @@
+Screen {
+    background: #0f172a;
+}
+
+#main-container {
+    padding: 1 3;
+    height: 1fr;
+    background: #020617;
+}
+
+.main-title {
+    text-align: center;
+    color: #38bdf8;
+    text-style: bold;
+    margin-bottom: 1;
+}
+
+Input {
+    border: tall #334155;
+    background: #020617;
+    color: #e5e7eb;
+    padding: 0 1;
+    margin-bottom: 1;
+}
+
+Input:focus {
+    border: tall #a78bfa;
+}
+
+OptionList {
+    border: solid #1e293b;
+    background: #020617;
+    scrollbar-gutter: stable;
+    height: 1fr;
+}
+
+OptionList > .option {
+    color: #e5e7eb;
+}
+
+OptionList > .option--highlighted {
+    background: #1e293b;
+    color: #f8fafc;
+    text-style: bold;
+}
+
+OptionList:focus {
+    border: solid #38bdf8;
+}
+
+Notification {
+    background: #020617;
+    border: solid #a78bfa;
+}
+
+Notification.-warning {
+    border: solid #fbbf24;
+}

cloudsnake-0.10.0/src/cloudsnake/tui_v2.py

@@ -0,0 +1,96 @@
+from textual.app import App, ComposeResult
+from textual.widgets import Header, Footer, OptionList, Input, Label
+from textual.widgets.option_list import Option
+from textual.containers import Vertical
+from rich.text import Text
+
+from cloudsnake.models.selector import SelectorItem
+
+
+class SelectorApp(App[str]):
+    TITLE = "Cloudsnake Selector"
+    CSS_PATH = "styles/tui.tcss"
+
+    BINDINGS = [
+        ("ctrl+q", "hint_quit", "Quit hint"),
+        ("ctrl+c", "quit", "Quit"),
+        ("escape", "quit", "Cancel"),
+    ]
+
+    def __init__(
+        self,
+        items: list[SelectorItem],
+        title: str,
+        placeholder: str,
+    ):
+        super().__init__()
+        self.items = items
+        self.title = title
+        self.placeholder = placeholder
+
+    def compose(self) -> ComposeResult:
+        yield Header(show_clock=True)
+
+        with Vertical(id="main-container"):
+            yield Label(self.title, classes="main-title")
+            yield Input(
+                placeholder=self.placeholder,
+                id="search-box",
+            )
+            yield OptionList(id="item-list")
+
+        yield Footer()
+
+    def on_mount(self) -> None:
+        self.update_option_list(self.items)
+        self.query_one("#search-box").focus()
+
+    def create_rich_option(self, item: SelectorItem) -> Option:
+        text = Text.assemble(
+            (item.label, "bold #a78bfa"),
+            " ",
+            (f"({item.id})", "#94a3b8"),
+        )
+
+        for meta in item.meta:
+            text.append(" ")
+            text.append(f"[{meta}]", style="#fbbf24")
+
+        return Option(text, id=item.id)
+
+    def update_option_list(self, items: list[SelectorItem]) -> None:
+        option_list = self.query_one("#item-list", OptionList)
+        option_list.clear_options()
+        option_list.add_options([self.create_rich_option(item) for item in items])
+
+    def on_input_changed(self, event: Input.Changed) -> None:
+        term = event.value.lower()
+
+        if not term:
+            filtered = self.items
+        else:
+            filtered = [
+                item
+                for item in self.items
+                if term in item.label.lower()
+                or term in item.id.lower()
+                or any(term in m.lower() for m in item.meta)
+            ]
+
+        self.update_option_list(filtered)
+
+    def on_option_list_option_selected(self, event: OptionList.OptionSelected) -> None:
+        self.exit(event.option_id)
+
+    def on_input_submitted(self, event: Input.Submitted) -> None:
+        option_list = self.query_one("#item-list", OptionList)
+        if option_list.option_count > 0:
+            option_list.focus()
+
+    def action_hint_quit(self) -> None:
+        self.notify(
+            "Use Ctrl+C to exit",
+            title="Quit disabled",
+            severity="warning",
+            timeout=2.5,
+        )

cloudsnake-0.8.0/src/cloudsnake/cli/ssm.py

@@ -1,107 +0,0 @@
-import signal
-import sys
-from typing import Optional
-from cloudsnake.cli.dto import OutputMode
-from cloudsnake.sdk.ssm_parameters import SSMParameterStoreWrapper
-from cloudsnake.tui import EC2Tui, SSMTui
-import typer
-
-from cloudsnake.sdk.ec2 import EC2InstanceWrapper
-from cloudsnake.sdk.ssm_session import SSMStartSessionWrapper
-
-EC2_RUNNING_FILTER = "Name=instance-state-name,Values=running"
-
-EC2_INSTANCE_SELECTOR_QUERY = (
-    "[].{TargetId: InstanceId, Name: Tags[?Key=='Name'].Value | [0]}"
-)
-
-# TUI
-ec2_tui = EC2Tui()
-ssm_tui = SSMTui()
-
-
-def signal_handler(sig, frame):
-    typer.secho("You pressed Ctrl+C! Exiting gracefully...", fg="bright_red")
-    sys.exit(0)
-
-
-ssm = typer.Typer(
-    no_args_is_help=True,
-    pretty_exceptions_short=True,
-    pretty_exceptions_show_locals=False,
-)
-
-
-@ssm.command(
-    "start-session", help="Start session with the given target id", no_args_is_help=True
-)
-def start_session(
-    ctx: typer.Context,
-    target: Optional[str] = typer.Option(None, help="Target id of the instance"),
-    reason: Optional[str] = typer.Option(
-        "ssm-new-connection", help="Reason of the connection"
-    ),
-    with_instance_selector: Optional[bool] = typer.Option(
-        False,
-        "--with-instance-selector",
-        "-is",
-        help="Prompt a terminal menu and select the instance you want to connect. --target flag is no longer used",
-    ),
-):
-    signal.signal(signal.SIGINT, signal_handler)
-    ssm = SSMStartSessionWrapper(
-        session=ctx.obj.session,
-        profile=ctx.obj.profile,
-        region=ctx.obj.region,
-    )
-
-    if with_instance_selector:
-        ec2 = EC2InstanceWrapper(
-            session=ctx.obj.session,
-            filters=EC2_RUNNING_FILTER,
-            query=EC2_INSTANCE_SELECTOR_QUERY,
-            profile=ctx.obj.profile,
-            region=ctx.obj.region,
-        )
-
-        instances = ec2.describe_ec2_instances()
-        if not instances:
-            typer.echo("No running instances found.")
-            raise typer.Exit(1)
-
-        instance_name = ec2_tui.interactive_menu(
-            instances, title="Select the EC2 you want to connect"
-        )
-        instance_id = ec2_tui.get_target_id_by_name(instances, instance_name)
-
-        return ssm.start_session(instance_id)
-
-    return ssm.start_session(target)
-
-
-@ssm.command("get-parameters", help="Get secrets from parameter store")
-def get_parameters(
-    ctx: typer.Context,
-    output: Optional[OutputMode] = typer.Option(
-        OutputMode.json, "--output", "-o", help="Output mode", case_sensitive=True
-    ),
-    colored: Optional[bool] = typer.Option(
-        True, "--no-color", "-nc", help="Output with highlights."
-    ),
-):
-    signal.signal(signal.SIGINT, signal_handler)
-    ssm = SSMParameterStoreWrapper(
-        session=ctx.obj.session,
-        profile=ctx.obj.profile,
-        region=ctx.obj.region,
-    )
-
-    parameters = ssm.describe_parameters()
-
-    if not parameters:
-        typer.echo("No parameters found.")
-        raise typer.Exit(1)
-
-    parameter_name = ssm_tui.interactive_menu(parameters)
-    parameter = ssm.get_parameter_by_name(parameter_name)
-    typer.secho(parameter, fg="bright_green")