From 912540b892bd8d3a38e4361e8b33ac7cce1cbbd6 Mon Sep 17 00:00:00 2001 From: yangci Date: Fri, 11 Apr 2025 12:42:42 -0400 Subject: [PATCH 1/2] feat(snaplet): use `SNAPLET_TARGET_DB_NAME` --- lib/snaplet/Taskfile.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/snaplet/Taskfile.yaml b/lib/snaplet/Taskfile.yaml index b73d9bf..ca1bbc4 100644 --- a/lib/snaplet/Taskfile.yaml +++ b/lib/snaplet/Taskfile.yaml @@ -86,8 +86,9 @@ tasks: vars: - SNAPLET_BUCKET - SNAPSHOT_ENV + - SNAPLET_TARGET_DB_NAME cmds: - - aws s3 cp --sse=AES256 --recursive {{.SNAPSHOT_PATH}} {{.SNAPLET_BUCKET}}/{{.SNAPSHOT_ENV}}/{{.SNAPSHOT_NAME}} + - aws s3 cp --sse=AES256 --recursive {{.SNAPSHOT_PATH}} {{.SNAPLET_BUCKET}}/{{.SNAPLET_TARGET_DB_NAME}}/{{.SNAPSHOT_ENV}}/{{.SNAPSHOT_NAME}} - | if [ "{{.UPLOAD_AS_LATEST}}" -eq "true" ]; then # We first remove everything so there are no artifacts leftover from a previous upload that we're not overwriting. @@ -115,8 +116,9 @@ tasks: vars: - SNAPLET_BUCKET - SNAPSHOT_ENV + - SNAPLET_TARGET_DB_NAME cmds: - - aws s3 cp --quiet --sse=AES256 --recursive {{.SNAPLET_BUCKET}}/{{.SNAPSHOT_ENV}}/{{.RESTORE_SNAPSHOT}} {{.SNAPSHOT_PATH}} + - aws s3 cp --quiet --sse=AES256 --recursive {{.SNAPLET_BUCKET}}/{{SNAPLET_TARGET_DB_NAME}}/{{.SNAPSHOT_ENV}}/{{.RESTORE_SNAPSHOT}} {{.SNAPSHOT_PATH}} - printf "\n\n⬇ Snapshot downloaded to {{.SNAPSHOT_PATH}}\n\n" restore: From ab9723fd73ae22467fa87c7f2e29e5f8438d092c Mon Sep 17 00:00:00 2001 From: oycyc Date: Fri, 11 Apr 2025 14:03:39 -0400 Subject: [PATCH 2/2] upload as latest as well --- lib/snaplet/Taskfile.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/snaplet/Taskfile.yaml b/lib/snaplet/Taskfile.yaml index ca1bbc4..13e14de 100644 --- a/lib/snaplet/Taskfile.yaml +++ b/lib/snaplet/Taskfile.yaml @@ -92,8 +92,8 @@ tasks: - | if [ "{{.UPLOAD_AS_LATEST}}" -eq "true" ]; then # We first remove everything so there are no artifacts leftover from a previous upload that we're not overwriting. - aws s3 rm --recursive {{.SNAPLET_BUCKET}}/{{.SNAPSHOT_ENV}}/latest - aws s3 cp --sse=AES256 --recursive {{.SNAPSHOT_PATH}} {{.SNAPLET_BUCKET}}/{{.SNAPSHOT_ENV}}/latest + aws s3 rm --recursive {{.SNAPLET_BUCKET}}/{{.SNAPLET_TARGET_DB_NAME}}/{{.SNAPSHOT_ENV}}/latest + aws s3 cp --sse=AES256 --recursive {{.SNAPSHOT_PATH}} {{.SNAPLET_BUCKET}}/{{.SNAPLET_TARGET_DB_NAME}}/{{.SNAPSHOT_ENV}}/latest fi download: