Skip to content

align s3 preview root folder naming with postgres #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stplasim merged 1 commit into from
Apr 21, 2026
Merged

align s3 preview root folder naming with postgres #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions setup-s3-preview/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,27 @@ runs:
JOB_NAME: "prepare-s3-preview-${{ inputs.preview-number }}"
CONFIGMAP_NAME: "${{ inputs.configmap-name }}"
SECRET_NAME: "${{ inputs.secret-name }}"
PREVIEW_ROOT_FOLDER: "preview_${{ inputs.preview-number }}"
S3_BUCKET_KEY: "${{ inputs.s3-bucket-key }}"
S3_ENDPOINT_KEY: "${{ inputs.s3-endpoint-key }}"
S3_REGION_KEY: "${{ inputs.s3-region-key }}"
S3_ROOT_FOLDER_KEY: "${{ inputs.s3-root-folder-key }}"
S3_FORCE_PATH_STYLE_ACCESS_KEY: "${{ inputs.s3-force-path-style-access-key }}"
S3_ACCESS_KEY_KEY: "${{ inputs.s3-access-key-key }}"
S3_SECRET_KEY_KEY: "${{ inputs.s3-secret-key-key }}"
PREVIEW_NUMBER: "${{ inputs.preview-number }}"
run: |
envsubst '
$JOB_NAME
$CONFIGMAP_NAME
$SECRET_NAME
$PREVIEW_ROOT_FOLDER
$S3_BUCKET_KEY
$S3_ENDPOINT_KEY
$S3_REGION_KEY
$S3_ROOT_FOLDER_KEY
$S3_FORCE_PATH_STYLE_ACCESS_KEY
$S3_ACCESS_KEY_KEY
$S3_SECRET_KEY_KEY
$PREVIEW_NUMBER
' < ${{ github.action_path }}/job-template.yml > job-setup-s3.yml

echo "Prepared job manifest: job-setup-s3.yml"
Expand Down
8 changes: 4 additions & 4 deletions setup-s3-preview/job-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ spec:
S3_SOURCE_PREFIX="s3://$S3_BUCKET/"
fi

S3_PREVIEW_PREFIX="s3://$S3_BUCKET/preview-${PREVIEW_NUMBER}/"
S3_PREVIEW_PREFIX="s3://$S3_BUCKET/${PREVIEW_ROOT_FOLDER}/"

echo "Checking if $S3_PREVIEW_PREFIX already exists..."
if [ "$(aws s3 $S3_ARGS ls "$S3_PREVIEW_PREFIX" | wc -l)" -gt 0 ]; then
echo "$S3_PREVIEW_PREFIX already exists. Skipping setup."
Expand Down Expand Up @@ -90,5 +90,5 @@ spec:
secretKeyRef:
name: ${SECRET_NAME}
key: ${S3_SECRET_KEY_KEY}
- name: PREVIEW_NUMBER
value: "${PREVIEW_NUMBER}"
- name: PREVIEW_ROOT_FOLDER
value: "${PREVIEW_ROOT_FOLDER}"
4 changes: 2 additions & 2 deletions teardown-s3-preview/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,25 @@ runs:
JOB_NAME: "teardown-s3-preview-${{ inputs.preview-number }}"
CONFIGMAP_NAME: "${{ inputs.configmap-name }}"
SECRET_NAME: "${{ inputs.secret-name }}"
PREVIEW_ROOT_FOLDER: "preview_${{ inputs.preview-number }}"
S3_BUCKET_KEY: "${{ inputs.s3-bucket-key }}"
S3_ENDPOINT_KEY: "${{ inputs.s3-endpoint-key }}"
S3_REGION_KEY: "${{ inputs.s3-region-key }}"
S3_FORCE_PATH_STYLE_ACCESS_KEY: "${{ inputs.s3-force-path-style-access-key }}"
S3_ACCESS_KEY_KEY: "${{ inputs.s3-access-key-key }}"
S3_SECRET_KEY_KEY: "${{ inputs.s3-secret-key-key }}"
PREVIEW_NUMBER: "${{ inputs.preview-number }}"
run: |
envsubst '
$JOB_NAME
$CONFIGMAP_NAME
$SECRET_NAME
$PREVIEW_ROOT_FOLDER
$S3_BUCKET_KEY
$S3_ENDPOINT_KEY
$S3_REGION_KEY
$S3_FORCE_PATH_STYLE_ACCESS_KEY
$S3_ACCESS_KEY_KEY
$S3_SECRET_KEY_KEY
$PREVIEW_NUMBER
' < ${{ github.action_path }}/job-template.yml > job-teardown-s3.yml

echo "Prepared job manifest: job-teardown-s3.yml"
Expand Down
6 changes: 3 additions & 3 deletions teardown-s3-preview/job-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
S3_ARGS="--endpoint-url $S3_ENDPOINT"
fi

S3_PREVIEW_PREFIX="s3://$S3_BUCKET/preview-${PREVIEW_NUMBER}/"
S3_PREVIEW_PREFIX="s3://$S3_BUCKET/${PREVIEW_ROOT_FOLDER}/"

echo "Checking if $S3_PREVIEW_PREFIX exists..."
if [ "$(aws s3 $S3_ARGS ls "$S3_PREVIEW_PREFIX" | wc -l)" -eq 0 ]; then
Expand Down Expand Up @@ -77,5 +77,5 @@ spec:
secretKeyRef:
name: ${SECRET_NAME}
key: ${S3_SECRET_KEY_KEY}
- name: PREVIEW_NUMBER
value: "${PREVIEW_NUMBER}"
- name: PREVIEW_ROOT_FOLDER
value: "${PREVIEW_ROOT_FOLDER}"