Default state locking to S3 lockfile#7
Merged
Merged
Conversation
Terraform 1.10+ supports native S3-based state locking via the use_lockfile=true backend option, which writes a .tflock object alongside the state file and removes the need for a per-environment DynamoDB table. The pinned Terraform version (1.14.6) supports this everywhere tf runs. The wrapper now defaults to S3 locking. Set TF_STATE_LOCK=dynamodb to opt back into DynamoDB-based locking; any other value fails fast at init time. Operational note for consumers: the OIDC role used by base.yml needs s3:DeleteObject on the state bucket (ideally scoped to *.tflock) so that lock release can remove the lockfile object. Existing DynamoDB lock tables can stay in place and be cleaned up later. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
AlexKantor87
approved these changes
May 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Terraform 1.10+ supports native S3-based state locking via the use_lockfile=true backend option, which writes a .tflock object alongside the state file and removes the need for a per-environment DynamoDB table. The pinned Terraform version (1.14.6) supports this everywhere tf runs.
The wrapper now defaults to S3 locking. Set TF_STATE_LOCK=dynamodb to opt back into DynamoDB-based locking; any other value fails fast at init time.
Operational note for consumers: the OIDC role used by base.yml needs s3:DeleteObject on the state bucket (ideally scoped to *.tflock) so that lock release can remove the lockfile object. Existing DynamoDB lock tables can stay in place and be cleaned up later.