magic-pocket-cli 0.45.0__tar.gz → 0.46.1__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.45.0 → magic_pocket_cli-0.46.1}/PKG-INFO +2 -2
  2. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/cloudfront_cli.py +65 -0
  3. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/deploy_cli.py +6 -3
  4. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/cloudfront.py +64 -27
  5. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/dsql.py +37 -4
  6. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pyproject.toml +2 -2
  7. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/.gitignore +0 -0
  8. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/__init__.py +0 -0
  9. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/__init__.py +0 -0
  10. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/aws_auth.py +0 -0
  11. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/backup_cli.py +0 -0
  12. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/build_cli.py +0 -0
  13. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/cleanup_deprecated_cli.py +0 -0
  14. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/cloudfront_keys_cli.py +0 -0
  15. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/cloudfront_waf_cli.py +0 -0
  16. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/container_cli.py +0 -0
  17. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/destroy_cli.py +0 -0
  18. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/dsql_cli.py +0 -0
  19. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/image_cli.py +0 -0
  20. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/inbound_cli.py +0 -0
  21. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/interaction.py +0 -0
  22. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/main_cli.py +0 -0
  23. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/migrate_cli.py +0 -0
  24. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/neon_cli.py +0 -0
  25. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/permissions_cli.py +0 -0
  26. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/rds_cli.py +0 -0
  27. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/removed_flags.py +0 -0
  28. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/resource_helper.py +0 -0
  29. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/runtime_config_cli.py +0 -0
  30. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/s3_cli.py +0 -0
  31. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/status_cli.py +0 -0
  32. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/store_url_helper.py +0 -0
  33. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/tidb_cli.py +0 -0
  34. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/upstash_cli.py +0 -0
  35. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/url_helper.py +0 -0
  36. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/vpc_cli.py +0 -0
  37. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/cli/waf_cli.py +0 -0
  38. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/django_cli.py +0 -0
  39. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/mediator.py +0 -0
  40. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/migrations.py +0 -0
  41. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/__init__.py +0 -0
  42. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/__init__.py +0 -0
  43. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/backup_common.py +0 -0
  44. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/backup_legacy.py +0 -0
  45. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/builders/__init__.py +0 -0
  46. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/builders/codebuild.py +0 -0
  47. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/builders/context_check.py +0 -0
  48. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/builders/depot.py +0 -0
  49. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/builders/docker.py +0 -0
  50. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/builders/dockerignore.py +0 -0
  51. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/cloudformation.py +0 -0
  52. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/ecr.py +0 -0
  53. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/efs.py +0 -0
  54. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/iam_roles.py +0 -0
  55. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/lambdahandler.py +0 -0
  56. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/poll.py +0 -0
  57. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/s3_utils.py +0 -0
  58. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/stack_backed.py +0 -0
  59. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/stage_roles.py +0 -0
  60. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/aws/state.py +0 -0
  61. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/backup.py +0 -0
  62. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/cloudfront_acm.py +0 -0
  63. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/cloudfront_keys.py +0 -0
  64. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/cloudfront_waf.py +0 -0
  65. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/container.py +0 -0
  66. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/inbound.py +0 -0
  67. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/inbound_domain.py +0 -0
  68. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/inbound_template.py +0 -0
  69. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/neon.py +0 -0
  70. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/rds.py +0 -0
  71. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/s3.py +0 -0
  72. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/sqs_alert.py +0 -0
  73. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/tidb.py +0 -0
  74. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/upstash.py +0 -0
  75. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/resources/vpc.py +0 -0
  76. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cf_function_api_host.js +0 -0
  77. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cf_function_basic_auth_prelude.js +0 -0
  78. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cf_function_cache_control.js +0 -0
  79. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cf_function_deploy_hash_strip.js +0 -0
  80. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cf_function_host_redirect_prelude.js +0 -0
  81. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cf_function_spa_auth.js +0 -0
  82. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cf_function_spa_fallback.js +0 -0
  83. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cloudfront.yaml +0 -0
  84. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cloudfront_acm.yaml +0 -0
  85. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cloudfront_keys.yaml +0 -0
  86. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/cloudfront_waf.yaml +0 -0
  87. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/container.yaml +0 -0
  88. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/cloudformation/vpc.yaml +0 -0
  89. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/init/django-dotenv.env +0 -0
  90. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/init/django-settings.py +0 -0
  91. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/pocket_cli/templates/init/pocket.Dockerfile +0 -0
  92. {magic_pocket_cli-0.45.0 → magic_pocket_cli-0.46.1}/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.45.0
3
+ Version: 0.46.1
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.46,>=0.45.0
10
+ Requires-Dist: magic-pocket<0.47,>=0.46.1
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
@@ -115,6 +115,71 @@ def upload(stage, name, skip_build):
115
115
  echo.success("アップロード完了")
116
116
 
