magic-pocket-cli 0.28.2__tar.gz → 0.30.0__tar.gz

{magic_pocket_cli-0.28.2 → magic_pocket_cli-0.30.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.5
 Name: magic-pocket-cli
-Version: 0.28.2
+Version: 0.30.0
 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.29,>=0.28.2
+Requires-Dist: magic-pocket<0.31,>=0.30.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.28.2/pocket_cli/cli/awscontainer_cli.py → magic_pocket_cli-0.30.0/pocket_cli/cli/container_cli.py

@@ -7,104 +7,128 @@ import click
 from botocore.exceptions import ClientError
 
 from pocket.context import Context
-from pocket.runtime import get_secrets
+from pocket.runtime import get_secrets, resolve_container_name
 from pocket.utils import echo
 from pocket_cli.cli.destroy_cli import (
-    _collect_awscontainer_targets,
-    _destroy_awscontainer,
+    _collect_container_targets,
+    _destroy_containers,
 )
-from pocket_cli.cli.resource_helper import require_configured
 from pocket_cli.mediator import Mediator
-from pocket_cli.resources.awscontainer import AwsContainer
+from pocket_cli.resources.container import Container
 
 
 @click.group()
-def awscontainer():
+def container():
     pass
 
 
-def get_awscontainer_resource(stage):
+def get_container_resource(stage, container_name: str | None = None):
+    """--container 指定 (単一 container なら省略可) の Container resource を返す。"""
     context = Context.from_toml(stage=stage)
-    return AwsContainer(
-        context=require_configured(
-            context.awscontainer, "awscontainer is not configured for this stage"
-        )
-    )
+    if not context.container:
+        raise click.ClickException("container is not configured for this stage")
+    try:
+        name = resolve_container_name(context, container_name)
+    except RuntimeError as e:
+        raise click.ClickException(str(e)) from e
+    return Container(context.container[name])
+
+
+_container_option = click.option(
+    "--container",
+    "container_name",
+    default=None,
+    help="対象 container 名 (1 つだけなら省略可)",
+)
 
 
-@awscontainer.command()
+@container.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
-def yaml(stage):
-    ac = get_awscontainer_resource(stage)
-    print(ac.stack.yaml)
+@_container_option
+def yaml(stage, container_name):
+    c = get_container_resource(stage, container_name)
+    print(c.stack.yaml)
 
 
-@awscontainer.command()
+@container.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
-def yaml_diff(stage):
-    ac = get_awscontainer_resource(stage)
-    print(ac.stack.yaml_diff.to_json(indent=2))
+@_container_option
+def yaml_diff(stage, container_name):
+    c = get_container_resource(stage, container_name)
+    print(c.stack.yaml_diff.to_json(indent=2))
 
 
-@awscontainer.group()
+@container.group()
 def secrets():
     pass
 
 
+def _secrets_views(context: Context):
+    """(ラベル, SecretsContext) の一覧 (shared store + 各 container store)。"""
+    views = []
+    if context.secrets:
+        views.append(("shared", context.secrets))
+    for c_name in sorted(context.container):
+        sc = context.container[c_name].secrets
+        if sc:
+            views.append((c_name, sc))
+    return views
+
+
 @secrets.command("list")
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
 @click.option("--show-values", is_flag=True, default=False)
 def list_secrets(stage, show_values):
-    ac = get_awscontainer_resource(stage)
-    sc = ac.context.secrets
-    if not sc:
+    context = Context.from_toml(stage=stage)
+    views = _secrets_views(context)
+    if not views:
         echo.warning("secrets is not configured for this stage")
         return
-    for key, spec in sc.user.items():
-        effective_store = spec.store or sc.store
-        print("%s: %s (store=%s)" % (key, spec.name, effective_store))
-        if show_values:
-            if effective_store == "sm":
-                client = boto3.client("secretsmanager", region_name=sc.region)
-                value = client.get_secret_value(SecretId=spec.name)["SecretString"]
-            else:
-                client = boto3.client("ssm", region_name=sc.region)
-                value = client.get_parameter(Name=spec.name, WithDecryption=True)[
-                    "Parameter"
-                ]["Value"]
-            print("  - " + value)
-    for key, pocket_secret in sc.managed.items():
-        status = "CREATED" if key in sc.pocket_store.secrets else "NOEXIST"
-        print("%s: %s %s" % (key, pocket_secret.type, pocket_secret.options))
-        print("  - " + status)
-        if (status == "CREATED") and show_values:
-            value = sc.pocket_store.secrets[key]
-            if isinstance(value, str):
+    for label, sc in views:
+        echo.info("[%s] %s" % (label, sc.pocket_key))
+        for key, spec in sc.user.items():
+            effective_store = spec.store or sc.store
+            print("%s: %s (store=%s)" % (key, spec.name, effective_store))
+            if show_values:
+                if effective_store == "sm":
+                    client = boto3.client("secretsmanager", region_name=sc.region)
+                    value = client.get_secret_value(SecretId=spec.name)["SecretString"]
+                else:
+                    client = boto3.client("ssm", region_name=sc.region)
+                    value = client.get_parameter(Name=spec.name, WithDecryption=True)[
+                        "Parameter"
+                    ]["Value"]
                 print("  - " + value)
-            else:
-                for k, v in value.items():
-                    print(f"  - {k}: {v}")
+        for key, pocket_secret in sc.managed.items():
+            status = "CREATED" if key in sc.pocket_store.secrets else "NOEXIST"
+            print("%s: %s %s" % (key, pocket_secret.type, pocket_secret.options))
+            print("  - " + status)
+            if (status == "CREATED") and show_values:
+                value = sc.pocket_store.secrets[key]
+                if isinstance(value, str):
+                    print("  - " + value)
+                else:
+                    for k, v in value.items():
+                        print(f"  - {k}: {v}")
 
 
 @secrets.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
 def create_pocket_managed(stage):
-    ac = get_awscontainer_resource(stage)
-    sc = ac.context.secrets
-    if not sc:
+    context = Context.from_toml(stage=stage)
+    if not _secrets_views(context):
         echo.warning("secrets is not configured for this stage")
         return
-    mediator = Mediator(Context.from_toml(stage=stage))
+    mediator = Mediator(context)
     mediator.create_pocket_managed_secrets()
 
 
-def _confirm_delete_pocket_managed_secrets(awscontainer: AwsContainer):
-    sc = awscontainer.context.secrets
-    if not sc:
-        echo.warning("secrets is not configured")
-        return
+def _confirm_delete_pocket_managed_secrets(views):
     existing_secret_keys = [
-        key for key in sc.managed.keys() if key in sc.pocket_store.secrets
+        "%s (%s)" % (key, label)
+        for label, sc in views
+        for key in sc.managed.keys()
+        if key in sc.pocket_store.secrets
     ]
     if not existing_secret_keys:
         echo.warning("No pocket managed secets are created yet.")
@@ -120,41 +144,46 @@ def _confirm_delete_pocket_managed_secrets(awscontainer: AwsContainer):
 @secrets.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
 def delete_pocket_managed(stage):
-    ac = get_awscontainer_resource(stage)
-    _confirm_delete_pocket_managed_secrets(ac)
-    if ac.context.secrets:
-        ac.context.secrets.pocket_store.delete_secrets()
+    context = Context.from_toml(stage=stage)
+    views = _secrets_views(context)
+    if not views:
+        echo.warning("secrets is not configured")
+        return
+    _confirm_delete_pocket_managed_secrets(views)
+    for _label, sc in views:
+        sc.pocket_store.delete_secrets()
 
 
-@awscontainer.command()
+@container.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
-def create(stage):
-    ac = get_awscontainer_resource(stage)
-    if not ac.status == "NOEXIST":
+@_container_option
+def create(stage, container_name):
+    c = get_container_resource(stage, container_name)
+    if not c.status == "NOEXIST":
         echo.warning("AWS lambda container is already created.")
     else:
         mediator = Mediator(Context.from_toml(stage=stage))
-        ac.create(mediator)
+        c.create(mediator)
         echo.success("Created: lambda")
 
 
-@awscontainer.command()
+@container.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
 @click.option("--with-secrets", is_flag=True, default=False)
 @click.option(
     "--yes", "-y", is_flag=True, default=False, help="確認プロンプトをスキップ"
 )
 def destroy(stage, with_secrets, yes):
-    """AwsContainer 関連リソースを削除する。
+    """Container 関連リソース (全 container) を削除する。
 
     トップレベル `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")
+    if not context.container:
+        echo.warning("container is not configured for this stage")
         return
-    targets = _collect_awscontainer_targets(context, with_secrets)
+    targets = _collect_container_targets(context, with_secrets)
     if not targets:
         echo.warning("削除対象のリソースが見つかりません。")
         return
@@ -164,49 +193,47 @@ def destroy(stage, with_secrets, yes):
     echo.danger("この操作は取り消せません！")
     if not yes:
         click.confirm(
-            "stage '%s' の AwsContainer リソースを削除しますか？" % stage, abort=True
+            "stage '%s' の Container リソースを削除しますか？" % stage, abort=True
         )
-    _destroy_awscontainer(context, with_secrets)
+    _destroy_containers(context, with_secrets)
 
 
-@awscontainer.command()
+@container.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
-def update(stage):
-    ac = get_awscontainer_resource(stage)
-    if ac.status == "NOEXIST":
+@_container_option
+def update(stage, container_name):
+    c = get_container_resource(stage, container_name)
+    if c.status == "NOEXIST":
         echo.warning("AWS lambda has not created yet.")
         return
-    if ac.status == "FAILED":
+    if c.status == "FAILED":
         echo.danger("AWS lambda has failed. Please check console.")
         return
-    if ac.status == "PROGRESS":
+    if c.status == "PROGRESS":
         echo.warning("AWS lambda is updating. Please wait.")
         return
     mediator = Mediator(Context.from_toml(stage=stage))
-    ac.update(mediator)
+    c.update(mediator)
 
 
-@awscontainer.command()
+@container.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
-def status(stage):
-    ac = get_awscontainer_resource(stage)
-    if ac.status == "COMPLETED":
+@_container_option
+def status(stage, container_name):
+    c = get_container_resource(stage, container_name)
+    if c.status == "COMPLETED":
         echo.success("Container is working!!!")
-    elif ac.status == "NOEXIST":
+    elif c.status == "NOEXIST":
         echo.warning("Container has not created yet.")
-    elif ac.status == "FAILED":
+    elif c.status == "FAILED":
         echo.danger("Container has failed. Please check console.")
     else:
-        echo.warning("Container stack status: %s" % ac.stack.status)
+        echo.warning("Container stack status: %s" % c.stack.status)
 
 
-def _resolve_lambda_target_handlers(
-    context: Context, handler_name: str | None
-) -> list[str]:
+def _resolve_lambda_target_handlers(c_ctx, handler_name: str | None) -> list[str]:
     """reload-env / status-env の対象 handler を解決する。"""
-    if context.awscontainer is None:
-        raise RuntimeError("awscontainer is not configured")
-    handlers = context.awscontainer.handlers
+    handlers = c_ctx.handlers
     if handler_name:
         if handler_name not in handlers:
             raise click.ClickException(
@@ -217,15 +244,6 @@ def _resolve_lambda_target_handlers(
     return list(handlers.keys())
 
 
-def _function_name(context: Context, handler_key: str) -> str:
-    if context.awscontainer is None:
-        raise RuntimeError("awscontainer is not configured")
-    # deploy 側 (LambdaHandlerContext.function_name = resource_prefix + key) と同じ
-    # 正準名を参照する。slug から再構成すると prefix_template / namespace
-    # (既定 `pocket`) を取りこぼすため、handler context の値をそのまま使う。
-    return context.awscontainer.handlers[handler_key].function_name
-
-
 def _fetch_lambda_env(client, function_name: str) -> dict[str, str]:
     """Lambda の現状 Environment.Variables を取得する。"""
     try:
@@ -240,12 +258,13 @@ def _fetch_lambda_env(client, function_name: str) -> dict[str, str]:
     return dict(config.get("Environment", {}).get("Variables", {}))
 
 
-@awscontainer.command("reload-env")
+@container.command("reload-env")
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
+@_container_option
 @click.option(
     "--handler", default=None, help="特定 handler のみ対象 (省略時は全 handler)"
 )
-def reload_env(stage, handler):
+def reload_env(stage, container_name, handler):
     """SSM/Secrets Manager の最新値で Lambda env を即時更新する (CFn を介さない)。
 
     deploy 時の CFn snapshot を base に、secrets (managed + user) の最新値を
@@ -257,19 +276,24 @@ def reload_env(stage, handler):
     実体は CLI で直接更新、次 deploy で自己治癒)。
     """
     context = Context.from_toml(stage=stage)
-    if not context.awscontainer:
-        raise click.ClickException("[awscontainer] が設定されていません")
+    if not context.container:
+        raise click.ClickException("[container.<name>] が設定されていません")
+    try:
+        c_name = resolve_container_name(context, container_name)
+    except RuntimeError as e:
+        raise click.ClickException(str(e)) from e
+    c_ctx = context.container[c_name]
 
-    fresh_secrets = get_secrets(stage)
+    fresh_secrets = get_secrets(stage, container=c_name)
     if not fresh_secrets:
         echo.warning("secrets が宣言されていません。何もしません。")
         return
 
-    lambda_client = boto3.client("lambda", region_name=context.awscontainer.region)
-    targets = _resolve_lambda_target_handlers(context, handler)
+    lambda_client = boto3.client("lambda", region_name=c_ctx.region)
+    targets = _resolve_lambda_target_handlers(c_ctx, handler)
 
     for h_name in targets:
-        function_name = _function_name(context, h_name)
+        function_name = c_ctx.handlers[h_name].function_name
         current = _fetch_lambda_env(lambda_client, function_name)
         new_env = {**current, **fresh_secrets}
         if new_env == current:
@@ -288,24 +312,30 @@ def reload_env(stage, handler):
             echo.log("  - %s" % k)
 
 
-@awscontainer.command("status-env")
+@container.command("status-env")
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
+@_container_option
 @click.option(
     "--handler", default=None, help="特定 handler のみ対象 (省略時は全 handler)"
 )
-def status_env(stage, handler):
+def status_env(stage, container_name, handler):
     """Lambda の現在 env と SSM/SM 上の宣言値の drift を表示する。"""
     context = Context.from_toml(stage=stage)
-    if not context.awscontainer:
-        raise click.ClickException("[awscontainer] が設定されていません")
+    if not context.container:
+        raise click.ClickException("[container.<name>] が設定されていません")
+    try:
+        c_name = resolve_container_name(context, container_name)
+    except RuntimeError as e:
+        raise click.ClickException(str(e)) from e
+    c_ctx = context.container[c_name]
 
-    fresh_secrets = get_secrets(stage)
-    lambda_client = boto3.client("lambda", region_name=context.awscontainer.region)
-    targets = _resolve_lambda_target_handlers(context, handler)
+    fresh_secrets = get_secrets(stage, container=c_name)
+    lambda_client = boto3.client("lambda", region_name=c_ctx.region)
+    targets = _resolve_lambda_target_handlers(c_ctx, handler)
 
     any_drift = False
     for h_name in targets:
-        function_name = _function_name(context, h_name)
+        function_name = c_ctx.handlers[h_name].function_name
         current = _fetch_lambda_env(lambda_client, function_name)
         drift = [k for k in fresh_secrets if current.get(k) != fresh_secrets[k]]
         echo.info(
@@ -321,20 +351,20 @@ def status_env(stage, handler):
             any_drift = True
     if any_drift:
         echo.warning(
-            "drift があります。"
-            "`pocket resource awscontainer reload-env` で同期できます。"
+            "drift があります。`pocket resource container reload-env` で同期できます。"
         )
     else:
         echo.success("drift なし。Lambda env と secrets は同期されています。")
 
 
-@awscontainer.command()
+@container.command()
 @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
+@_container_option
 @click.option("--openpath")
-def url(stage, openpath):
-    ac = get_awscontainer_resource(stage)
-    if ac.status == "COMPLETED":
-        if endpoint := ac.endpoints.get("wsgi"):
+def url(stage, container_name, openpath):
+    c = get_container_resource(stage, container_name)
+    if c.status == "COMPLETED":
+        if endpoint := c.endpoints.get("wsgi"):
             echo.success(f"wsgi url: {endpoint}")
             if openpath:
                 webbrowser.open(endpoint + "/" + openpath)

{magic_pocket_cli-0.28.2 → magic_pocket_cli-0.30.0}/pocket_cli/cli/deploy_cli.py

@@ -5,16 +5,17 @@ import click
 
 from pocket.context import Context, deploy_hash_report
 from pocket.utils import echo
+from pocket_cli import migrations
 from pocket_cli.cli import interaction
 from pocket_cli.cli.removed_flags import removed_skip_check_existing
 from pocket_cli.mediator import Mediator
 from pocket_cli.resources.aws.state import StateStore, create_state_store
-from pocket_cli.resources.awscontainer import AwsContainer
 from pocket_cli.resources.backup import Backup
 from pocket_cli.resources.cloudfront import CloudFront
 from pocket_cli.resources.cloudfront_acm import CloudFrontAcm
 from pocket_cli.resources.cloudfront_keys import CloudFrontKeys
 from pocket_cli.resources.cloudfront_waf import CloudFrontWaf
+from pocket_cli.resources.container import Container
 from pocket_cli.resources.dsql import Dsql
 from pocket_cli.resources.neon import Neon
 from pocket_cli.resources.rds import Rds
@@ -25,10 +26,12 @@ from pocket_cli.resources.vpc import Vpc
 
 
 def _append_infra_resources(resources, context: Context, state_bucket: str):
-    """VPC / RDS / CloudFrontKeys / AwsContainer をまとめて追加"""
-    if context.awscontainer and context.awscontainer.vpc:
-        if context.awscontainer.vpc.manage:
-            resources.append(Vpc(context.awscontainer.vpc))
+    """VPC / RDS / CloudFrontKeys / Container をまとめて追加"""
+    managed_vpc_names: set[str] = set()
+    for c_ctx in context.container.values():
+        if c_ctx.vpc and c_ctx.vpc.manage and c_ctx.vpc.name not in managed_vpc_names:
+            managed_vpc_names.add(c_ctx.vpc.name)
+            resources.append(Vpc(c_ctx.vpc))
     if context.dsql:
         resources.append(Dsql(context.dsql))
     if context.rds:
@@ -42,14 +45,14 @@ def _append_infra_resources(resources, context: Context, state_bucket: str):
     for _name, cf_ctx in context.cloudfront.items():
         if cf_ctx.signing_key:
             resources.append(CloudFrontKeys(cf_ctx))
-    if context.awscontainer:
+    for c_name in sorted(context.container):
         resources.append(
-            AwsContainer(
-                context.awscontainer,
+            Container(
+                context.container[c_name],
                 state_bucket=state_bucket,
                 rds_context=context.rds,
                 dsql_context=context.dsql,
-                scheduler_context=context.scheduler,
+                scheduler_context=context.scheduler.get(c_name),
             )
         )
 
@@ -174,25 +177,30 @@ def deploy_resources(context: Context, *, state_bucket: str = ""):
             hook()
 
 
-def build_image(context: Context, *, tag: str) -> str:
-    """awscontainer image を指定 tag で build & push する (deploy はしない)。
+def build_image(context: Context, *, tag: str) -> list[str]:
+    """全 container image を指定 tag で build & push する (deploy はしない)。
 
     build once 用。codebuild backend は source upload に state bucket を要するため、
-    deploy と同様に先に state bucket を確保してから build する。戻り値は ecr_name:tag。
+    deploy と同様に先に state bucket を確保してから build する。
+    戻り値は ecr_name:tag のリスト (container 名順)。
     """
-    if context.awscontainer is None:
-        raise click.ClickException("awscontainer がこの stage に設定されていません。")
+    if not context.container:
+        raise click.ClickException("container がこの stage に設定されていません。")
     state_store = _create_state_store(context)
     state_store.ensure_bucket()
-    ac = AwsContainer(context.awscontainer, state_bucket=state_store.bucket_name)
-    ac.build(tag)
-    return f"{context.awscontainer.ecr_name}:{tag}"
+    targets = []
+    for c_name in sorted(context.container):
+        c_ctx = context.container[c_name]
+        echo.log("Building container '%s'..." % c_name)
+        Container(c_ctx, state_bucket=state_store.bucket_name).build(tag)
+        targets.append(f"{c_ctx.ecr_name}:{tag}")
+    return targets
 
 
 def _deploy_pipeline(context: Context, *, openpath=None, skip_frontend=False):
     """deploy / promote 共通のパイプライン本体。
 
-    promote 時は context.awscontainer.promote_commit_hash が設定済みで、
+    promote 時は各 container の promote_commit_hash が設定済みで、
     deploy_init 内の image build が retag に置き換わる以外は deploy と同一。
     """
     # DEPLOY_HASH の解決結果を deploy 時に 1 回可視化する (env 伝播漏れで
@@ -206,6 +214,9 @@ def _deploy_pipeline(context: Context, *, openpath=None, skip_frontend=False):
     state_bucket = state_store.bucket_name
     deploy_init_resources(context, state_bucket=state_bucket)
     deploy_resources(context, state_bucket=state_bucket)
+    # リリース跨ぎ移行の掃除フェーズ (旧配置の削除は deploy 成功後にしか
+    # できないため、cloudfront 切替完了後のここで毎回呼ぶ。冪等)
+    migrations.run_deploy_cleanup(context)
     upload_managed_assets(context)
     if not skip_frontend:
         deploy_frontend(context)
@@ -254,9 +265,10 @@ def promote(stage: str, commit_hash, openpath, skip_frontend, yes):
     interaction.set_assume_yes(yes)
     check_aws_credentials()
     context = Context.from_toml(stage=stage)
-    if context.awscontainer is None:
-        raise click.ClickException("awscontainer がこの stage に設定されていません。")
-    context.awscontainer.promote_commit_hash = commit_hash
+    if not context.container:
+        raise click.ClickException("container がこの stage に設定されていません。")
+    for c_ctx in context.container.values():
+        c_ctx.promote_commit_hash = commit_hash
     _deploy_pipeline(context, openpath=openpath, skip_frontend=skip_frontend)
 
 
@@ -276,10 +288,11 @@ def _get_deploy_url(context: Context) -> str | None:
             if domain:
                 return f"https://{domain}"
 
-    # フォールバック: API Gateway
-    if context.awscontainer:
-        ac = AwsContainer(context.awscontainer)
-        endpoint = ac.endpoints.get("wsgi")
-        if endpoint:
-            return endpoint
+    # フォールバック: API Gateway (container 名順で最初に見つかった endpoint)
+    for c_name in sorted(context.container):
+        endpoints = Container(context.container[c_name]).endpoints
+        if "wsgi" in endpoints:
+            return endpoints["wsgi"]
+        if endpoints:
+            return next(iter(endpoints.values()))
     return None