Skip to content

fix(terraform): bind stored plan identity (CTK-835) #19

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
samuelho-dev merged 1 commit into from
Sep 26, 2026
Merged

fix(terraform): bind stored plan identity (CTK-835) #19

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
28 changes: 20 additions & 8 deletions .github/workflows/terraform-apply.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ on:
required: false
type: string
default: ''
plan-storage-sha256:
description: 'SHA-256 from terraform-plan for the object-store archive'
required: false
type: string
default: ''
terraform-version:
description: 'Terraform version (must match the version that produced the plan)'
required: false
Expand Down Expand Up @@ -128,18 +133,22 @@ jobs:
PLAN_ENDPOINT: ${{ inputs.plan-storage-endpoint }}
PLAN_BUCKET: ${{ inputs.plan-storage-bucket }}
PLAN_KEY: ${{ inputs.plan-storage-key }}
PLAN_SHA256: ${{ inputs.plan-storage-sha256 }}
run: |
set -euo pipefail
: "${AWS_ACCESS_KEY_ID:?missing plan storage access key}"
: "${AWS_SECRET_ACCESS_KEY:?missing plan storage secret key}"
: "${PLAN_BUCKET:?missing plan storage bucket}"
: "${PLAN_KEY:?missing plan storage key}"
: "${PLAN_SHA256:?missing plan storage SHA-256}"
archive="$RUNNER_TEMP/terraform-plan.tar.gz"
env -u AWS_SESSION_TOKEN aws --endpoint-url "$PLAN_ENDPOINT" --region garage \
s3 cp "s3://$PLAN_BUCKET/$PLAN_KEY" "$archive" --no-progress
env -u AWS_SESSION_TOKEN aws --endpoint-url "$PLAN_ENDPOINT" --region garage \
s3 cp "s3://$PLAN_BUCKET/$PLAN_KEY.sha256" "$archive.sha256" --no-progress
(cd "$RUNNER_TEMP" && sha256sum --check terraform-plan.tar.gz.sha256)
actual_sha256="$(sha256sum "$archive" | cut -d ' ' -f 1)"
if [ "$actual_sha256" != "$PLAN_SHA256" ]; then
echo "::error::downloaded plan archive SHA-256 does not match plan-storage-sha256"
exit 1
fi
tar -xzf "$archive"

- name: Terraform init
Expand Down Expand Up @@ -172,11 +181,14 @@ jobs:
PLAN_BUCKET: ${{ inputs.plan-storage-bucket }}
PLAN_KEY: ${{ inputs.plan-storage-key }}
run: |
set -euo pipefail
env -u AWS_SESSION_TOKEN aws --endpoint-url "$PLAN_ENDPOINT" --region garage \
s3 rm "s3://$PLAN_BUCKET/$PLAN_KEY" --no-progress
env -u AWS_SESSION_TOKEN aws --endpoint-url "$PLAN_ENDPOINT" --region garage \
s3 rm "s3://$PLAN_BUCKET/$PLAN_KEY.sha256" --no-progress
if ! env -u AWS_SESSION_TOKEN aws --endpoint-url "$PLAN_ENDPOINT" --region garage \
s3 rm "s3://$PLAN_BUCKET/$PLAN_KEY" --no-progress; then
echo "::warning::failed to delete object-store plan archive"
fi
if ! env -u AWS_SESSION_TOKEN aws --endpoint-url "$PLAN_ENDPOINT" --region garage \
s3 rm "s3://$PLAN_BUCKET/$PLAN_KEY.sha256" --no-progress; then
echo "::warning::failed to delete object-store plan archive checksum"
fi

- name: Summary
if: always()
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/terraform-plan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ on:
plan-artifact-name:
description: 'Name of the uploaded plan artifact'
value: ${{ inputs.plan-artifact-name }}
plan-sha256:
description: 'SHA-256 of the archive uploaded to object storage; empty for GitHub artifacts'
value: ${{ jobs.plan.outputs.plan-sha256 }}
destroy-count:
description: 'Number of resources this plan would destroy (including replacements)'
value: ${{ jobs.plan.outputs.destroy-count }}
Expand All @@ -123,6 +126,7 @@ jobs:
CLOUDFLARE_API_TOKEN: ${{ secrets.cloudflare-api-token }}
outputs:
has-changes: ${{ steps.plan.outputs.has-changes }}
plan-sha256: ${{ steps.upload-plan.outputs.plan-sha256 }}
destroy-count: ${{ steps.analyze.outputs.destroy-count }}
has-destroys: ${{ steps.analyze.outputs.has-destroys }}
steps:
Expand Down Expand Up @@ -208,6 +212,7 @@ jobs:
if-no-files-found: error

- name: Upload plan to object storage
id: upload-plan
if: inputs.plan-storage-endpoint != ''
env:
AWS_ACCESS_KEY_ID: ${{ secrets.plan-storage-access-key-id }}
Expand All @@ -223,11 +228,13 @@ jobs:
: "${PLAN_KEY:?missing plan storage key}"
archive="$RUNNER_TEMP/terraform-plan.tar.gz"
tar -czf "$archive" tfplan plan.txt plan.json
(cd "$RUNNER_TEMP" && sha256sum terraform-plan.tar.gz >terraform-plan.tar.gz.sha256)
plan_sha256="$(sha256sum "$archive" | cut -d ' ' -f 1)"
printf '%s terraform-plan.tar.gz\n' "$plan_sha256" > "$archive.sha256"
env -u AWS_SESSION_TOKEN aws --endpoint-url "$PLAN_ENDPOINT" --region garage \
s3 cp "$archive" "s3://$PLAN_BUCKET/$PLAN_KEY" --no-progress
env -u AWS_SESSION_TOKEN aws --endpoint-url "$PLAN_ENDPOINT" --region garage \
s3 cp "$archive.sha256" "s3://$PLAN_BUCKET/$PLAN_KEY.sha256" --no-progress
echo "plan-sha256=$plan_sha256" >> "$GITHUB_OUTPUT"

- name: Set up Infracost
if: inputs.cost-estimation
Expand Down
Loading