magic-pocket-cli 0.17.0__tar.gz → 0.18.1__tar.gz

magic_pocket_cli-0.18.1/.gitignore

@@ -0,0 +1,42 @@
+# python generated files
+__pycache__/
+*.py[oc]
+build/
+dist/
+wheels/
+*.egg-info
+
+# venv
+.venv
+
+# editors
+.vscode/
+
+# local env
+.env
+.envrc.local
+
+# Rust
+/target/
+
+# Zensical build output
+site/
+
+# Vendor wheels (built locally for examples)
+vendor/
+
+# Forge
+forge.local.toml
+
+/CLAUDE.md
+
+# Activity Docs (作業ローカルの working doc。公開 repo には出さない)
+/docs/activity/
+
+# example deploy 生成物 (pocket が生成: runtime config / collectstatic 出力 / cache)
+/example-neon/pocket.runtime.toml
+/example-neon/pocket_cache/
+/example-neon/staticfiles/
+/example-tidb/pocket.runtime.toml
+/example-tidb/pocket_cache/
+/example-tidb/staticfiles/

{magic_pocket_cli-0.17.0 → magic_pocket_cli-0.18.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: magic-pocket-cli
-Version: 0.17.0
+Version: 0.18.1
 Summary: CLI and deploy tools for magic-pocket.
 Requires-Python: >=3.10
 Requires-Dist: awscrt>=0.19.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: deepdiff>=6.7.1
 Requires-Dist: jinja2>=3.1.3
-Requires-Dist: magic-pocket>=0.17.0
+Requires-Dist: magic-pocket>=0.18.0
 Requires-Dist: pathspec>=1.0.4
 Requires-Dist: python-on-whales>=0.68.0
 Requires-Dist: pyyaml>=6.0.1

{magic_pocket_cli-0.17.0 → magic_pocket_cli-0.18.1}/pocket_cli/cli/awscontainer_cli.py

@@ -9,6 +9,11 @@ from botocore.exceptions import ClientError
 from pocket.context import Context
 from pocket.runtime import get_secrets
 from pocket.utils import echo
+from pocket_cli.cli.destroy_cli import (
+    _collect_awscontainer_targets,
+    _destroy_awscontainer,
+)
+from pocket_cli.cli.resource_helper import require_configured
 from pocket_cli.mediator import Mediator
 from pocket_cli.resources.awscontainer import AwsContainer
 
@@ -20,10 +25,11 @@ def awscontainer():
 
 def get_awscontainer_resource(stage):
     context = Context.from_toml(stage=stage)
-    if not context.awscontainer:
-        echo.danger("awscontainer is not configured for this stage")
-        raise Exception("awscontainer is not configured for this stage")
-    return AwsContainer(context=context.awscontainer)
+    return AwsContainer(
+        context=require_configured(
+            context.awscontainer, "awscontainer is not configured for this stage"
+        )
+    )
 
 
 @awscontainer.command()
@@ -135,25 +141,32 @@ def create(stage):
 @awscontainer.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
 @click.option("--with-secrets", is_flag=True, default=False)
-def destroy(stage, with_secrets):
-    ac = get_awscontainer_resource(stage)
-    if ac.stack.status == "NOEXIST":
-        echo.warning("No AWS lambda container found.")
-    else:
-        ac.stack.delete()
-        echo.success("Aws lambda container was destroyed.")
-    if ac.ecr.exists():
-        ac.ecr.delete()
-        echo.success("ECR repository was deleted.")
-    else:
-        echo.warning("No ECR repository found.")
-    if with_secrets:
-        _confirm_delete_pocket_managed_secrets(ac)
-        if ac.context.secrets:
-            ac.context.secrets.pocket_store.delete_secrets()
-            echo.success("Pocket managed secrets were deleted.")
-    else:
-        echo.warning("Pocket managed secrets still exists.")
+@click.option(
+    "--yes", "-y", is_flag=True, default=False, help="確認プロンプトをスキップ"
+)
+def destroy(stage, with_secrets, yes):
+    """AwsContainer 関連リソースを削除する。
+
+    トップレベル `pocket destroy` と同じ実装を使う (共有 ECR の削除ガード /
+    stack 削除完了待ち / CodeBuild / log group 掃除を含む)。
+    """
+    context = Context.from_toml(stage=stage)
+    if not context.awscontainer:
+        echo.warning("awscontainer is not configured for this stage")
+        return
+    targets = _collect_awscontainer_targets(context, with_secrets)
+    if not targets:
+        echo.warning("削除対象のリソースが見つかりません。")
+        return
+    echo.danger("以下のリソースを削除します:")
+    for target in targets:
+        echo.info("  - %s" % target)
+    echo.danger("この操作は取り消せません！")
+    if not yes:
+        click.confirm(
+            "stage '%s' の AwsContainer リソースを削除しますか？" % stage, abort=True
+        )
+    _destroy_awscontainer(context, with_secrets)
 
 
 @awscontainer.command()

{magic_pocket_cli-0.17.0 → magic_pocket_cli-0.18.1}/pocket_cli/cli/cloudfront_cli.py

@@ -2,6 +2,7 @@ import click
 
 from pocket.context import Context
 from pocket.utils import echo
+from pocket_cli.cli.resource_helper import require_configured
 from pocket_cli.resources.cloudfront import CloudFront
 
 
@@ -12,13 +13,12 @@ def cloudfront():
 
 def get_cloudfront_resources(stage, name=None):
     context = Context.from_toml(stage=stage)
-    if not context.cloudfront:
-        echo.danger("cloudfront is not configured for this stage")
-        raise Exception("cloudfront is not configured for this stage")
+    require_configured(
+        context.cloudfront, "cloudfront is not configured for this stage"
+    )
     if name:
         if name not in context.cloudfront:
-            echo.danger("cloudfront '%s' is not configured" % name)
-            raise Exception("cloudfront '%s' is not configured" % name)
+            raise click.ClickException("cloudfront '%s' is not configured" % name)
         return [CloudFront(context.cloudfront[name])]
     return [CloudFront(cf_ctx) for cf_ctx in context.cloudfront.values()]
 
@@ -63,7 +63,15 @@ def create(stage, name):
 @cloudfront.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
 @click.option("--name", default=None)
-def destroy(stage, name):
+@click.option(
+    "--yes", "-y", is_flag=True, default=False, help="確認プロンプトをスキップ"
+)
+def destroy(stage, name, yes):
+    if not yes:
+        click.confirm(
+            "stage '%s' の CloudFront distribution を削除しますか？" % stage,
+            abort=True,
+        )
     for cf in get_cloudfront_resources(stage, name):
         echo.info("[%s]" % cf.context.name)
         cf.delete()

{magic_pocket_cli-0.17.0 → magic_pocket_cli-0.18.1}/pocket_cli/cli/cloudfront_keys_cli.py

@@ -2,6 +2,7 @@ import click
 
 from pocket.context import Context
 from pocket.utils import echo
+from pocket_cli.cli.resource_helper import require_configured
 from pocket_cli.resources.cloudfront_keys import CloudFrontKeys
 
 
@@ -12,9 +13,9 @@ def cloudfront_keys():
 
 def get_cloudfront_keys_resources(stage, name=None):
     context = Context.from_toml(stage=stage)
-    if not context.cloudfront:
-        echo.danger("cloudfront is not configured for this stage")
-        raise Exception("cloudfront is not configured for this stage")
+    require_configured(
+        context.cloudfront, "cloudfront is not configured for this stage"
+    )
     results = []
     for cf_name, cf_ctx in context.cloudfront.items():
         if not cf_ctx.signing_key:
@@ -23,8 +24,7 @@ def get_cloudfront_keys_resources(stage, name=None):
             continue
         results.append(CloudFrontKeys(cf_ctx))
     if name and not results:
-        echo.danger("cloudfront_keys '%s' is not configured" % name)
-        raise Exception("cloudfront_keys '%s' is not configured" % name)
+        raise click.ClickException("cloudfront_keys '%s' is not configured" % name)
     return results
 
 
@@ -61,7 +61,16 @@ def status(stage, name):
 @cloudfront_keys.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
 @click.option("--name", default=None)
-def destroy(stage, name):
+@click.option(
+    "--yes", "-y", is_flag=True, default=False, help="確認プロンプトをスキップ"
+)
+def destroy(stage, name, yes):
+    if not yes:
+        click.confirm(
+            "stage '%s' の CloudFront signing key リソースを削除しますか？"
+            "(署名済み URL が無効になります)" % stage,
+            abort=True,
+        )
     for cfk in get_cloudfront_keys_resources(stage, name):
         echo.info("[%s]" % cfk.context.name)
         cfk.delete()

{magic_pocket_cli-0.17.0 → magic_pocket_cli-0.18.1}/pocket_cli/cli/cloudfront_waf_cli.py

@@ -2,6 +2,7 @@ import click
 
 from pocket.context import Context
 from pocket.utils import echo
+from pocket_cli.cli.resource_helper import require_configured
 from pocket_cli.resources.cloudfront_waf import CloudFrontWaf
 
 
@@ -12,9 +13,9 @@ def cloudfront_waf():
 
 def get_cloudfront_waf_resources(stage, name=None):
     context = Context.from_toml(stage=stage)
-    if not context.cloudfront:
-        echo.danger("cloudfront is not configured for this stage")
-        raise Exception("cloudfront is not configured for this stage")
+    require_configured(
+        context.cloudfront, "cloudfront is not configured for this stage"
+    )
     results = []
     for cf_name, cf_ctx in context.cloudfront.items():
         if cf_ctx.waf is None:
@@ -23,8 +24,7 @@ def get_cloudfront_waf_resources(stage, name=None):
             continue
         results.append(CloudFrontWaf(cf_ctx))
     if name and not results:
-        echo.danger("cloudfront_waf '%s' is not configured" % name)
-        raise Exception("cloudfront_waf '%s' is not configured" % name)
+        raise click.ClickException("cloudfront_waf '%s' is not configured" % name)
     return results
 
 
@@ -61,7 +61,15 @@ def status(stage, name):
 @cloudfront_waf.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
 @click.option("--name", default=None)
-def destroy(stage, name):
+@click.option(
+    "--yes", "-y", is_flag=True, default=False, help="確認プロンプトをスキップ"
+)
+def destroy(stage, name, yes):
+    if not yes:
+        click.confirm(
+            "stage '%s' の WAF WebACL を削除しますか？(IP 制限が解除されます)" % stage,
+            abort=True,
+        )
     for waf in get_cloudfront_waf_resources(stage, name):
         echo.info("[%s]" % waf.context.name)
         waf.delete()

{magic_pocket_cli-0.17.0 → magic_pocket_cli-0.18.1}/pocket_cli/cli/deploy_cli.py

@@ -6,7 +6,7 @@ import click
 from pocket.context import Context, deploy_hash_report
 from pocket.utils import echo
 from pocket_cli.mediator import Mediator
-from pocket_cli.resources.aws.state import StateStore
+from pocket_cli.resources.aws.state import StateStore, create_state_store
 from pocket_cli.resources.awscontainer import AwsContainer
 from pocket_cli.resources.cloudfront import CloudFront
 from pocket_cli.resources.cloudfront_acm import CloudFrontAcm
@@ -72,15 +72,7 @@ def get_resources(context: Context, *, state_bucket: str = ""):
 
 
 def _create_state_store(context: Context) -> StateStore:
-    if not context.general:
-        raise RuntimeError("general context is not configured")
-    resource_prefix = context.general.prefix_template.format(
-        stage=context.stage,
-        project=context.project_name,
-        namespace=context.general.namespace,
-    )
-    bucket_name = f"{resource_prefix}state"
-    return StateStore(bucket_name, context.general.region)
+    return create_state_store(context)
 
 
 def deploy_init_resources(context: Context, *, state_bucket: str = ""):
@@ -114,6 +106,43 @@ def upload_managed_assets(context: Context):
         cf.upload_managed_assets()
 
 
+def _deploy_resource(resource, mediator: Mediator, state_store: StateStore):
+    target_name = resource.__class__.__name__
+    # template hash に影響する入力 (secret 値等) を status 判定前に読み込む。
+    # 空のまま hash を計算すると deploy 済み hash と一致せず、secret 焼き込み
+    # 構成 (enable_origin_verify / signing_key) で毎回 REQUIRE_UPDATE になる
+    prepare = getattr(resource, "prepare_deploy", None)
+    if prepare is not None:
+        prepare(mediator)
+    if resource.status == "NOEXIST":
+        echo.log("Creating %s..." % target_name)
+        if "mediator" in inspect.signature(resource.create).parameters:
+            resource.create(mediator)
+        else:
+            resource.create()
+        state_store.record(resource.state_info())
+    elif resource.status == "REQUIRE_UPDATE":
+        echo.log("Updating %s..." % target_name)
+        if "mediator" in inspect.signature(resource.update).parameters:
+            resource.update(mediator)
+        else:
+            resource.update()
+        state_store.record(resource.state_info())
+    elif resource.status == "FAILED":
+        # 黙ってスキップすると deploy が exit 0 で成功表示になる
+        raise RuntimeError(
+            "%s が FAILED 状態です。AWS コンソール等で状態を確認して"
+            "解消してから再実行してください。" % target_name
+        )
+    elif resource.status == "PROGRESS":
+        raise RuntimeError(
+            "%s の前回操作が進行中です。完了を待ってから再実行してください。"
+            % target_name
+        )
+    else:
+        echo.log("%s is already the latest version." % target_name)
+
+
 def deploy_resources(context: Context, *, state_bucket: str = ""):
     state_store = _create_state_store(context)
     # state bucket は deploy_init_resources の前に作成済み
@@ -123,23 +152,7 @@ def deploy_resources(context: Context, *, state_bucket: str = ""):
     mediator = Mediator(context)
     resources = get_resources(context, state_bucket=state_bucket)
     for resource in resources:
-        target_name = resource.__class__.__name__
-        if resource.status == "NOEXIST":
-            echo.log("Creating %s..." % target_name)
-            if "mediator" in inspect.signature(resource.create).parameters:
-                resource.create(mediator)
-            else:
-                resource.create()
-            state_store.record(resource.state_info())
-        elif resource.status == "REQUIRE_UPDATE":
-            echo.log("Updating %s..." % target_name)
-            if "mediator" in inspect.signature(resource.update).parameters:
-                resource.update(mediator)
-            else:
-                resource.update()
-            state_store.record(resource.state_info())
-        else:
-            echo.log("%s is already the latest version." % target_name)
+        _deploy_resource(resource, mediator, state_store)
     # stack 作成/更新が終わった後の後付け状態 (bucket policy / KVS など) を
     # 冪等に確保する。wait_status が timeout した次の deploy でも復旧できる。
     for resource in resources:

{magic_pocket_cli-0.17.0 → magic_pocket_cli-0.18.1}/pocket_cli/cli/destroy_cli.py

@@ -4,7 +4,10 @@ import click
 from pocket.context import Context
 from pocket.utils import echo
 from pocket_cli.resources.aws.builders.codebuild import CodeBuildBuilder
-from pocket_cli.resources.aws.state import StateStore
+from pocket_cli.resources.aws.state import (
+    context_resource_prefix,
+    create_state_store,
+)
 from pocket_cli.resources.awscontainer import AwsContainer
 from pocket_cli.resources.cloudfront import CloudFront
 from pocket_cli.resources.cloudfront_acm import CloudFrontAcm
@@ -18,32 +21,15 @@ from pocket_cli.resources.upstash import Upstash
 from pocket_cli.resources.vpc import Vpc
 
 
-def _create_state_store(context: Context) -> StateStore:
-    if not context.general:
-        raise RuntimeError("general context is not configured")
-    resource_prefix = context.general.prefix_template.format(
-        stage=context.stage,
-        project=context.project_name,
-        namespace=context.general.namespace,
-    )
-    bucket_name = f"{resource_prefix}state"
-    return StateStore(bucket_name, context.general.region)
-
-
 def _create_codebuild_builder(context: Context) -> CodeBuildBuilder | None:
     """CodeBuildBuilder インスタンスを作成（リソース確認用）"""
     if not context.awscontainer or not context.general:
         return None
-    resource_prefix = context.general.prefix_template.format(
-        stage=context.stage,
-        project=context.project_name,
-        namespace=context.general.namespace,
-    )
-    state_bucket = f"{resource_prefix}state"
+    resource_prefix = context_resource_prefix(context)
     return CodeBuildBuilder(
         region=context.general.region,
         resource_prefix=resource_prefix,
-        state_bucket=state_bucket,
+        state_bucket=f"{resource_prefix}state",
         permissions_boundary=context.awscontainer.permissions_boundary,
     )
 
@@ -89,13 +75,18 @@ def _collect_awscontainer_targets(context: Context, with_secrets: bool):
         parts.append("CodeBuild")
 
     targets.append("AwsContainer (%s)" % " + ".join(parts))
-    targets.extend(_collect_vpc_targets(context))
 
     return targets
 
 
-def _collect_database_targets(context: Context) -> list[str]:
-    """データベース関連の削除対象を収集"""
+def _warn_command_provisioned(label: str, hint: str):
+    echo.warning(
+        '%s は provisioning="command" のため destroy では削除しません。'
+        "%s で削除してください。" % (label, hint)
+    )
+
+
+def _collect_aws_database_targets(context: Context) -> list[str]:
     targets: list[str] = []
     if context.dsql:
         dsql = Dsql(context.dsql)
@@ -105,15 +96,36 @@ def _collect_database_targets(context: Context) -> list[str]:
         rds = Rds(context.rds)
         if rds.status != "NOEXIST":
             targets.append("RDS Aurora クラスター: %s" % context.rds.cluster_identifier)
-    if context.tidb:
-        targets.append("TiDB クラスタ")
-    if context.upstash:
-        targets.append("Upstash Redis: %s" % context.upstash.database_name)
-    if context.neon:
-        targets.append("Neon ブランチ")
     return targets
 
 
+def _collect_external_database_targets(context: Context) -> list[str]:
+    """外部 DB (TiDB / Upstash / Neon) の削除対象を収集
+
+    provisioning="command" の DB は deploy 同様 destroy も管理しない
+    (credential レス運用のため provider API を叩かない)。
+    dsql/rds と同様に存在確認し、確認プロンプトの一覧を実態に合わせる。
+    """
+    targets: list[str] = []
+    if context.tidb and context.tidb.provisioning != "command":
+        if TiDb(context.tidb).cluster:
+            targets.append("TiDB クラスタ")
+    if context.upstash and context.upstash.provisioning != "command":
+        if Upstash(context.upstash).database:
+            targets.append("Upstash Redis: %s" % context.upstash.database_name)
+    if context.neon and context.neon.provisioning != "command":
+        if Neon(context.neon).branch:
+            targets.append("Neon ブランチ")
+    return targets
+
+
+def _collect_database_targets(context: Context) -> list[str]:
+    """データベース関連の削除対象を収集"""
+    return _collect_aws_database_targets(context) + _collect_external_database_targets(
+        context
+    )
+
+
 def _collect_targets(context: Context, with_secrets: bool, with_state_bucket: bool):
     """削除対象のリソース一覧を収集"""
     targets: list[str] = []
@@ -125,6 +137,7 @@ def _collect_targets(context: Context, with_secrets: bool, with_state_bucket: bo
 
     targets.extend(_collect_awscontainer_targets(context, with_secrets))
     targets.extend(_collect_database_targets(context))
+    targets.extend(_collect_vpc_targets(context))
 
     for name, cf_ctx in context.cloudfront.items():
         if cf_ctx.signing_key:
@@ -173,6 +186,9 @@ def _destroy_awscontainer(context: Context, with_secrets: bool):
     if ac.stack.status != "NOEXIST":
         echo.log("Destroying AwsContainer stack...")
         ac.stack.delete()
+        # Lambda が VPC 内にある場合、ENI 解放を含む削除完了を待たないと
+        # 後続の VPC 削除が subnet 使用中で DELETE_FAILED になる
+        ac.stack.wait_status("NOEXIST", timeout=1800, interval=10)
         echo.success("AwsContainer stack was destroyed.")
 
     if ac.ecr.exists():
@@ -196,8 +212,6 @@ def _destroy_awscontainer(context: Context, with_secrets: bool):
         context.awscontainer.secrets.pocket_store.delete_secrets()
         echo.success("Pocket managed secrets were deleted.")
 
-    _destroy_vpc(context)
-
 
 def _destroy_dsql(context: Context):
     """DSQL クラスターを削除"""
@@ -252,6 +266,44 @@ def _destroy_vpc(context: Context):
         echo.success("VPC was destroyed.")
 
 
+def _destroy_tidb(context: Context):
+    """TiDB クラスタを削除 (provisioning="command" は管理外)"""
+    if not context.tidb:
+        return
+    if context.tidb.provisioning == "command":
+        _warn_command_provisioned("TiDB", "pocket resource tidb delete")
+        return
+    if TiDb(context.tidb).cluster:
+        echo.log("Destroying TiDB cluster...")
+        TiDb(context.tidb).delete_cluster()
+        echo.success("TiDB cluster was deleted.")
+
+
+def _destroy_upstash(context: Context):
+    """Upstash Redis を削除 (provisioning="command" は管理外)"""
+    if not context.upstash:
+        return
+    if context.upstash.provisioning == "command":
+        _warn_command_provisioned("Upstash", "Upstash コンソール等")
+        return
+    upstash = Upstash(context.upstash)
+    if upstash.database:
+        upstash.delete_database()
+
+
+def _destroy_neon(context: Context):
+    """Neon ブランチを削除 (provisioning="command" は管理外)"""
+    if not context.neon:
+        return
+    if context.neon.provisioning == "command":
+        _warn_command_provisioned("Neon", "pocket resource neon delete")
+        return
+    if Neon(context.neon).branch:
+        echo.log("Destroying Neon branch...")
+        Neon(context.neon).delete_branch()
+        echo.success("Neon branch was deleted.")
+
+
 def _destroy_cloudfront_and_acm(context: Context):
     """CloudFront ディストリビューションと ACM 証明書を削除"""
     for name, cf_ctx in context.cloudfront.items():
@@ -273,7 +325,7 @@ def _destroy_resources(context: Context, with_secrets: bool, with_state_bucket:
     # 1. CloudFront + ACM
     _destroy_cloudfront_and_acm(context)
 
-    # 2. AwsContainer (CFNスタック + ECR + secrets) + 3. VPC
+    # 2. AwsContainer (CFNスタック + ECR + secrets)
     _destroy_awscontainer(context, with_secrets)
 
     # 2.5. DSQL
@@ -282,6 +334,10 @@ def _destroy_resources(context: Context, with_secrets: bool, with_state_bucket:
     # 2.6. RDS（AwsContainer の後、VPC の前）
     _destroy_rds(context)
 
+    # 3. VPC（RDS の後。RDS が VPC の subnet / SG を使用しているため、
+    #    先に VPC を消すと DELETE_FAILED になる）
+    _destroy_vpc(context)
+
     # 3.5. CloudFrontKeys（AwsContainer の後、S3 の前）
     for name, cf_ctx in context.cloudfront.items():
         if cf_ctx.signing_key:
@@ -297,27 +353,18 @@ def _destroy_resources(context: Context, with_secrets: bool, with_state_bucket:
         S3(context.s3).delete()
         echo.success("S3 bucket was deleted.")
 
-    # 5. TiDB クラスタ
-    if context.tidb and TiDb(context.tidb).cluster:
-        echo.log("Destroying TiDB cluster...")
-        TiDb(context.tidb).delete_cluster()
-        echo.success("TiDB cluster was deleted.")
+    # 5. TiDB クラスタ (provisioning="command" は deploy 同様 destroy も管理しない)
+    _destroy_tidb(context)
 
     # 5.5. Upstash Redis
-    if context.upstash:
-        upstash = Upstash(context.upstash)
-        if upstash.database:
-            upstash.delete_database()
+    _destroy_upstash(context)
 
     # 6. Neon ブランチ
-    if context.neon and Neon(context.neon).branch:
-        echo.log("Destroying Neon branch...")
-        Neon(context.neon).delete_branch()
-        echo.success("Neon branch was deleted.")
+    _destroy_neon(context)
 
     # 7. ステートバケット
     if with_state_bucket:
-        state_store = _create_state_store(context)
+        state_store = create_state_store(context)
         echo.log("Destroying state bucket...")
         state_store.delete_bucket()
         echo.success("State bucket was deleted.")

{magic_pocket_cli-0.17.0 → magic_pocket_cli-0.18.1}/pocket_cli/cli/dsql_cli.py

@@ -4,14 +4,15 @@ import click
 
 from pocket.context import Context
 from pocket.utils import echo
+from pocket_cli.cli.resource_helper import require_configured
 from pocket_cli.resources.dsql import Dsql
 
 
 def _get_dsql_resource(stage: str) -> Dsql:
     context = Context.from_toml(stage=stage)
-    if not context.dsql:
-        raise click.ClickException("dsql is not configured for this stage")
-    return Dsql(context.dsql)
+    return Dsql(
+        require_configured(context.dsql, "dsql is not configured for this stage")
+    )
 
 
 @click.group()