Skip to content

Include AWS account ID in drift plan files #21

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
gsavage merged 1 commit into from
Jun 24, 2026
+5 −3
Merged

Include AWS account ID in drift plan files #21

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
3 changes: 2 additions & 1 deletion .github/workflows/apply.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,11 @@ jobs:
ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
HASH=$(printf '%s-%s' "$ACCOUNT_ID" "${{ inputs.aws_region }}" | sha1sum | cut -d' ' -f1)
echo "S3_BUCKET=terraform-state-${HASH}" >> "$GITHUB_ENV"
echo "AWS_ACCOUNT_ID=${ACCOUNT_ID}" >> "$GITHUB_ENV"

- name: Create drift plan
run: |
jq -n --arg sha "${{ github.event.pull_request.head.sha || github.sha }}" '{sha: $sha, drift: false}' > /tmp/drift.plan.json
jq -n --arg sha "${{ github.event.pull_request.head.sha || github.sha }}" --arg account "$AWS_ACCOUNT_ID" '{sha: $sha, drift: false, aws_account_id: $account}' > /tmp/drift.plan.json

- name: Upload drift plan to S3
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/detect-drift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,13 @@ jobs:
ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
HASH=$(printf '%s-%s' "$ACCOUNT_ID" "${{ inputs.aws_region }}" | sha1sum | cut -d' ' -f1)
echo "S3_BUCKET=terraform-state-${HASH}" >> "$GITHUB_ENV"
echo "AWS_ACCOUNT_ID=${ACCOUNT_ID}" >> "$GITHUB_ENV"

- name: Build drift plan
run: |
TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ)
jq -n --arg sha "${{ needs.fetch-baseline.outputs.sha }}" --arg drift "$TIMESTAMP" \
'{sha: $sha, drift: $drift}' > /tmp/drift.plan.json
jq -n --arg sha "${{ needs.fetch-baseline.outputs.sha }}" --arg drift "$TIMESTAMP" --arg account "$AWS_ACCOUNT_ID" \
'{sha: $sha, drift: $drift, aws_account_id: $account}' > /tmp/drift.plan.json
echo "DRIFT_TIMESTAMP=${TIMESTAMP}" >> "$GITHUB_ENV"

- name: Upload drift plan to S3
Expand Down