magic-pocket-cli 0.43.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.
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/PKG-INFO +2 -2
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/destroy_cli.py +1 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/permissions_cli.py +16 -1
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/__init__.py +2 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/codebuild.py +8 -1
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/iam_roles.py +53 -3
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/stage_roles.py +6 -2
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/container.py +1 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pyproject.toml +2 -2
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/.gitignore +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/__init__.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/__init__.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/aws_auth.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/backup_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/build_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cleanup_deprecated_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cloudfront_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cloudfront_keys_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cloudfront_waf_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/container_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/deploy_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/dsql_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/image_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/inbound_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/interaction.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/main_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/migrate_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/neon_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/rds_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/removed_flags.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/resource_helper.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/runtime_config_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/s3_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/status_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/store_url_helper.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/tidb_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/upstash_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/url_helper.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/vpc_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/waf_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/django_cli.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/mediator.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/migrations.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/__init__.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/__init__.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/backup_common.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/backup_legacy.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/context_check.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/depot.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/docker.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/dockerignore.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/cloudformation.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/ecr.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/efs.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/lambdahandler.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/poll.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/s3_utils.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/stack_backed.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/state.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/backup.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/cloudfront.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/cloudfront_acm.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/cloudfront_keys.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/cloudfront_waf.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/dsql.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/inbound.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/inbound_domain.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/inbound_template.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/neon.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/rds.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/s3.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/sqs_alert.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/tidb.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/upstash.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/vpc.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_api_host.js +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_basic_auth_prelude.js +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_cache_control.js +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_deploy_hash_strip.js +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_host_redirect_prelude.js +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_spa_auth.js +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cf_function_spa_fallback.js +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cloudfront.yaml +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cloudfront_acm.yaml +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cloudfront_keys.yaml +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/cloudfront_waf.yaml +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/container.yaml +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/vpc.yaml +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/django-dotenv.env +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/django-settings.py +0 -0
- {magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/pocket.Dockerfile +0 -0
- {magic_pocket_cli-0.43.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.
|
|
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.
|
|
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))
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/__init__.py
RENAMED
|
@@ -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":
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/codebuild.py
RENAMED
|
@@ -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
|
-
|
|
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 が削除する (改名互換。
|
|
@@ -172,10 +172,11 @@ def lambda_role(
|
|
|
172
172
|
policies[f"{prefix}{policy_name}"] = doc
|
|
173
173
|
|
|
174
174
|
if ctx.external_roles:
|
|
175
|
-
#
|
|
176
|
-
# CFn
|
|
175
|
+
# 種別単位の role (全 container 共用。stage_role_specs が merge_role_specs で
|
|
176
|
+
# container 分をまとめる)。CFn が持つ既存 role (下の名前) とは名前が違うので、
|
|
177
|
+
# 切替時は CFn が旧 role を消す間も、事前に作った新 role で Lambda が動き続ける
|
|
177
178
|
return RoleSpec(
|
|
178
|
-
name=f"{
|
|
179
|
+
name=f"{ctx.external_role_prefix}lambda-role",
|
|
179
180
|
service="lambda.amazonaws.com",
|
|
180
181
|
managed_policy_arns=_lambda_managed_policies(ctx),
|
|
181
182
|
inline_policies=policies,
|
|
@@ -509,6 +510,55 @@ def delete_role(
|
|
|
509
510
|
# --- external_roles ---
|
|
510
511
|
|
|
511
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
|
+
|
|
512
562
|
class RoleMismatchError(Exception):
|
|
513
563
|
"""external_roles の role が無い、または pocket の service を信頼していない。"""
|
|
514
564
|
|
|
@@ -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,7 +39,7 @@ 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:
|
|
@@ -68,6 +71,7 @@ def _codebuild_builder(context: Context) -> CodeBuildBuilder | None:
|
|
|
68
71
|
compute_type=first.build.compute_type,
|
|
69
72
|
permissions_boundary=first.permissions_boundary,
|
|
70
73
|
external_roles=context.external_roles,
|
|
74
|
+
external_role_prefix=context.external_role_prefix,
|
|
71
75
|
)
|
|
72
76
|
|
|
73
77
|
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "magic-pocket-cli"
|
|
3
|
-
version = "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.
|
|
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",
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/cli/cleanup_deprecated_cli.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/backup_common.py
RENAMED
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/backup_legacy.py
RENAMED
|
File without changes
|
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/depot.py
RENAMED
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/builders/docker.py
RENAMED
|
File without changes
|
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/cloudformation.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/lambdahandler.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/aws/stack_backed.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/resources/inbound_template.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/cloudformation/vpc.yaml
RENAMED
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/django-dotenv.env
RENAMED
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/django-settings.py
RENAMED
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/pocket.Dockerfile
RENAMED
|
File without changes
|
{magic_pocket_cli-0.43.0 → magic_pocket_cli-0.44.0}/pocket_cli/templates/init/pocket_simple.toml
RENAMED
|
File without changes
|