Revert "DDLS-408 add dynamodb kms key part 1 of 2 (#1737)"

This reverts commit 1aabf70.
ministryofjustice · Nov 25, 2024 · acf8919 · acf8919
1 parent 1aabf70
commit acf8919
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 74 deletions.
diff --git a/terraform/account/region/dynamodb.tf b/terraform/account/region/dynamodb.tf
@@ -16,11 +16,6 @@ resource "aws_dynamodb_table" "workspace_cleanup_table" {
     enabled        = true
   }
 
-  server_side_encryption {
-    enabled     = true
-    kms_key_arn = module.dynamodb_kms.eu_west_1_target_key_arn
-  }
-
   lifecycle {
     prevent_destroy = false
   }
@@ -76,11 +71,6 @@ resource "aws_dynamodb_table" "blocked_ips_table" {
     enabled        = true
   }
 
-  #  server_side_encryption {
-  #    enabled              = true
-  #    kms_key_arn      = module.dynamodb_kms.eu_west_1_target_key_arn
-  #  }
-
   lifecycle {
     prevent_destroy = false
   }

diff --git a/terraform/account/region/elasticache.tf b/terraform/account/region/elasticache.tf
@@ -27,10 +27,9 @@ resource "aws_elasticache_replication_group" "cache_api" {
 }
 
 resource "aws_security_group" "cache_api_sg" {
-  name        = "${var.account.name}-account-cache-api"
-  vpc_id      = aws_vpc.main.id
-  tags        = merge(var.default_tags, { Name = "${var.account.name}-account-cache--api" })
-  description = "cache api - ${var.account.name}"
+  name   = "${var.account.name}-account-cache-api"
+  vpc_id = aws_vpc.main.id
+  tags   = merge(var.default_tags, { Name = "${var.account.name}-account-cache--api" })
 
   lifecycle {
     create_before_destroy = true
@@ -64,10 +63,9 @@ resource "aws_elasticache_replication_group" "front_api" {
 }
 
 resource "aws_security_group" "cache_front_sg" {
-  name        = "${var.account.name}-account-cache-frontend"
-  vpc_id      = aws_vpc.main.id
-  description = "cache front - ${var.account.name}"
-  tags        = merge(var.default_tags, { Name = "${var.account.name}-account-cache-frontend" })
+  name   = "${var.account.name}-account-cache-frontend"
+  vpc_id = aws_vpc.main.id
+  tags   = merge(var.default_tags, { Name = "${var.account.name}-account-cache-frontend" })
 
   lifecycle {
     create_before_destroy = true

diff --git a/terraform/account/region/kms_service_dynamo.tf b/terraform/account/region/kms_service_dynamo.tf