magic-pocket-cli 0.46.0__tar.gz → 0.46.2__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.46.0 → magic_pocket_cli-0.46.2}/PKG-INFO +2 -2
  2. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/deploy_cli.py +6 -3
  3. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/cloudformation.py +6 -1
  4. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/dsql.py +37 -4
  5. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pyproject.toml +2 -2
  6. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/.gitignore +0 -0
  7. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/__init__.py +0 -0
  8. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/__init__.py +0 -0
  9. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/aws_auth.py +0 -0
  10. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/backup_cli.py +0 -0
  11. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/build_cli.py +0 -0
  12. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/cleanup_deprecated_cli.py +0 -0
  13. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/cloudfront_cli.py +0 -0
  14. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/cloudfront_keys_cli.py +0 -0
  15. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/cloudfront_waf_cli.py +0 -0
  16. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/container_cli.py +0 -0
  17. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/destroy_cli.py +0 -0
  18. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/dsql_cli.py +0 -0
  19. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/image_cli.py +0 -0
  20. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/inbound_cli.py +0 -0
  21. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/interaction.py +0 -0
  22. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/main_cli.py +0 -0
  23. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/migrate_cli.py +0 -0
  24. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/neon_cli.py +0 -0
  25. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/permissions_cli.py +0 -0
  26. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/rds_cli.py +0 -0
  27. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/removed_flags.py +0 -0
  28. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/resource_helper.py +0 -0
  29. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/runtime_config_cli.py +0 -0
  30. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/s3_cli.py +0 -0
  31. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/status_cli.py +0 -0
  32. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/store_url_helper.py +0 -0
  33. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/tidb_cli.py +0 -0
  34. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/upstash_cli.py +0 -0
  35. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/url_helper.py +0 -0
  36. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/vpc_cli.py +0 -0
  37. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/cli/waf_cli.py +0 -0
  38. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/django_cli.py +0 -0
  39. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/mediator.py +0 -0
  40. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/migrations.py +0 -0
  41. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/__init__.py +0 -0
  42. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/__init__.py +0 -0
  43. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/backup_common.py +0 -0
  44. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/backup_legacy.py +0 -0
  45. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/builders/__init__.py +0 -0
  46. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/builders/codebuild.py +0 -0
  47. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/builders/context_check.py +0 -0
  48. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/builders/depot.py +0 -0
  49. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/builders/docker.py +0 -0
  50. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/builders/dockerignore.py +0 -0
  51. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/ecr.py +0 -0
  52. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/efs.py +0 -0
  53. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/iam_roles.py +0 -0
  54. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/lambdahandler.py +0 -0
  55. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/poll.py +0 -0
  56. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/s3_utils.py +0 -0
  57. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/stack_backed.py +0 -0
  58. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/stage_roles.py +0 -0
  59. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/aws/state.py +0 -0
  60. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/backup.py +0 -0
  61. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/cloudfront.py +0 -0
  62. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/cloudfront_acm.py +0 -0
  63. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/cloudfront_keys.py +0 -0
  64. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/cloudfront_waf.py +0 -0
  65. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/container.py +0 -0
  66. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/inbound.py +0 -0
  67. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/inbound_domain.py +0 -0
  68. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/inbound_template.py +0 -0
  69. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/neon.py +0 -0
  70. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/rds.py +0 -0
  71. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/s3.py +0 -0
  72. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/sqs_alert.py +0 -0
  73. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/tidb.py +0 -0
  74. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/upstash.py +0 -0
  75. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/resources/vpc.py +0 -0
  76. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cf_function_api_host.js +0 -0
  77. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cf_function_basic_auth_prelude.js +0 -0
  78. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cf_function_cache_control.js +0 -0
  79. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cf_function_deploy_hash_strip.js +0 -0
  80. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cf_function_host_redirect_prelude.js +0 -0
  81. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cf_function_spa_auth.js +0 -0
  82. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cf_function_spa_fallback.js +0 -0
  83. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cloudfront.yaml +0 -0
  84. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cloudfront_acm.yaml +0 -0
  85. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cloudfront_keys.yaml +0 -0
  86. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/cloudfront_waf.yaml +0 -0
  87. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/container.yaml +0 -0
  88. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/cloudformation/vpc.yaml +0 -0
  89. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/init/django-dotenv.env +0 -0
  90. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/init/django-settings.py +0 -0
  91. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/pocket_cli/templates/init/pocket.Dockerfile +0 -0
  92. {magic_pocket_cli-0.46.0 → magic_pocket_cli-0.46.2}/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.46.0
3
+ Version: 0.46.2
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.47,>=0.46.0
10
+ Requires-Dist: magic-pocket<0.47,>=0.46.2
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
@@ -199,10 +199,13 @@ def _deploy_resource(resource, mediator: Mediator, state_store: StateStore):
199
199
  resource.update()
200
200
  state_store.record(resource.state_info())
201
201
  elif resource.status == "FAILED":
