corrected merge conflict

Author: JamesW1-NHS

terraform/main.tf

@@ -97,6 +97,10 @@ data "aws_kms_key" "existing_kinesis_encryption_key" {
   key_id = "alias/imms-batch-kinesis-stream-encryption"
 }
 
+data "aws_kms_key" "existing_id_sync_sqs_encryption_key" {
+  key_id = "alias/imms-event-id-sync-encryption"
+}
+
 data "aws_kms_key" "mesh_s3_encryption_key" {
   key_id = "alias/local-immunisation-mesh"
 }

terraform/variables.tf

@@ -59,65 +59,3 @@ locals {
   # Private subnet - The subnet does not have a direct route to an internet gateway. Resources in a private subnet require a NAT device to access the public internet.
   private_subnet_ids = [for k, v in data.aws_route.internet_traffic_route_by_subnet : k if length(v.nat_gateway_id) > 0]
 }
-
-check "private_subnets" {
-  assert {
-    condition     = length(local.private_subnet_ids) > 0
-    error_message = "No private subnets with internet access found in VPC ${data.aws_vpc.default.id}"
-  }
-}
-
-data "aws_vpc" "default" {
-  default = true
-}
-
-data "aws_subnets" "all" {
-  filter {
-    name   = "vpc-id"
-    values = [data.aws_vpc.default.id]
-  }
-}
-
-data "aws_route_table" "route_table_by_subnet" {
-  for_each = toset(data.aws_subnets.all.ids)
-
-  subnet_id = each.value
-}
-
-data "aws_route" "internet_traffic_route_by_subnet" {
-  for_each = data.aws_route_table.route_table_by_subnet
-
-  route_table_id         = each.value.id
-  destination_cidr_block = "0.0.0.0/0"
-}
-
-data "aws_kms_key" "existing_s3_encryption_key" {
-  key_id = "alias/imms-batch-s3-shared-key"
-}
-
-data "aws_kms_key" "existing_dynamo_encryption_key" {
-  key_id = "alias/imms-event-dynamodb-encryption"
-}
-
-data "aws_elasticache_cluster" "existing_redis" {
-  cluster_id = "immunisation-redis-cluster"
-}
-
-data "aws_security_group" "existing_securitygroup" {
-  filter {
-    name   = "group-name"
-    values = ["immunisation-security-group"]
-  }
-}
-
-data "aws_kms_key" "existing_lambda_encryption_key" {
-  key_id = "alias/imms-batch-lambda-env-encryption"
-}
-
-data "aws_kms_key" "existing_kinesis_encryption_key" {
-  key_id = "alias/imms-batch-kinesis-stream-encryption"
-}
-
-data "aws_kms_key" "existing_id_sync_sqs_encryption_key" {
-  key_id = "alias/imms-event-id-sync-encryption"
-}