infra-cli 0.1.6__tar.gz → 0.3.0__tar.gz

{infra_cli-0.1.6 → infra_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infra-cli
-Version: 0.1.6
+Version: 0.3.0
 Summary: Pluggable Infrastructure CLI as a wrapper around DevOps tools.
 Author-email: Youqing Han <ihanyouqing@gmail.com>
 License-Expression: Apache-2.0
@@ -27,6 +27,8 @@ Requires-Dist: requests>=2.28.0
 Provides-Extra: aws
 Requires-Dist: zxcvbn>=4.4.28; extra == "aws"
 Requires-Dist: openpyxl>=3.1.0; extra == "aws"
+Requires-Dist: PyMySQL>=1.1.0; extra == "aws"
+Requires-Dist: pg8000>=1.31.0; extra == "aws"
 Provides-Extra: server
 Requires-Dist: fastapi>=0.100.0; extra == "server"
 Requires-Dist: uvicorn>=0.20.0; extra == "server"

{infra_cli-0.1.6 → infra_cli-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "infra-cli"
-version = "0.1.6"
+version = "0.3.0"
 description = "Pluggable Infrastructure CLI as a wrapper around DevOps tools."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -40,6 +40,8 @@ dependencies = [
 aws = [
     "zxcvbn>=4.4.28",
     "openpyxl>=3.1.0",
+    "PyMySQL>=1.1.0",
+    "pg8000>=1.31.0",
 ]
 server = [
     "fastapi>=0.100.0",

infra_cli-0.3.0/src/infra/VERSION

@@ -0,0 +1,5 @@
+package=0.3.0
+build_date=2026-10-27T14:15:55Z
+commit=3da48c814f6ae9c9d0d71f8d63560db32b57c7c8
+commit_time=2026-10-27T22:14:36+08:00
+dirty=false

{infra_cli-0.1.6 → infra_cli-0.3.0}/src/infra/commands/__init__.py

@@ -2,6 +2,7 @@ import typer
 
 from .ansible import ansible_app, ansible_callback
 from .config_cmds import config_app
+from .docker import docker_app
 from .github import github_app
 from .packer import packer_app, packer_callback
 from .setup import setup_app
@@ -28,6 +29,12 @@ def register_commands(app: typer.Typer) -> None:
     app.add_typer(packer_app, name="packer", callback=packer_callback)
     app.add_typer(ansible_app, name="ansible", callback=ansible_callback)
     app.add_typer(setup_app, name="setup")
+    app.add_typer(docker_app, name="docker")
     app.add_typer(github_app, name="github")
+    app.add_typer(
+        github_app,
+        name="gh",
+        help="Alias for `github`.",
+    )
     app.add_typer(slack_app, name="slack")
     app.add_typer(config_app, name="config")

infra_cli-0.3.0/src/infra/commands/docker.py

@@ -0,0 +1,65 @@
+from typing import Annotated
+
+import typer
+
+from ..context import state
+from ..plugins.docker_ps import run_docker_ps
+
+docker_app = typer.Typer(
+    help=(
+        "Local Docker containers. With no verb, `ps` lists every container "
+        "(including stopped) with id, name, created time, and status."
+    ),
+    no_args_is_help=False,
+    rich_markup_mode=None,
+    context_settings={"help_option_names": ["-h", "--help"]},
+)
+
+SudoOpt = Annotated[
+    bool,
+    typer.Option(
+        "--sudo",
+        help="Run `sudo docker ps -a` (root docker.sock). Works before or after ps.",
+    ),
+]
+
+
+def _ps(sudo: bool) -> None:
+    raise typer.Exit(code=run_docker_ps(sudo=sudo, dry_run=state.dry_run))
+
+
+@docker_app.callback(invoke_without_command=True)
+def docker_group(ctx: typer.Context, sudo: SudoOpt = False) -> None:
+    """List containers. Same columns as `docker ps -a` with a fixed format.
+
+    Examples:
+
+        infra docker ps
+
+        infra docker ps --sudo
+
+        infra docker --sudo
+    """
+    state.docker_sudo = sudo
+    if ctx.invoked_subcommand is None:
+        _ps(sudo)
+
+
+@docker_app.command("ps")
+def docker_ps(sudo: SudoOpt = False) -> None:
+    """List all containers: id, name, created time, and status.
+
+    Runs `docker ps -a --format` with columns ID, Names, CreatedAt, and
+    Status. `--sudo` is `sudo docker ps -a` for a root-owned docker.sock.
+    Without `--sudo`, Colima or Docker Desktop is used when DOCKER_HOST
+    is unset.
+
+    Examples:
+
+        infra docker ps
+
+        infra docker ps --sudo
+
+        infra docker --sudo ps
+    """
+    _ps(sudo or state.docker_sudo)

infra_cli-0.3.0/src/infra/commands/github.py

@@ -0,0 +1,103 @@
+import sys
+
+import typer
+
+from ..context import state
+from ..execute import execute_plugin
+from ..plugins.github_pr import approve_pull_requests, merge_pull_requests
+from .options import ExtraArgs
+
+github_app = typer.Typer(
+    help=(
+        "Scaffold GitHub files and wrap `gh` for repo/PR tasks. `infra gh` is an alias."
+    ),
+    no_args_is_help=True,
+    rich_markup_mode=None,
+    context_settings={"help_option_names": ["-h", "--help"]},
+)
+
+
+@github_app.command(name="scaffold")
+def github_scaffold() -> None:
+    """Write GitHub workflow/issue templates into this repository.
+
+    Examples:
+
+        infra github scaffold
+    """
+    state.subcommand = "scaffold"
+    execute_plugin("github")
+
+
+@github_app.command(name="repo")
+def github_repo(args: ExtraArgs = None) -> None:
+    """Manage GitHub repositories (forwards to `gh repo`).
+
+    Examples:
+
+        infra github repo view
+    """
+    state.subcommand = "repo"
+    execute_plugin("github", extra_args=args)
+
+
+def _pr_parts(args: list[str] | None) -> list[str]:
+    parts = list(args or [])
+    if not parts or parts[0] not in {"approve", "merge"} or sys.stdin.isatty():
+        return parts
+    text = sys.stdin.read()
+    if not text.strip():
+        return parts
+    return [*parts, text]
+
+
+@github_app.command(
+    name="pr",
+    context_settings={
+        "allow_extra_args": True,
+        "ignore_unknown_options": True,
+        "help_option_names": ["-h", "--help"],
+    },
+)
+def github_pr(ctx: typer.Context, args: ExtraArgs = None) -> None:
+    """Manage GitHub pull requests (forwards to `gh pr`).
+
+    ``approve`` runs ``gh pr review NUMBER --repo ORG/REPO --approve`` for
+    each pull request. ``merge`` runs ``gh pr merge NUMBER --repo ORG/REPO``.
+    Separate values with commas, spaces, or newlines. A bare number uses
+    the current directory's ``origin`` remote. A URL, ``org/repo#N``, or
+    ``org/repo/N`` selects the repo. The local checkout of
+    ``git@github.com:ORG/REPO.git`` is ``~/github.com/ORG/REPO``. A
+    symlink at that path, or in a parent directory, is followed.
+
+    ``merge`` accepts ``--squash``, ``--merge``, ``--rebase``,
+    ``--delete-branch`` (``-d``), ``--admin``, and ``--auto``. Pass a
+    merge method for non-interactive shells.
+
+    Other verbs are forwarded to ``gh pr``.
+
+    Examples:
+
+        infra gh pr approve 123
+
+        infra gh pr approve 123,456
+
+        infra gh pr approve acme/app#12 acme/web#34
+
+        infra gh pr approve https://github.com/acme/app/pull/12
+
+        infra gh pr merge 123 --squash
+
+        infra gh pr merge 123,456 --squash --delete-branch
+
+        infra gh pr merge acme/app#12 acme/web#34 --squash
+
+        infra github pr list
+    """
+    parts = _pr_parts([*(args or []), *list(ctx.args or [])])
+    if parts[:1] == ["approve"]:
+        raise typer.Exit(code=approve_pull_requests(parts[1:], dry_run=state.dry_run))
+    if parts[:1] == ["merge"]:
+        raise typer.Exit(code=merge_pull_requests(parts[1:], dry_run=state.dry_run))
+    state.subcommand = "pr"
+    execute_plugin("github", extra_args=parts or None)

{infra_cli-0.1.6 → infra_cli-0.3.0}/src/infra/commands/options.py

@@ -4,9 +4,7 @@ import typer
 
 from ..utils.env import ENV_OPTION_HELP
 
-EnvOpt = Annotated[
-    str | None, typer.Option("-e", "--env", help=ENV_OPTION_HELP)
-]
+EnvOpt = Annotated[str | None, typer.Option("-e", "--env", help=ENV_OPTION_HELP)]
 # Kept for packer / ansible; Terragrunt encodes account inside -s/-ss.
 ProjOpt = Annotated[
     str | None,

{infra_cli-0.1.6 → infra_cli-0.3.0}/src/infra/commands/setup.py

@@ -417,7 +417,9 @@ def _make_component_command(name: str, tags: tuple[str, ...]) -> None:
 
 
 # Reserved verbs stay as first-class commands above; components fill the rest.
-_RESERVED = frozenset({"run", "list", "doctor", "verify", "apply-team", "scaffold", "upgrade-cli"})
+_RESERVED = frozenset(
+    {"run", "list", "doctor", "verify", "apply-team", "scaffold", "upgrade-cli"}
+)
 for _name, _tags in COMPONENT_COMMANDS.items():
     if _name in _RESERVED:
         continue

{infra_cli-0.1.6 → infra_cli-0.3.0}/src/infra/context.py

@@ -10,8 +10,10 @@ class InfraContext:
         self.aws_hidden: bool = False
         self.aws_profile: str | None = None
         self.aws_region: str | None = None
+        self.aws_all_accounts: bool = False
         self.dry_run: bool = False
         self.verbose: bool = False
+        self.docker_sudo: bool = False
         self.extra_args: list[str] = []
         self.subcommand: str | None = None
         self.setup_profile: str = "core"

{infra_cli-0.1.6 → infra_cli-0.3.0}/src/infra/doctor.py

@@ -44,9 +44,7 @@ def _report_deps(section: str, deps: dict[str, str | None]) -> bool:
             print_stat(tool, path, color=typer.colors.GREEN)
         else:
             print_error(
-                f"{tool}: not installed"
-                if tool == "boto3"
-                else f"{tool}: missing"
+                f"{tool}: not installed" if tool == "boto3" else f"{tool}: missing"
             )
             hint = setup_hint_for(tool)
             if hint:
@@ -55,7 +53,9 @@ def _report_deps(section: str, deps: dict[str, str | None]) -> bool:
     return ok
 
 
-def _plugin_enabled(full_config: dict[str, Any], name: str, *, default: bool = True) -> bool:
+def _plugin_enabled(
+    full_config: dict[str, Any], name: str, *, default: bool = True
+) -> bool:
     block = full_config.get(name)
     if not isinstance(block, dict):
         return default
@@ -188,7 +188,9 @@ def _brew_fallback() -> str | None:
     return None
 
 
-def _collect_component_deps(full_config: dict[str, Any]) -> dict[str, dict[str, str | None]]:
+def _collect_component_deps(
+    full_config: dict[str, Any],
+) -> dict[str, dict[str, str | None]]:
     """Build doctor sections for enabled ``setup.components``."""
     sections: dict[str, dict[str, str | None]] = {}
     system = platform.system().lower()
@@ -199,7 +201,11 @@ def _collect_component_deps(full_config: dict[str, Any]) -> dict[str, dict[str,
             continue
         deps: dict[str, str | None] = {}
         for display_key, kind, target in checks:
-            if kind == "path" and target.startswith("/Applications/") and system != "darwin":
+            if (
+                kind == "path"
+                and target.startswith("/Applications/")
+                and system != "darwin"
+            ):
                 continue
             if kind == "path" and target.startswith("/etc/") and system != "linux":
                 continue

infra_cli-0.3.0/src/infra/plugins/aws/describe_run.py

@@ -0,0 +1,236 @@
+"""Single-account describe runner shared by ``infra aws <service> describe``.
+
+The current profile and that profile's region are the only scope. A target
+may match more than one resource; every match is printed. JSON goes to
+stdout. Human text and the Field/Value table go to the terminal.
+"""
+
+from __future__ import annotations
+
+import ipaddress
+import json
+from collections.abc import Callable, Sequence
+from typing import Any
+
+import typer
+from botocore.config import Config
+from botocore.exceptions import BotoCoreError, ClientError
+from rich.console import Console
+from rich.table import Table
+
+from ...utils.ui import (
+    echo_styled,
+    format_profile_region,
+    hl,
+    hl_profile,
+    hl_region,
+    print_error,
+    print_warning,
+)
+from .inventory.match import address_matches, lookup_host_ips
+from .profiles import resolve_cached_profile
+from .runtime import open_boto3_session
+
+FETCH_TIMEOUT = 15
+VALID_OUTPUT = frozenset({"table", "json"})
+
+Collect = Callable[[Any, str], list[dict[str, Any]]]
+Display = Callable[[dict[str, Any], str], Any]
+
+
+def tags_dict(tags: list[dict[str, Any]] | None) -> dict[str, str]:
+    found: dict[str, str] = {}
+    for tag in tags or []:
+        key = str(tag.get("Key") or tag.get("key") or "")
+        if key:
+            found[key] = str(tag.get("Value") or tag.get("value") or "")
+    return found
+
+
+def num_str(value: Any) -> str:
+    if value is None:
+        return ""
+    return str(value)
+
+
+def display_value(value: Any) -> str:
+    if isinstance(value, dict):
+        return ", ".join(f"{key}={item}" for key, item in value.items())
+    if isinstance(value, list):
+        parts: list[str] = []
+        for item in value:
+            if isinstance(item, dict):
+                text = " ".join(f"{key}={item[key]}" for key in item if item[key])
+                if text:
+                    parts.append(text)
+            elif item:
+                parts.append(str(item))
+        return ", ".join(parts)
+    return str(value or "")
+
+
+def host_hit(hosts: Sequence[str], target: str) -> bool:
+    """True when ``target`` is a hostname or the IPv4 it resolves to."""
+    wanted = target.strip().rstrip(".").lower()
+    if not wanted:
+        return False
+    cleaned = [host.strip().rstrip(".") for host in hosts if host and str(host).strip()]
+    for host in cleaned:
+        if host.lower() == wanted:
+            return True
+    try:
+        is_ipv4 = ipaddress.ip_address(wanted).version == 4
+    except ValueError:
+        return False
+    if not is_ipv4:
+        return False
+    return address_matches(cleaned, [wanted], lookup_host_ips)
+
+
+def _render_table(
+    details: list[dict[str, Any]],
+    *,
+    label: str,
+    profile: str,
+    region: str,
+    fields: tuple[tuple[str, str], ...],
+    id_key: str,
+    name_key: str,
+    display: Display,
+) -> None:
+    from rich.markup import escape
+    from rich.text import Text
+
+    console = Console(width=200)
+    for detail in details:
+        id_val = str(detail.get(id_key) or "")
+        title = f"{label} describe  [cyan bold]{escape(id_val)}[/]"
+        name = str(detail.get(name_key) or "") if name_key else ""
+        if name and name != id_val:
+            title += f"  [cyan]{escape(name)}[/]"
+        title += (
+            f"  profile=[yellow bold]{escape(profile)}[/]  "
+            f"region=[blue bold]{escape(region)}[/]"
+        )
+        table = Table(title=title, show_header=True)
+        table.add_column("Field", style="cyan")
+        table.add_column("Value", overflow="fold")
+        for key, field_label in fields:
+            cell = display(detail, key)
+            if key == id_key and isinstance(cell, str) and cell:
+                cell = Text(cell, style="cyan bold")
+            elif key == name_key and isinstance(cell, str) and cell and cell != id_val:
+                cell = Text(cell, style="yellow bold")
+            table.add_row(field_label, cell)
+        console.print(table)
+
+
+def _print_api_failure(
+    exc: BaseException, profile_name: str, label: str, noun: str
+) -> None:
+    msg = str(exc)
+    print_error(f"{label} describe failed: {msg}")
+    if "SSO Token" in msg or "Token for" in msg or "ExpiredToken" in msg:
+        print_warning(f"  Run: infra aws login --profile {profile_name}")
+    elif "NotFound" in msg or "does not exist" in msg or "InvalidInstanceID" in msg:
+        print_warning(
+            f"Profile '{profile_name}' needs a valid {noun} in this region. "
+            f"Run: infra aws login --profile {profile_name}"
+        )
+
+
+def run_resource_describe(
+    target: str,
+    *,
+    profile: str | None,
+    region: str | None,
+    output: str,
+    client_name: str,
+    label: str,
+    noun: str,
+    many_label: str,
+    missing_target: str,
+    dry_run_api: str,
+    fields: tuple[tuple[str, str], ...],
+    collect: Collect,
+    id_key: str,
+    name_key: str = "name",
+    display: Display | None = None,
+    dry_run: bool = False,
+) -> int:
+    show = display or (lambda detail, key: display_value(detail.get(key)))
+    out_fmt = (output or "table").strip().lower()
+    if out_fmt not in VALID_OUTPUT:
+        print_error(f"Unknown --format: {output}. Use table or json.")
+        return 1
+    text = (target or "").strip()
+    if not text:
+        print_error(missing_target)
+        return 1
+
+    profile_name = resolve_cached_profile(profile)
+    if not profile_name:
+        print_warning(
+            "No AWS profile selected. Run `infra aws select` or pass --profile."
+        )
+        return 1
+
+    from ...utils.aws import resolve_aws_region
+
+    session = open_boto3_session(profile_name, region_name=region)
+    if session is None:
+        return 1
+
+    region_name = resolve_aws_region(region, session.region_name)
+    if not region_name:
+        print_error(
+            "Pass --region, set AWS_DEFAULT_REGION / AWS_REGION, or set aws.region."
+        )
+        return 1
+
+    if dry_run:
+        echo_styled(
+            f"ℹ️  [DRY-RUN] {dry_run_api} "
+            f"target={hl(text, fg=typer.colors.YELLOW)} "
+            f"{format_profile_region(profile_name, region_name)}"
+        )
+        return 0
+
+    boto_cfg = Config(
+        connect_timeout=FETCH_TIMEOUT,
+        read_timeout=FETCH_TIMEOUT,
+        retries={"max_attempts": 3},
+    )
+    client = session.client(client_name, region_name=region_name, config=boto_cfg)
+    try:
+        details = collect(client, text)
+    except (ClientError, BotoCoreError) as exc:
+        _print_api_failure(exc, profile_name, label, noun)
+        return 1
+
+    if len(details) > 1:
+        echo_styled(
+            f"ℹ️  {len(details)} {many_label} matched "
+            f"{hl(text, fg=typer.colors.YELLOW)}.",
+            err=True,
+        )
+    if out_fmt == "json":
+        typer.echo(json.dumps(details, indent=2))
+    elif details:
+        _render_table(
+            details,
+            label=label,
+            profile=profile_name,
+            region=region_name,
+            fields=fields,
+            id_key=id_key,
+            name_key=name_key,
+            display=show,
+        )
+    else:
+        echo_styled(
+            f"⚠️  No {noun} matched {hl(text, fg=typer.colors.YELLOW)} "
+            f"(profile={hl_profile(profile_name)}, region={hl_region(region_name)}).",
+            err=True,
+        )
+    return 0 if details else 1