magic-pocket-cli 0.14.0__tar.gz → 0.16.0__tar.gz

{magic_pocket_cli-0.14.0 → magic_pocket_cli-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: magic-pocket-cli
-Version: 0.14.0
+Version: 0.16.0
 Summary: CLI and deploy tools for magic-pocket.
 Requires-Python: >=3.10
 Requires-Dist: awscrt>=0.19.0

{magic_pocket_cli-0.14.0 → magic_pocket_cli-0.16.0}/pocket_cli/cli/dsql_cli.py

@@ -1,3 +1,5 @@
+import json
+
 import click
 
 from pocket.context import Context
@@ -30,12 +32,35 @@ def status(stage):
 
 @dsql.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
-def endpoint(stage):
+@click.option(
+    "--format",
+    "format_",
+    type=click.Choice(["text", "json"]),
+    default="text",
+    show_default=True,
+    help="出力形式。text: 人間向け (stderr・色付き) / json: 機械可読 (stdout)",
+)
+def endpoint(stage, format_):
     """接続情報表示"""
     r = _get_dsql_resource(stage)
     if not r.cluster:
+        if format_ == "json":
+            # スクリプト向け: 見つからないときは exit 1 で失敗を伝える
+            # (text は従来通り warning + exit 0 のまま)
+            raise click.ClickException("Cluster not found")
         echo.warning("Cluster not found")
         return
+    if format_ == "json":
+        click.echo(
+            json.dumps(
+                {
+                    "endpoint": r.endpoint,
+                    "region": r.context.region,
+                    "port": 5432,
+                }
+            )
+        )
+        return
     _print_endpoint(r)
 
 

{magic_pocket_cli-0.14.0 → magic_pocket_cli-0.16.0}/pocket_cli/cli/rds_cli.py

@@ -1,3 +1,5 @@
+import json
+
 import click
 
 from pocket.context import Context
@@ -30,12 +32,36 @@ def status(stage):
 
 @rds.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
-def endpoint(stage):
+@click.option(
+    "--format",
+    "format_",
+    type=click.Choice(["text", "json"]),
+    default="text",
+    show_default=True,
+    help="出力形式。text: 人間向け (stderr・色付き) / json: 機械可読 (stdout)",
+)
+def endpoint(stage, format_):
     """接続情報表示"""
     r = _get_rds_resource(stage)
     if not r.cluster:
+        if format_ == "json":
+            # スクリプト向け: 見つからないときは exit 1 で失敗を伝える
+            # (text は従来通り warning + exit 0 のまま)
+            raise click.ClickException("Cluster not found")
         echo.warning("Cluster not found")
         return
+    if format_ == "json":
+        click.echo(
+            json.dumps(
+                {
+                    "endpoint": r.cluster.get("Endpoint", ""),
+                    "port": r.cluster.get("Port", ""),
+                    "database": r.context.database_name,
+                    "username": r.context.master_username,
+                }
+            )
+        )
+        return
     _print_endpoint(r)
 
 

{magic_pocket_cli-0.14.0 → magic_pocket_cli-0.16.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "magic-pocket-cli"
-version = "0.14.0"
+version = "0.16.0"
 description = "CLI and deploy tools for magic-pocket."
 requires-python = ">=3.10"
 dependencies = [