inthub-cli 0.1.4__tar.gz → 0.1.6__tar.gz

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: inthub-cli
-Version: 0.1.4
+Version: 0.1.6
 Summary: inthub CLI — manage your inthub.io resources from the terminal
 Requires-Python: >=3.11
 Requires-Dist: google-cloud-secret-manager==2.21.0

inthub_cli-0.1.6/inthub/bulk/gcp_secrets.py

@@ -0,0 +1,52 @@
+import http.client
+import json
+import logging
+
+from google.cloud import secretmanager
+
+from inthub import state
+
+
+def _enable_gcp_debug_logging() -> None:
+    logging.basicConfig(
+        level=logging.DEBUG,
+        format="%(asctime)s %(name)s %(levelname)s %(message)s",
+    )
+    http.client.HTTPConnection.debuglevel = 2
+    for name in ("urllib3", "urllib3.connectionpool", "google.auth", "google.api_core"):
+        logging.getLogger(name).setLevel(logging.DEBUG)
+
+
+def _make_client() -> secretmanager.SecretManagerServiceClient:
+    if state.debug:
+        _enable_gcp_debug_logging()
+        return secretmanager.SecretManagerServiceClient(transport="rest")
+    return secretmanager.SecretManagerServiceClient()
+
+
+def fetch_secret(project_id: str, secret_name: str) -> dict[str, str]:
+    client = _make_client()
+    secret_path = f"projects/{project_id}/secrets/{secret_name}"
+    versions = list(
+        client.list_secret_versions(
+            request={"parent": secret_path, "filter": "state=ENABLED"}
+        )
+    )
+    if not versions:
+        raise ValueError(f"No enabled versions found for secret '{secret_name}'")
+    latest = max(versions, key=lambda v: int(v.name.rsplit("/", 1)[-1]))
+    response = client.access_secret_version(request={"name": latest.name})
+    payload = response.payload.data.decode("UTF-8")
+
+    try:
+        data: dict[str, str] = json.loads(payload)
+    except json.JSONDecodeError as exc:
+        raise ValueError(f"Secret '{secret_name}' is not valid JSON") from exc
+
+    missing = {"username", "password"} - set(data.keys())
+    if missing:
+        raise ValueError(
+            f"Secret '{secret_name}' missing required fields: {', '.join(sorted(missing))}"
+        )
+
+    return {"username": data["username"], "password": data["password"]}

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/inthub/cli.py

@@ -3,6 +3,7 @@ from importlib.metadata import version as pkg_version
 
 import typer
 
+from inthub import state
 from inthub.commands import connectors
 from inthub.commands.auth import login
 from inthub.commands.bulk import app as bulk_app
@@ -15,6 +16,13 @@ app.add_typer(connectors.app, name="connectors")
 app.add_typer(bulk_app, name="bulk")
 
 
+@app.callback()
+def _root(
+    debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
+) -> None:
+    state.debug = state.debug or debug
+
+
 @app.command("version")
 def version() -> None:
     """Show the CLI version."""

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/inthub/commands/bulk/__init__.py

@@ -1,5 +1,6 @@
 import typer
 
+from inthub import state
 from inthub.commands.bulk import manage, progress
 from inthub.commands.bulk.src_sqlserver_sink_snowflake import app as _src_sf_app
 
@@ -9,3 +10,10 @@ app.command("list")(manage.list_bulks)
 app.command("delete")(manage.delete_bulk)
 app.command("cleanup")(manage.cleanup)
 app.add_typer(_src_sf_app, name="src-sqlserver-sink-snowflake")
+
+
+@app.callback()
+def _bulk(
+    debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
+) -> None:
+    state.debug = state.debug or debug

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/inthub/commands/bulk/manage.py

@@ -5,6 +5,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from inthub import state
 from inthub.bulk.csv_state import BULK_DIR, _progress_path, _state_path, load_rows
 
 console = Console()
@@ -36,8 +37,11 @@ def _delete_bulk(ulid: str) -> bool:
     return found
 
 
-def list_bulks() -> None:
+def list_bulks(
+    debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
+) -> None:
     """List all bulk runs."""
+    state.debug = state.debug or debug
     entries = _state_files()
     if not entries:
         console.print("No bulk runs found.")
@@ -53,7 +57,7 @@ def list_bulks() -> None:
     table.add_column("ERROR", justify="right")
     table.add_column("PENDING", justify="right")
 
-    for ulid, state in entries:
+    for ulid, entry in entries:
         counts: Counter[str] = Counter()
         csv_file = _progress_path(ulid)
         if csv_file.exists():