117
117
 
118
+ @cloudfront.command()
119
+ @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
120
+ @click.option("--name", default=None)
121
+ @click.option(
122
+ "--route",
123
+ "path_pattern",
124
+ default=None,
125
+ help="対象 route の path_pattern (省略時は build / upload_dir を持つ全 route)",
126
+ )
127
+ @click.option("--dry-run", is_flag=True, default=False, help="削除せず一覧だけ表示")
128
+ @click.option(
129
+ "--yes", "-y", is_flag=True, default=False, help="確認プロンプトをスキップ"
130
+ )
131
+ def prune(stage, name, path_pattern, dry_run, yes):
132
+ """ローカルの成果物に無い S3 key (旧版) を削除する。
133
+
134
+ delete_stale = false (content_hash の既定) で残した旧版の掃除用。ビルドは
135
+ 実行しないので、upload_dir を最新のビルドにしてから実行する。
136
+ """
137
+ targets = _collect_stale_keys(stage, name, path_pattern)
138
+ total = sum(len(keys) for _, keys in targets)
139
+ if not total:
140
+ echo.success("削除対象の旧版はありません")
141
+ return
142
+ if dry_run:
143
+ echo.info("--dry-run のため削除しません (%d 件)" % total)
144
+ return
145
+ if not yes:
146
+ click.confirm("上記 %d 件を削除しますか?" % total, abort=True)
147
+ for cf, keys in targets:
148
+ cf.delete_objects(keys)
149
+ echo.success("%d 件を削除しました" % total)
150
+
151
+
152
+ def _collect_stale_keys(
153
+ stage, name, path_pattern
154
+ ) -> list[tuple[CloudFront, list[str]]]:
155
+ """route ごとの旧版 key を表示しつつ集める。
156
+
157
+ --route が何にも当たらなければエラー。
158
+ """
159
+ targets: list[tuple[CloudFront, list[str]]] = []
160
+ matched = False
161
+ for cf in get_cloudfront_resources(stage, name):
162
+ for route in cf.context.uploadable_routes:
163
+ if path_pattern is not None and route.path_pattern != path_pattern:
164
+ continue
165
+ matched = True
166
+ keys = cf.stale_keys(route)
167
+ echo.info(
168
+ "[%s] %s: 旧版 %d 件"
169
+ % (cf.context.name, route.path_pattern or "/*", len(keys))
170
+ )
171
+ for key in keys:
172
+ echo.log(" s3://%s/%s" % (cf.context.bucket_name, key))
173
+ if keys:
174
+ targets.append((cf, keys))
175
+ if path_pattern is not None and not matched:
176
+ raise click.ClickException(
177
+ "route '%s' はアップロード対象 (build / upload_dir を持つ route)"
178
+ " にありません" % path_pattern
179
+ )
180
+ return targets
181
+
182
+
118
183
  @cloudfront.command()
119
184
  @click.option("--stage", envvar="POCKET_DEPLOY_STAGE", prompt=True)
120
185
  @click.option("--name", default=None)
