Skip to content

[NDR-232] Removing references to DynamoDB for state locking #440

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
chrisbloe merged 2 commits into from
Sep 19, 2025
Merged

[NDR-232] Removing references to DynamoDB for state locking #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24efda0
[NDR-232] Removing references to DynamoDB for state locking
chrisbloe Sep 19, 2025
17f4711
[NDR-232] Removing unused object
chrisbloe Sep 19, 2025
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
1 change: 0 additions & 1 deletion bootstrap/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ No modules.

| Name | Type |
|------|------|
| [aws_dynamodb_table.dynamodb_terraform_state_lock](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/dynamodb_table) | resource |
| [aws_kms_key.ndr_state_key](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key) | resource |
| [aws_s3_bucket.ndr_lock_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource |
| [aws_s3_bucket_acl.ndr_lock_bucket_acl](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_acl) | resource |
Expand Down
15 changes: 0 additions & 15 deletions bootstrap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,6 @@ resource "aws_s3_bucket_public_access_block" "public_access_block" {
restrict_public_buckets = true
}

resource "aws_dynamodb_table" "dynamodb_terraform_state_lock" {
name = "ndr-terraform-locks"
hash_key = "LockID"
read_capacity = 20
write_capacity = 20

attribute {
name = "LockID"
type = "S"
}
lifecycle {
prevent_destroy = true
}
}

data "aws_caller_identity" "current" {}

variable "region" {
Expand Down
14 changes: 0 additions & 14 deletions scripts/cleanup_terraform_states.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ class CleanupTerraformStates:
def __init__(self):
self.env_folder = "env:/"
self.s3_client = boto3.client("s3")
self.dynamo_client = boto3.client("dynamodb")
self.objects_paginator = self.s3_client.get_paginator('list_objects_v2')
self.object_versions_paginator = self.s3_client.get_paginator('list_object_versions')

Expand Down Expand Up @@ -47,18 +46,6 @@ def remove_object_versions(self, tf_bucket: str, folder_prefix: str) -> None:
)
print("All object versions deleted.")

def delete_record_in_dynamo(self, tf_bucket: str, file_key: str):
print(f"Deleting sandbox tfstate DynamoDB record")
table_name = "ndr-terraform-locks"
lock_id = f'{tf_bucket}/{file_key}-md5'

self.dynamo_client.delete_item(
TableName=table_name,
Key={'LockID': {'S': lock_id}},
ConditionExpression="attribute_exists(LockID)"
)
print("DynamoDB record deleted successfully")


def main(self, sandbox: str):
tf_bucket = self.get_terraform_bucket()
Expand All @@ -71,7 +58,6 @@ def main(self, sandbox: str):
if parent_folder == sandbox:
folder_prefix = f"{self.env_folder}{parent_folder}/"
self.remove_object_versions(tf_bucket=tf_bucket, folder_prefix=folder_prefix)
self.delete_record_in_dynamo(tf_bucket, key)

if __name__ == '__main__':
sandbox = sys.argv[1]
Expand Down