magic-pocket-cli 0.42.0__tar.gz → 0.44.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (92) hide show
  1. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/PKG-INFO +2 -2
  2. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/destroy_cli.py +1 -0
  3. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/permissions_cli.py +16 -1
  4. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/__init__.py +2 -0
  5. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/codebuild.py +8 -1
  6. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/iam_roles.py +67 -74
  7. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/stage_roles.py +9 -4
  8. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/container.py +1 -0
  9. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pyproject.toml +2 -2
  10. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/.gitignore +0 -0
  11. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/__init__.py +0 -0
  12. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/__init__.py +0 -0
  13. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/aws_auth.py +0 -0
  14. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/backup_cli.py +0 -0
  15. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/build_cli.py +0 -0
  16. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cleanup_deprecated_cli.py +0 -0
  17. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cloudfront_cli.py +0 -0
  18. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cloudfront_keys_cli.py +0 -0
  19. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cloudfront_waf_cli.py +0 -0
  20. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/container_cli.py +0 -0
  21. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/deploy_cli.py +0 -0
  22. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/dsql_cli.py +0 -0
  23. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/image_cli.py +0 -0
  24. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/inbound_cli.py +0 -0
  25. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/interaction.py +0 -0
  26. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/main_cli.py +0 -0
  27. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/migrate_cli.py +0 -0
  28. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/neon_cli.py +0 -0
  29. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/rds_cli.py +0 -0
  30. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/removed_flags.py +0 -0
  31. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/resource_helper.py +0 -0
  32. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/runtime_config_cli.py +0 -0
  33. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/s3_cli.py +0 -0
  34. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/status_cli.py +0 -0
  35. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/store_url_helper.py +0 -0
  36. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/tidb_cli.py +0 -0
  37. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/upstash_cli.py +0 -0
  38. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/url_helper.py +0 -0
  39. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/vpc_cli.py +0 -0
  40. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/waf_cli.py +0 -0
  41. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/django_cli.py +0 -0
  42. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/mediator.py +0 -0
  43. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/migrations.py +0 -0
  44. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/__init__.py +0 -0
  45. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/__init__.py +0 -0
  46. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/backup_common.py +0 -0
  47. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/backup_legacy.py +0 -0
  48. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/context_check.py +0 -0
  49. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/depot.py +0 -0
  50. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/docker.py +0 -0
  51. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/dockerignore.py +0 -0
  52. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/cloudformation.py +0 -0
  53. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/ecr.py +0 -0
  54. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/efs.py +0 -0
  55. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/lambdahandler.py +0 -0
  56. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/poll.py +0 -0
  57. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/s3_utils.py +0 -0
  58. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/stack_backed.py +0 -0
  59. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/state.py +0 -0
  60. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/backup.py +0 -0
  61. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/cloudfront.py +0 -0
  62. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/cloudfront_acm.py +0 -0
  63. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/cloudfront_keys.py +0 -0
  64. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/cloudfront_waf.py +0 -0
  65. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/dsql.py +0 -0
  66. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/inbound.py +0 -0
  67. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/inbound_domain.py +0 -0
  68. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/inbound_template.py +0 -0
  69. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/neon.py +0 -0
  70. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/rds.py +0 -0
  71. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/s3.py +0 -0
  72. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/sqs_alert.py +0 -0
  73. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/tidb.py +0 -0
  74. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/upstash.py +0 -0
  75. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/vpc.py +0 -0
  76. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_api_host.js +0 -0
  77. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_basic_auth_prelude.js +0 -0
  78. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_cache_control.js +0 -0
  79. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_deploy_hash_strip.js +0 -0
  80. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_host_redirect_prelude.js +0 -0
  81. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_spa_auth.js +0 -0
  82. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_spa_fallback.js +0 -0
  83. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cloudfront.yaml +0 -0
  84. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cloudfront_acm.yaml +0 -0
  85. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cloudfront_keys.yaml +0 -0
  86. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cloudfront_waf.yaml +0 -0
  87. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/container.yaml +0 -0
  88. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/vpc.yaml +0 -0
  89. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/django-dotenv.env +0 -0
  90. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/django-settings.py +0 -0
  91. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/pocket.Dockerfile +0 -0
  92. {magic_pocket_cli-0.42.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/pocket_simple.toml +0 -0
@@ -1,13 +1,13 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: magic-pocket-cli
3
- Version: 0.42.0
3
+ Version: 0.44.0
4
4
  Summary: CLI and deploy tools for magic-pocket.
5
5
  Requires-Python: >=3.10
6
6
  Requires-Dist: awscrt>=0.19.0
7
7
  Requires-Dist: click>=8.1.7
8
8
  Requires-Dist: deepdiff>=6.7.1
9
9
  Requires-Dist: jinja2>=3.1.3
10
- Requires-Dist: magic-pocket<0.43,>=0.42.0
10
+ Requires-Dist: magic-pocket<0.45,>=0.44.0
11
11
  Requires-Dist: pathspec>=1.0.4
12
12
  Requires-Dist: python-on-whales>=0.68.0
13
13
  Requires-Dist: pyyaml>=6.0.1
@@ -46,6 +46,7 @@ def _create_codebuild_builder(context: Context) -> CodeBuildBuilder | None:
46
46
  state_bucket=f"{resource_prefix}state",
47
47
  permissions_boundary=permissions_boundary,
48
48
  external_roles=context.external_roles,
49
+ external_role_prefix=context.external_role_prefix,
49
50
  )
