Skip to content

Commit 1f8ee07

Browse files
authored
[NDR-232] Removing references to DynamoDB for state locking (#440)
1 parent d293d92 commit 1f8ee07

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

bootstrap/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ No modules.
1919

2020
| Name | Type |
2121
|------|------|
22-
| [aws_dynamodb_table.dynamodb_terraform_state_lock](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/dynamodb_table) | resource |
2322
| [aws_kms_key.ndr_state_key](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key) | resource |
2423
| [aws_s3_bucket.ndr_lock_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource |
2524
| [aws_s3_bucket_acl.ndr_lock_bucket_acl](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_acl) | resource |

bootstrap/main.tf

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,6 @@ resource "aws_s3_bucket_public_access_block" "public_access_block" {
6767
restrict_public_buckets = true
6868
}
6969

70-
resource "aws_dynamodb_table" "dynamodb_terraform_state_lock" {
71-
name = "ndr-terraform-locks"
72-
hash_key = "LockID"
73-
read_capacity = 20
74-
write_capacity = 20
75-
76-
attribute {
77-
name = "LockID"
78-
type = "S"
79-
}
80-
lifecycle {
81-
prevent_destroy = true
82-
}
83-
}
84-
8570
data "aws_caller_identity" "current" {}
8671

8772
variable "region" {

scripts/cleanup_terraform_states.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class CleanupTerraformStates:
88
def __init__(self):
99
self.env_folder = "env:/"
1010
self.s3_client = boto3.client("s3")
11-
self.dynamo_client = boto3.client("dynamodb")
1211
self.objects_paginator = self.s3_client.get_paginator('list_objects_v2')
1312
self.object_versions_paginator = self.s3_client.get_paginator('list_object_versions')
1413

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

50-
def delete_record_in_dynamo(self, tf_bucket: str, file_key: str):
51-
print(f"Deleting sandbox tfstate DynamoDB record")
52-
table_name = "ndr-terraform-locks"
53-
lock_id = f'{tf_bucket}/{file_key}-md5'
54-
55-
self.dynamo_client.delete_item(
56-
TableName=table_name,
57-
Key={'LockID': {'S': lock_id}},
58-
ConditionExpression="attribute_exists(LockID)"
59-
)
60-
print("DynamoDB record deleted successfully")
61-
6249

6350
def main(self, sandbox: str):
6451
tf_bucket = self.get_terraform_bucket()
@@ -71,7 +58,6 @@ def main(self, sandbox: str):
7158
if parent_folder == sandbox:
7259
folder_prefix = f"{self.env_folder}{parent_folder}/"
7360
self.remove_object_versions(tf_bucket=tf_bucket, folder_prefix=folder_prefix)
74-
self.delete_record_in_dynamo(tf_bucket, key)
7561

7662
if __name__ == '__main__':
7763
sandbox = sys.argv[1]

0 commit comments

Comments
 (0)