202
- # 黙ってスキップすると deploy が exit 0 で成功表示になる
202
+ # 黙ってスキップすると deploy が exit 0 で成功表示になる。
203
+ # resource が status_detail を持つなら生の状態名を添える (DSQL 等)
204
+ detail = getattr(resource, "status_detail", None)
203
205
  raise RuntimeError(
204
- "%s が FAILED 状態です。AWS コンソール等で状態を確認して"
205
- "解消してから再実行してください。" % target_name
206
+ "%s が FAILED 状態です%s。AWS コンソール等で状態を確認して"
207
+ "解消してから再実行してください。"
208
+ % (target_name, " (%s)" % detail if detail else "")
206
209
  )
207
210
  elif resource.status == "PROGRESS":
208
211
  raise RuntimeError(
@@ -799,7 +799,12 @@ class ContainerStack(Stack):
799
799
  dsql_context: DsqlContext | None = None,
800
800
  scheduler_context: SchedulerContext | None = None,
801
801
  ):
802
- self._rds_context = rds_context
802
+ # VPC 外 (use_vpc=false) の container は private subnet の RDS に到達できない
803
+ # ので、[rds] を無いものとして扱う。POCKET_RDS_* env を注入すると runtime が
804
+ # DATABASE_URL を RDS 向けに組み立てて上書きし、DSQL 等を使う container が
805
+ # INIT で RDS に繋ぎに行ってタイムアウトする (KN2035)。env に合わせて
806
+ # RDS secret の IAM policy と RDS SG への ingress も出さない
807
+ self._rds_context = rds_context if context.vpc else None
803
808
  self._dsql_context = dsql_context
804
809
  self._scheduler_context = scheduler_context
805
810
  super().__init__(context)
@@ -21,6 +21,23 @@ from pocket_cli.resources.aws.poll import wait_until
21
21
  if TYPE_CHECKING:
22
22
  from pocket.context import DsqlContext
23
23
 
24
+ # DSQL cluster の status (get_cluster の status) と ResourceStatus の対応。
25
+ # IDLE はしばらく接続が無いクラスタが自動で入る正常な状態 (接続すれば ACTIVE に
26
+ # 戻る) なので、ACTIVE と同じく使える状態として扱う。利用の少ない stage では
27
+ # deploy のたびに踏むため、FAILED 扱いにすると deploy が止まる (KN2012)
28
+ CLUSTER_READY_STATES = {"ACTIVE", "IDLE"}
29
+ CLUSTER_PROGRESS_STATES = {
30
+ "CREATING",
31
+ "UPDATING",
32
+ "DELETING",
33
+ "PENDING_SETUP",
34
+ "PENDING_DELETE",
35
+ }
36
+ # 利用者が AWS 側で解消しないと先に進めない状態
37
+ CLUSTER_FAILED_STATES = {"FAILED", "INACTIVE"}
38
+ # 削除済みは list_clusters に一時的に残るが、存在しないものとして扱う (再作成する)
39
+ CLUSTER_GONE_STATES = {"DELETED"}
40
+
24
41
  # AWS Backup の backup job 終端状態。これ以外は進行中として扱う
25
42
  BACKUP_TERMINAL_STATES = {"COMPLETED", "FAILED", "ABORTED", "EXPIRED", "PARTIAL"}
26
43
  # restore job の終端状態
@@ -87,11 +104,27 @@ class Dsql:
87
104
  if self.cluster is None:
88
105
  return "NOEXIST"
89
106
  cluster_status = self.cluster["status"]
90
- if cluster_status in ("CREATING", "UPDATING", "DELETING"):
107
+ if cluster_status in CLUSTER_GONE_STATES:
108
+ return "NOEXIST"
109
+ if cluster_status in CLUSTER_PROGRESS_STATES:
91
110
  return "PROGRESS"
92
- if cluster_status == "ACTIVE":
111
+ if cluster_status in CLUSTER_READY_STATES:
93
112
  return "COMPLETED"
94
- return "FAILED"
113
+ if cluster_status in CLUSTER_FAILED_STATES:
114
+ return "FAILED"
115
+ # 未知の状態を黙って FAILED に丸めると、deploy のエラー文から原因が
116
+ # 分からない。状態名を出して止め、対応表への追加を促す
117
+ raise RuntimeError(
118
+ "DSQL cluster %s が未知の状態 (%s) です。"
119
+ % (self.cluster["identifier"], cluster_status)
120
+ )
121
+
122
+ @property
123
+ def status_detail(self) -> str | None:
124
+ """deploy のエラー文に添える cluster の生の状態。"""
125
+ if self.cluster is None:
126
+ return None
127
+ return "cluster status: %s" % self.cluster["status"]
95
128
 
96
129
  @property
97
130
  def description(self):
@@ -397,7 +430,7 @@ class Dsql:
397
430
  def poll():
398
431
  try:
399
432
  res = self._client.get_cluster(identifier=identifier)
400
- return res["status"] == "ACTIVE"
433
+ return res["status"] in CLUSTER_READY_STATES
401
434
  except ClientError:
402
435
  return False
403
436
 
@@ -1,12 +1,12 @@
1
1
  [project]
2
2
  name = "magic-pocket-cli"
3
- version = "0.46.0"
3
+ version = "0.46.2"
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.46.0,<0.47",
9
+ "magic-pocket>=0.46.2,<0.47",
10
10
  "click>=8.1.7",
11
11
  "jinja2>=3.1.3",
12
12
  "python-on-whales>=0.68.0",