50
51
 
51
52
 
@@ -5,6 +5,8 @@
5
5
  作る際の inline policy 生成に使用することを想定。
6
6
  - `roles`: pocket の Lambda / scheduler / CodeBuild / AWS Backup が使う IAM role
7
7
  の定義を出力する。`[iam] external_roles = true` で role を事前に作る用途。
8
+ - `role-names`: external_roles で事前に作る role の名前だけを種別ごとに返す
9
+ (AWS 不要。IAM 管理側が自前の命名計算と突き合わせる契約テスト用)。
8
10
  """
9
11
 
10
12
  from __future__ import annotations
@@ -15,7 +17,7 @@ import boto3
15
17
  import click
16
18
 
17
19
  from pocket.context import Context
18
- from pocket.permissions import compute_actions
20
+ from pocket.permissions import compute_actions, external_role_names
19
21
  from pocket.settings import Settings
20
22
  from pocket_cli.resources.aws.stage_roles import stage_role_specs
21
23
 
@@ -94,3 +96,16 @@ def roles(stage: str, account_id: str | None):
94
96
  ],
95
97
  }
96
98
  click.echo(json.dumps(output, indent=2, ensure_ascii=False))
99
+
100
+
101
+ @permissions.command("role-names")
102
+ @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
103
+ def role_names(stage: str):
104
+ """[iam] external_roles で事前に作る role の名前を種別ごとに JSON で出力する。
105
+
106
+ AWS には問い合わせない。規則は `{stage}-{project}-{namespace}-{kind}-role`
107
+ (namespace は [iam] namespace、無ければ [general] namespace) で、互換を保つ
108
+ 公開仕様。使わない種別も常に出す。
109
+ """
110
+ settings = Settings.from_toml(stage=stage)
111
+ click.echo(json.dumps(external_role_names(settings), indent=2))
@@ -28,6 +28,7 @@ def create_builder(
28
28
  state_bucket: str,
29
29
  permissions_boundary: str | None = None,
30
30
  external_roles: bool = False,
31
+ external_role_prefix: str = "",
31
32
  ) -> Builder:
32
33
  backend = build_context.backend
33
34
 
@@ -46,6 +47,7 @@ def create_builder(
46
47
  compute_type=build_context.compute_type,
47
48
  permissions_boundary=permissions_boundary,
48
49
  external_roles=external_roles,
50
+ external_role_prefix=external_role_prefix,
49
51
  )
50
52
 
51
53
  if backend == "depot":
@@ -51,6 +51,7 @@ class CodeBuildBuilder:
51
51
  compute_type: str = "BUILD_GENERAL1_MEDIUM",
52
52
  permissions_boundary: str | None = None,
53
53
  external_roles: bool = False,
54
+ external_role_prefix: str | None = None,
54
55
  ) -> None:
55
56
  self.region = region
56
57
  self.resource_prefix = resource_prefix
@@ -68,7 +69,13 @@ class CodeBuildBuilder:
68
69
  self.sts = boto3.client("sts", region_name=region)
69
70
 
70
71
  self._project_name = f"{resource_prefix}codebuild"
71
- self._role_name = f"{resource_prefix}codebuild-role"
72
+ # external_roles では利用者が作る種別単位の role ({external_role_prefix}
73
+ # codebuild-role。[iam] namespace で pocket 自身の role と名前を分けられる)
74
+ self._role_name = (
75
+ f"{external_role_prefix}codebuild-role"
76
+ if external_roles and external_role_prefix
77
+ else f"{resource_prefix}codebuild-role"
78
+ )
72
79
  # 0.36 以前のロール名。forge- は開発環境由来の prefix で pocket の命名規約
73
80
  # ({stage}-{project}-...) と無関係だったため改名した。ロールは stage の
74
81
  # 所有物なので、新ロールへ付け替えた後に pocket が削除する (改名互換。
@@ -14,7 +14,9 @@ pocket.toml と account / region だけで決まる)。
14
14
 
15
15
  [iam] external_roles = true のときは pocket は role を作らない。RoleSpec は
16
16
  「利用者が事前に作るべき role」の定義になり、`pocket permissions roles` が
17
- それを出力し、deploy は verify_role で実際の role と突き合わせる。
17
+ それを出力する。deploy は verify_role で role の存在と信頼先だけを確認し、
18
+ policy の中身は見ない (充足は role の持ち主の責任。pocket の版更新で policy の
19
+ 文面が変わるたびに role の更新を強いない)。
18
20
  """