@@ -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(
@@ -319,21 +319,17 @@ class CloudFront:
319
319
 
320
320
  内容が一致するオブジェクトは skip する (差分アップロード)。数千ファイル
321
321
  規模の配信アセットを upload_dir に置いても deploy 時間が伸びない。
322
+
323
+ 今回の成果物に無い key は route.delete_stale のときだけ消す (content_hash
324
+ は既定で残す。RouteContext.delete_stale のコメント参照。残した旧版は
325
+ `pocket resource cloudfront prune` で消せる)。
322
326
  """
323
- s3_prefix = (route.origin_path + route.path_pattern.rstrip("/*")).lstrip("/")
324
- if not route.upload_dir:
325
- raise RuntimeError("route.upload_dir is not set")
326
- local_dir = Path(route.upload_dir)
327
+ s3_prefix = self._s3_prefix(route)
327
328
  existing = self._list_objects(s3_prefix)
328
- uploaded_keys: set[str] = set()
329
+ local_files = self._local_files(route, s3_prefix)
329
330
  uploaded = 0
330
331
  skipped = 0
331
- for file in local_dir.rglob("*"):
332
- if file.is_dir():
333
- continue
334
- relative = file.relative_to(local_dir)
335
- s3_key = s3_prefix + "/" + str(relative)
336
- uploaded_keys.add(s3_key)
332
+ for s3_key, file in local_files.items():
337
333
  if _is_unchanged(file, existing.get(s3_key)):
338
334
  skipped += 1
339
335
  continue
@@ -341,7 +337,15 @@ class CloudFront:
341
337
  "ContentType": mimetypes.guess_type(str(file))[0]
342
338
  or "application/octet-stream"
343
339
  }
344
- if route.is_spa:
340
+ if route.is_content_hash:
341
+ # viewer-response Function が viewer 向けに付ける値と同じ
342
+ # (cf_function_cache_control.js)。オブジェクト側にも付けないと
343
+ # behavior の cache policy (DefaultTTL 1 日) で edge が 1 日で
344
+ # 切れ、内容 hash 付きの名前なのに origin へ取りに戻る (KN2009)
345
+ extra_args["CacheControl"] = (
346
+ "public, max-age=%d, immutable" % route.versioned_max_age
347
+ )
348
+ elif route.is_spa:
345
349
  if file.suffix in (".html", ".htm"):
346
350
  extra_args["CacheControl"] = "no-cache, no-store"
347
351
  else:
@@ -355,13 +359,51 @@ class CloudFront:
355
359
  )
356
360
  uploaded += 1
357
361
  echo.log("アップロード: s3://%s/%s" % (self.context.bucket_name, s3_key))
358
- deleted = self._delete_stale_objects(existing, uploaded_keys)
359
- echo.info(
360
- "%d ファイルをアップロードしました (skip %d / 削除 %d、prefix: %s)"
361
- % (uploaded, skipped, deleted, s3_prefix)
362
- )
362
+ stale = [key for key in existing if key not in local_files]
363
+ if route.delete_stale:
364
+ deleted = self.delete_objects(stale)
365
+ echo.info(
366
+ "%d ファイルをアップロードしました (skip %d / 削除 %d、prefix: %s)"
367
+ % (uploaded, skipped, deleted, s3_prefix)
368
+ )
369
+ else:
370
+ deleted = 0
371
+ echo.info(
372
+ "%d ファイルをアップロードしました"
373
+ " (skip %d / 旧版を保持 %d、prefix: %s)"
374
+ % (uploaded, skipped, len(stale), s3_prefix)
375
+ )
363
376
  return bool(uploaded or deleted)
364
377
 
378
+ @staticmethod
379
+ def _s3_prefix(route: RouteContext) -> str:
380
+ return (route.origin_path + route.path_pattern.rstrip("/*")).lstrip("/")
381
+
382
+ @staticmethod
383
+ def _local_files(route: RouteContext, s3_prefix: str) -> dict[str, Path]:
384
+ """route の upload_dir 配下のファイルを {S3 key: ローカル path} で返す。"""
385
+ if not route.upload_dir:
386
+ raise RuntimeError("route.upload_dir is not set")
387
+ local_dir = Path(route.upload_dir)
388
+ files: dict[str, Path] = {}
389
+ for file in local_dir.rglob("*"):
390
+ if file.is_dir():
391
+ continue
392
+ files[s3_prefix + "/" + str(file.relative_to(local_dir))] = file
393
+ return files
394
+
395
+ def stale_keys(self, route: RouteContext) -> list[str]:
396
+ """route の S3 prefix 配下で、ローカルの upload_dir に無い key (旧版) を返す。
397
+
398
+ ビルドは実行しないので、upload_dir が最新の成果物であることは呼び手の責任
399
+ (`upload --skip-build` と同じ前提)。
400
+ """
401
+ s3_prefix = self._s3_prefix(route)
402
+ local_files = self._local_files(route, s3_prefix)
403
+ return sorted(
404
+ key for key in self._list_objects(s3_prefix) if key not in local_files
405
+ )
406
+
365
407
  def _list_objects(self, prefix: str) -> dict[str, str]:
366
408
  """prefix 配下の {key: ETag} を返す (ETag は前後の `"` を除去済み)。"""
367
409
  objects: dict[str, str] = {}
@@ -373,16 +415,11 @@ class CloudFront:
373
415
  objects[obj["Key"]] = obj["ETag"].strip('"')
374
416
  return objects
375
417
 
376
- def _delete_stale_objects(
377
- self, existing: dict[str, str], uploaded_keys: set[str]
378
- ) -> int:
379
- deleted = 0
380
- for key in existing:
381
- if key not in uploaded_keys:
382
- self.s3_client.delete_object(Bucket=self.context.bucket_name, Key=key)
383
- deleted += 1
384
- echo.log("削除: s3://%s/%s" % (self.context.bucket_name, key))
385
- return deleted
418
+ def delete_objects(self, keys: list[str]) -> int:
419
+ for key in keys:
420
+ self.s3_client.delete_object(Bucket=self.context.bucket_name, Key=key)
421
+ echo.log("削除: s3://%s/%s" % (self.context.bucket_name, key))
422
+ return len(keys)
386
423
 
387
424
  def _invalidate(self, routes: list[RouteContext]):
388
425
  """変更があった route の path_pattern だけを invalidate する。
@@ -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.45.0"
3
+ version = "0.46.1"
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.45.0,<0.46",
9
+ "magic-pocket>=0.46.1,<0.47",
10
10
  "click>=8.1.7",
11
11
  "jinja2>=3.1.3",
12
12
  "python-on-whales>=0.68.0",