@@ -64,10 +68,10 @@ def list_bulks() -> None:
 
         table.add_row(
             ulid,
-            state.get("gcp_project", ""),
-            state.get("sqlserver_source_plugin", ""),
-            state.get("snowflake_sink_plugin", ""),
-            state.get("tags", ""),
+            entry.get("gcp_project", ""),
+            entry.get("sqlserver_source_plugin", ""),
+            entry.get("snowflake_sink_plugin", ""),
+            entry.get("tags", ""),
             f"[green]{counts['done']}[/]" if counts["done"] else "0",
             f"[red]{counts['error']}[/]" if counts["error"] else "0",
             str(counts["pending"]),
@@ -76,8 +80,12 @@ def list_bulks() -> None:
     console.print(table)
 
 
-def delete_bulk(ulid: str = typer.Argument(..., help="ULID of the bulk run to delete.")) -> None:
+def delete_bulk(
+    ulid: str = typer.Argument(..., help="ULID of the bulk run to delete."),
+    debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
+) -> None:
     """Delete a bulk run (CSV + state)."""
+    state.debug = state.debug or debug
     if _delete_bulk(ulid):
         console.print(f"Deleted bulk run [bold]{ulid}[/].")
     else:
@@ -85,8 +93,11 @@ def delete_bulk(ulid: str = typer.Argument(..., help="ULID of the bulk run to de
         raise typer.Exit(1)
 
 
-def cleanup() -> None:
+def cleanup(
+    debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
+) -> None:
     """Delete all bulk runs."""
+    state.debug = state.debug or debug
     entries = _state_files()
     if not entries:
         console.print("Nothing to clean up.")

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/inthub/commands/bulk/progress.py

@@ -2,6 +2,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from inthub import state
 from inthub.bulk.csv_state import _progress_path, load_rows
 
 console = Console()
@@ -14,8 +15,12 @@ _STATUS_STYLE = {
 }
 
 
-def progress(ulid: str = typer.Argument(..., help="ULID of the bulk run.")) -> None:
+def progress(
+    ulid: str = typer.Argument(..., help="ULID of the bulk run."),
+    debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
+) -> None:
     """Show the current status of a bulk provisioning run."""
+    state.debug = state.debug or debug
     path = _progress_path(ulid)
     if not path.exists():
         console.print(f"[bold red]File not found:[/] {path}")

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/inthub/commands/bulk/src_sqlserver_sink_snowflake/__init__.py

@@ -4,7 +4,7 @@ from typing import Annotated
 import typer
 from ulid import ULID
 
-from inthub import config
+from inthub import config, state
 from inthub.bulk import csv_state
 from inthub.client import InthubClient
 from inthub.commands.bulk.src_sqlserver_sink_snowflake import orchestrator
@@ -16,12 +16,13 @@ app = typer.Typer(
 
 
 def _client() -> InthubClient:
-    return InthubClient(config.require_token())
+    return InthubClient(config.require_token(), debug=state.debug)
 
 
 @app.callback(invoke_without_command=True)
 def src_sqlserver_sink_snowflake(
     ctx: typer.Context,
+    debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
     csv_file: Annotated[Path | None, typer.Option("--csv", help="Path to input CSV.")] = None,
     sqlserver_source_plugin: Annotated[
         str | None, typer.Option("--sqlserver-source-plugin")
@@ -40,6 +41,7 @@ def src_sqlserver_sink_snowflake(
     ] = None,
 ) -> None:
     """Provision SQL Server source and Snowflake sink connectors from a CSV."""
+    state.debug = state.debug or debug
     if ctx.invoked_subcommand is not None:
         return
 
@@ -54,7 +56,7 @@ def src_sqlserver_sink_snowflake(
 
     if resume:
         try:
-            state = csv_state.load_state(resume)
+            saved = csv_state.load_state(resume)
         except FileNotFoundError:
             typer.echo(f"Error: state for ULID '{resume}' not found in ~/.inthub/.", err=True)
             raise typer.Exit(1)
@@ -62,10 +64,10 @@ def src_sqlserver_sink_snowflake(
         if not progress_path.exists():
             typer.echo(f"Error: progress file '{progress_path}' not found.", err=True)
             raise typer.Exit(1)
-        source_plugin = state["sqlserver_source_plugin"]
-        sink_plugin = state["snowflake_sink_plugin"]
-        tag_list = [t for t in state.get("tags", "").split(",") if t]
-        resolved_gcp_project = state["gcp_project"]
+        source_plugin = saved["sqlserver_source_plugin"]
+        sink_plugin = saved["snowflake_sink_plugin"]
+        tag_list = [t for t in saved.get("tags", "").split(",") if t]
+        resolved_gcp_project = saved["gcp_project"]
     else:
         missing = [
             name for name, val in [

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/inthub/commands/bulk/src_sqlserver_sink_snowflake/orchestrator.py

@@ -143,14 +143,14 @@ def process_row(
         _msg2 = "Fetching GCP secrets"
         try:
             ss_creds = gcp_secrets.fetch_secret(
-                gcp_project, f"{row['sqlserver_gcp_secret']}-{src_cluster_slug}"
+                gcp_project, row["sqlserver_gcp_secret"]
             )
         except Exception as exc:
             fail(2, _msg2, str(exc))
             return
         try:
             sf_creds = gcp_secrets.fetch_secret(
-                gcp_project, f"{row['snowflake_gcp_secret']}-{snk_cluster_slug}"
+                gcp_project, row["snowflake_gcp_secret"]
             )
         except Exception as exc:
             fail(2, _msg2, str(exc))

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/inthub/commands/connectors.py

@@ -8,7 +8,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
-from inthub import config
+from inthub import config, state
 from inthub.client import InthubClient
 
 app = typer.Typer(help="Manage connectors.", add_completion=False)
@@ -20,8 +20,15 @@ class OutputFormat(str, Enum):
     json = "json"
 
 
-def _client(debug: bool = False) -> InthubClient:
-    return InthubClient(config.require_token(), debug=debug)
+@app.callback()
+def _connectors(
+    debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
+) -> None:
+    state.debug = state.debug or debug
+
+
+def _client() -> InthubClient:
+    return InthubClient(config.require_token(), debug=state.debug)
 
 
 @app.command("list")
@@ -34,11 +41,12 @@ def list_connectors(
     debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
 ) -> None:
     """List connectors, optionally filtered by tags."""
+    state.debug = state.debug or debug
     path = "/connectors"
     if tag:
         path += "?tags=" + ",".join(tag)
 
-    body = _client(debug).get(path).json()
+    body = _client().get(path).json()
     connectors: list[dict[str, object]] = (
         body.get("connectors", []) if isinstance(body, dict) else body
     )
@@ -63,8 +71,11 @@ def list_connectors(
     table.add_column("UPDATED")
 
     for c in connectors:
-        state = str(c.get("state", ""))
-        state_cell = f"[green]{state}[/]" if state == "DEPLOYED" else f"[yellow]{state}[/]"
+        connector_state = str(c.get("state", ""))
+        if connector_state == "DEPLOYED":
+            state_cell = f"[green]{connector_state}[/]"
+        else:
+            state_cell = f"[yellow]{connector_state}[/]"
 
         health = str(c.get("argoHealth", "") or "")
         health_cell = (
@@ -117,7 +128,8 @@ def create_connector(
     debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
 ) -> None:
     """Create a new connector."""
-    body = _client(debug).post("/connectors", json={
+    state.debug = state.debug or debug
+    body = _client().post("/connectors", json={
         "name": name,
         "description": description,
         "kafkaConnectCluster": kafka_connect_cluster,
@@ -142,7 +154,8 @@ def clone_connector(
     debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
 ) -> None:
     """Clone an existing connector."""
-    body = _client(debug).post(f"/connectors/{id}/clone").json()
+    state.debug = state.debug or debug
+    body = _client().post(f"/connectors/{id}/clone").json()
 
     if output == OutputFormat.json:
         print(json_mod.dumps(body))
@@ -157,7 +170,8 @@ def delete_connector(
     debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
 ) -> None:
     """Delete a connector."""
-    _client(debug).delete(f"/connectors/{id}")
+    state.debug = state.debug or debug
+    _client().delete(f"/connectors/{id}")
     console.print(f"Connector {id} deleted.")
 
 
@@ -173,7 +187,8 @@ def publish_connector(
     debug: bool = typer.Option(False, "--debug", help="Print HTTP request/response details."),
 ) -> None:
     """Publish (apply) a connector to git/ArgoCD."""
-    resp = _client(debug).post(f"/connectors/{id}/apply", json={
+    state.debug = state.debug or debug
+    resp = _client().post(f"/connectors/{id}/apply", json={
         "branch": branch,
         "commitMessage": commit_message,
         "authorName": author,

inthub_cli-0.1.6/inthub/state.py

@@ -0,0 +1 @@
+debug: bool = False

{inthub_cli-0.1.4 → inthub_cli-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "inthub-cli"
-version = "0.1.4"
+version = "0.1.6"
 description = "inthub CLI — manage your inthub.io resources from the terminal"
 requires-python = ">=3.11"
 dependencies = [

inthub_cli-0.1.4/inthub/bulk/gcp_secrets.py

@@ -1,23 +0,0 @@
-import json
-
-from google.cloud import secretmanager
-
-
-def fetch_secret(project_id: str, secret_name: str) -> dict[str, str]:
-    client = secretmanager.SecretManagerServiceClient()
-    resource = f"projects/{project_id}/secrets/{secret_name}/versions/latest"
-    response = client.access_secret_version(request={"name": resource})
-    payload = response.payload.data.decode("UTF-8")
-
-    try:
-        data: dict[str, str] = json.loads(payload)
-    except json.JSONDecodeError as exc:
-        raise ValueError(f"Secret '{secret_name}' is not valid JSON") from exc
-
-    missing = {"username", "password"} - set(data.keys())
-    if missing:
-        raise ValueError(
-            f"Secret '{secret_name}' missing required fields: {', '.join(sorted(missing))}"
-        )
-
-    return {"username": data["username"], "password": data["password"]}