19
21
 
20
22
  from __future__ import annotations
@@ -170,10 +172,11 @@ def lambda_role(
170
172
  policies[f"{prefix}{policy_name}"] = doc
171
173
 
172
174
  if ctx.external_roles:
173
- # CFn が持つ既存 role (下の名前) と衝突しないよう別名にする。切替時は
174
- # CFn が旧 role を消す間も、事前に作った新 role で Lambda が動き続ける
175
+ # 種別単位の role (全 container 共用。stage_role_specs が merge_role_specs で
176
+ # container 分をまとめる)。CFn が持つ既存 role (下の名前) とは名前が違うので、
177
+ # 切替時は CFn が旧 role を消す間も、事前に作った新 role で Lambda が動き続ける
175
178
  return RoleSpec(
176
- name=f"{prefix}{ctx.name}-lambda-role",
179
+ name=f"{ctx.external_role_prefix}lambda-role",
177
180
  service="lambda.amazonaws.com",
178
181
  managed_policy_arns=_lambda_managed_policies(ctx),
179
182
  inline_policies=policies,
@@ -507,8 +510,57 @@ def delete_role(
507
510
  # --- external_roles ---
508
511
 
509
512
 
513
+ def merge_role_specs(specs: list[RoleSpec]) -> list[RoleSpec]:
514
+ """同名の RoleSpec を 1 つにまとめる (external_roles の種別単位 role 向け)。
515
+
516
+ container ごとに組んだ Lambda / scheduler の RoleSpec は external では同じ名前に
517
+ なるので、managed policy は和集合、同名の inline policy は Statement の和集合に
518
+ する (共用 role は全 container の権限を必要とする)。順序は初出順を保つ。
519
+ """
520
+ merged: dict[str, RoleSpec] = {}
521
+ for spec in specs:
522
+ base = merged.get(spec.name)
523
+ if base is None:
524
+ merged[spec.name] = spec
525
+ continue
526
+ if base.service != spec.service:
527
+ raise ValueError(
528
+ "role %s を %s と %s の両方が使おうとしています"
529
+ % (spec.name, base.service, spec.service)
530
+ )
531
+ managed = list(base.managed_policy_arns)
532
+ managed += [a for a in spec.managed_policy_arns if a not in managed]
533
+ inline = dict(base.inline_policies)
534
+ for name, doc in spec.inline_policies.items():
535
+ inline[name] = _merge_policy(inline[name], doc) if name in inline else doc
536
+ merged[spec.name] = RoleSpec(
537
+ name=base.name,
538
+ service=base.service,
539
+ managed_policy_arns=managed,
540
+ inline_policies=inline,
541
+ permissions_boundary=base.permissions_boundary,
542
+ assume_role_policy_version=base.assume_role_policy_version,
543
+ external=base.external,
544
+ )
545
+ return list(merged.values())
546
+
547
+
548
+ def _merge_policy(a: dict[str, Any], b: dict[str, Any]) -> dict[str, Any]:
549
+ """2 つの policy 文書の Statement を重複なしで連結する。"""
550
+ statements: list[dict[str, Any]] = []
551
+ seen: set[str] = set()
552
+ for doc in (a, b):
553
+ raw = doc.get("Statement", [])
554
+ for statement in [raw] if isinstance(raw, dict) else raw:
555
+ key = json.dumps(statement, sort_keys=True)
556
+ if key not in seen:
557
+ seen.add(key)
558
+ statements.append(statement)
559
+ return {"Version": a.get("Version", _POLICY_VERSION), "Statement": statements}
560
+
561
+
510
562
  class RoleMismatchError(Exception):
511
- """external_roles の role が無い、または pocket が必要とする policy と違う。"""
563
+ """external_roles の role が無い、または pocket の service を信頼していない。"""
512
564
 
513
565
 
514
566
  _SUB_VARIABLE = re.compile(r"\$\{([^}]+)\}")
@@ -544,32 +596,21 @@ def _pseudo_parameter(name: str, region: str, account_id: str) -> str:
544
596
  return values[name]
545
597
 
546
598
 
547
- def verify_role(
548
- iam_client: IAMClient, spec: RoleSpec, *, region: str | None = None
549
- ) -> str:
550
- """external の role が spec どおりかを検査し、ARN を返す。
599
+ def verify_role(iam_client: IAMClient, spec: RoleSpec) -> str:
600
+ """external の role の存在と pocket の service への信頼を検査し、ARN を返す。
551
601
 
552
- pocket が必要とする信頼先・managed policy・inline policy がすべて揃って
553
- いるかを見る。利用者が足した policy は許容する。inline policy は同名の
554
- 文書が一致すること (`pocket permissions roles` の出力をそのまま使う前提)。
555
- region は inline policy が ${AWS::Region} を含む場合に要る。
602
+ policy (managed / inline) の中身は検査しない。role の持ち主は組織の流儀
603
+ (標準の許可セット・命名・boundary) で policy を組むため、pocket の出力との
604
+ 文面一致を求めると、pocket の版更新で文面が変わるたびに全 project の deploy
605
+ が止まる。必要な権限は `pocket permissions roles` が示し、充足は持ち主が
606
+ 保証する。
556
607
  """
557
608
  role = _get_external_role(iam_client, spec.name)
558
- account_id = role["Arn"].split(":")[4]
559
- problems: list[str] = []
560
609
  if not _trusts_service(role.get("AssumeRolePolicyDocument", {}), spec.service):
561
- problems.append("信頼ポリシーが %s を許可していません" % spec.service)
562
- problems += _managed_policy_problems(iam_client, spec)
563
- problems += _inline_policy_problems(
564
- iam_client,
565
- spec,
566
- spec.resolved_inline_policies(region=region or "", account_id=account_id),
567
- )
568
- if problems:
569
610
  raise RoleMismatchError(
570
- "IAM role %s が pocket の必要とする権限と一致しません:\n%s\n"
571
- "`pocket permissions roles` の出力どおりに更新してから再実行してください。"
572
- % (spec.name, "\n".join(" - " + p for p in problems))
611
+ "IAM role %s の信頼ポリシーが %s に sts:AssumeRole を許可していません。"
612
+ "`pocket permissions roles` の assume_role_policy を参考に信頼ポリシーを"
613
+ "直してから再実行してください。" % (spec.name, spec.service)
573
614
  )
574
615
  return role["Arn"]
575
616
 
@@ -587,54 +628,6 @@ def _get_external_role(iam_client: IAMClient, name: str) -> dict[str, Any]:
587
628
  ) from e
588
629
 
589
630
 
590
- def _managed_policy_problems(iam_client: IAMClient, spec: RoleSpec) -> list[str]:
591
- paginator = iam_client.get_paginator("list_attached_role_policies")
592
- attached = {
593
- policy["PolicyArn"]
594
- for page in paginator.paginate(RoleName=spec.name)
595
- for policy in page["AttachedPolicies"]
596
- }
597
- return [
598
- "managed policy %s が付いていません" % arn
599
- for arn in spec.managed_policy_arns
600
- if arn not in attached
601
- ]
602
-
603
-
604
- def _inline_policy_problems(
605
- iam_client: IAMClient, spec: RoleSpec, expected: dict[str, dict[str, Any]]
606
- ) -> list[str]:
607
- problems: list[str] = []
608
- for name, document in expected.items():
609
- try:
610
- actual = iam_client.get_role_policy(RoleName=spec.name, PolicyName=name)
611
- except ClientError as e:
612
- if e.response["Error"]["Code"] != "NoSuchEntity":
613
- raise
614
- problems.append("inline policy %s がありません" % name)
615
- continue
616
- if _normalize_policy(actual["PolicyDocument"]) != _normalize_policy(document):
617
- problems.append("inline policy %s の内容が違います" % name)
618
- return problems
619
-
620
-
621
- def _normalize_policy(value: Any) -> Any:
622
- """意味の同じ policy 文書を同じ値にそろえる。
623
-
624
- IAM を扱う道具 (Terraform 等) は要素 1 つの list を値そのものに変えたり、
625
- list を並べ替えたりする。IAM の評価ではどれも同じ意味になるため、比較では
626
- 区別しない。
627
- """
628
- if isinstance(value, dict):
629
- return {k: _normalize_policy(v) for k, v in value.items()}
630
- if isinstance(value, list):
631
- items = [_normalize_policy(v) for v in value]
632
- if len(items) == 1:
633
- return items[0]
634
- return sorted(items, key=lambda v: json.dumps(v, sort_keys=True))
635
- return value
636
-
637
-
638
631
  def _trusts_service(document: dict[str, Any], service: str) -> bool:
639
632
  statements = document.get("Statement", [])
640
633
  if isinstance(statements, dict):
@@ -20,7 +20,10 @@ if TYPE_CHECKING:
20
20
 
21
21
  def stage_role_specs(context: Context, *, account_id: str) -> list[iam_roles.RoleSpec]:
22
22
  """stage の deploy / backup で使う role を定義順 (container → CodeBuild →
23
- AWS Backup) で返す。AWS への問い合わせはしない。"""
23
+ AWS Backup) で返す。AWS への問い合わせはしない。
24
+
25
+ external_roles では role は種別単位なので、container ごとの Lambda / scheduler
26
+ の定義を同名で 1 つにまとめる (権限は和集合)。"""
24
27
  specs: list[iam_roles.RoleSpec] = []
25
28
  for name in sorted(context.container):
26
29
  stack = ContainerStack(
@@ -36,11 +39,12 @@ def stage_role_specs(context: Context, *, account_id: str) -> list[iam_roles.Rol
36
39
  backup = _backup_role(context)
37
40
  if backup:
38
41
  specs.append(backup)
39
- return specs
42
+ return iam_roles.merge_role_specs(specs)
40
43
 
41
44
 
42
45
  def verify_stage_roles(context: Context) -> None:
43
- """external_roles の role がすべて揃っているかを deploy の変更前に検査する。"""
46
+ """external_roles の role がすべて存在し pocket の service を信頼しているかを
47
+ deploy の変更前に検査する (policy の中身は見ない)。"""
44
48
  if not context.external_roles or not context.general:
45
49
  return
46
50
  region = context.general.region
@@ -49,7 +53,7 @@ def verify_stage_roles(context: Context) -> None:
49
53
  ]
50
54
  iam = boto3.client("iam", region_name=region)
51
55
  for spec in stage_role_specs(context, account_id=account_id):
52
- iam_roles.verify_role(iam, spec, region=region)
56
+ iam_roles.verify_role(iam, spec)
53
57
 
54
58
 
55
59
  def _codebuild_builder(context: Context) -> CodeBuildBuilder | None:
@@ -67,6 +71,7 @@ def _codebuild_builder(context: Context) -> CodeBuildBuilder | None:
67
71
  compute_type=first.build.compute_type,
68
72
  permissions_boundary=first.permissions_boundary,
69
73
  external_roles=context.external_roles,
74
+ external_role_prefix=context.external_role_prefix,
70
75
  )
71
76
 
72
77
 
@@ -65,6 +65,7 @@ class Container:
65
65
  state_bucket=self._state_bucket,
66
66
  permissions_boundary=self.context.permissions_boundary,
67
67
  external_roles=self.context.external_roles,
68
+ external_role_prefix=self.context.external_role_prefix,
68
69
  )
69
70
 
70
71
  @property
@@ -1,12 +1,12 @@
1
1
  [project]
2
2
  name = "magic-pocket-cli"
3
- version = "0.42.0"
3
+ version = "0.44.0"
4
4
  description = "CLI and deploy tools for magic-pocket."
5
5
  requires-python = ">=3.10"
6
6
  dependencies = [
7
7
  # lib は同 minor に束縛する。0.x では minor が breaking の単位のため、
8
8
  # 上限なしだと cli を pin した消費者にも lib の破壊的変更が届いてしまう
9
- "magic-pocket>=0.42.0,<0.43",
9
+ "magic-pocket>=0.44.0,<0.45",
10
10
  "click>=8.1.7",
11
11
  "jinja2>=3.1.3",
12
12
  "python-on-whales>=0.68.0",