fixing variable stucture

Author: kuntalkumarbasu

autotagging.tf

@@ -49,11 +49,10 @@ resource "aws_sqs_queue" "auto_tagging" {
 }
 
 resource "aws_sns_topic_subscription" "auto_tagging" {
-  count         = var.enable_auto_tagging == true ? var.sns_topic_arn == "" ? 0 : 1 : 0
-  filter_policy = var.sns_subcription_filter_policy
-  topic_arn     = var.sns_topic_arn
-  protocol      = "sqs"
-  endpoint      = aws_sqs_queue.auto_tagging[0].arn
+  count     = var.enable_auto_tagging == true ? var.sns_topic_arn == "" ? 0 : 1 : 0
+  topic_arn = var.sns_topic_arn
+  protocol  = "sqs"
+  endpoint  = aws_sqs_queue.auto_tagging[0].arn
 }
 
 resource "aws_lambda_event_source_mapping" "auto_tagging" {

glue_create.tf

@@ -106,7 +106,7 @@ resource "aws_sqs_queue_redrive_allow_policy" "terraform_queue_redrive_allow_pol
 
 resource "aws_sns_topic_subscription" "glue_create_sns_sub" {
   count         = var.enable_glue_create ? 1 : 0
-  filter_policy = var.sns_subcription_filter_policy
+  filter_policy = var.glue_create_config.sns_subcription_filter_policy
   topic_arn     = var.glue_create_config.sns_topic_arn
   protocol      = "sqs"
   endpoint      = aws_sqs_queue.glue_create[0].arn

glue_sync.tf

@@ -70,7 +70,7 @@ resource "aws_sqs_queue_redrive_allow_policy" "glue_syncredrive_allow_policy" {
 
 resource "aws_sns_topic_subscription" "glue_sync_sns_sub" {
   count         = var.enable_glue_sync ? 1 : 0
-  filter_policy = var.sns_subcription_filter_policy
+  filter_policy = var.glue_sync_config.sns_subcription_filter_policy
   topic_arn     = var.glue_sync_config.sns_topic_arn
   protocol      = "sqs"
   endpoint      = aws_sqs_queue.glue_sync[0].arn

main.tf

@@ -263,11 +263,10 @@ resource "aws_sqs_queue" "this_DL" {
 }
 
 resource "aws_sns_topic_subscription" "this_sns_sub" {
-  count         = var.sns_topic_arn == "" ? 0 : 1
-  filter_policy = var.sns_subcription_filter_policy
-  topic_arn     = var.sns_topic_arn
-  protocol      = "sqs"
-  endpoint      = local.enable_group_events ? aws_sqs_queue.group_events_lambda_sqs[0].arn : aws_sqs_queue.this_sqs[0].arn
+  count     = var.sns_topic_arn == "" ? 0 : 1
+  topic_arn = var.sns_topic_arn
+  protocol  = "sqs"
+  endpoint  = local.enable_group_events ? aws_sqs_queue.group_events_lambda_sqs[0].arn : aws_sqs_queue.this_sqs[0].arn
 }
 
 resource "aws_lambda_permission" "this_lambda_allow_bucket_permissions" {

variables.tf

@@ -291,18 +291,19 @@ variable "enable_schema_evolution" {
 
 variable "glue_create_config" {
   type = object({
-    athena_workgroup_name = string // Name of AWS Athena workgroup
-    athena_data_source    = string // Arn name of AWS Athena data source (catalog)
-    athena_bucket_name    = string // name of AWS Athena bucket.
-    lambda_s3_key         = string // lambda s3 key - lambda path on S3 and file name filename
-    lambda_s3_bucket      = string // lambda s3 bucket where lambda is stored
-    lambda_function_name  = string // lambda function name
-    path_regex            = string //  regexp for mapping s3 path to database/table
-    sns_topic_arn         = string // sns topic arn with s3 events (source for lambda)
-    sqs_queue_name        = string // name of sqs queue for glue-sync lambda
-    sqs_queue_name_dl     = string // name dead letter sqs que with not processed s3 events
-    iam_role_name         = string // lambda role name
-    iam_policy_name       = string // lambda policy name
+    athena_workgroup_name         = string // Name of AWS Athena workgroup
+    athena_data_source            = string // Arn name of AWS Athena data source (catalog)
+    athena_bucket_name            = string // name of AWS Athena bucket.
+    lambda_s3_key                 = string // lambda s3 key - lambda path on S3 and file name filename
+    lambda_s3_bucket              = string // lambda s3 bucket where lambda is stored
+    lambda_function_name          = string // lambda function name
+    path_regex                    = string //  regexp for mapping s3 path to database/table
+    sns_topic_arn                 = string // sns topic arn with s3 events (source for lambda)
+    sqs_queue_name                = string // name of sqs queue for glue-sync lambda
+    sqs_queue_name_dl             = string // name dead letter sqs que with not processed s3 events
+    iam_role_name                 = string // lambda role name
+    iam_policy_name               = string // lambda policy name
+    sns_subcription_filter_policy = string // sns subcription filter policy
   })
   description = "Configuration of glue-create lambda"
 }
@@ -315,15 +316,16 @@ variable "enable_glue_sync" {
 
 variable "glue_sync_config" {
   type = object({
-    lambda_s3_key        = string // lambda s3 key - lambda path on S3 and file name filename
-    lambda_s3_bucket     = string // lambda s3 bucket where lambda is stored
-    lambda_function_name = string // lambda function name
-    path_regex           = string //  regexp for mapping s3 path to database/table
-    sns_topic_arn        = string // sns topic arn with s3 events (source for lambda)
-    sqs_queue_name       = string // name of sqs queue for glue-sync lambda
-    sqs_queue_name_dl    = string // name dead letter sqs que with not processed s3 events
-    iam_role_name        = string // lambda role name
-    iam_policy_name      = string // lambda policy name
+    lambda_s3_key                 = string // lambda s3 key - lambda path on S3 and file name filename
+    lambda_s3_bucket              = string // lambda s3 bucket where lambda is stored
+    lambda_function_name          = string // lambda function name
+    path_regex                    = string //  regexp for mapping s3 path to database/table
+    sns_topic_arn                 = string // sns topic arn with s3 events (source for lambda)
+    sqs_queue_name                = string // name of sqs queue for glue-sync lambda
+    sqs_queue_name_dl             = string // name dead letter sqs que with not processed s3 events
+    iam_role_name                 = string // lambda role name
+    iam_policy_name               = string // lambda policy name
+    sns_subcription_filter_policy = string // sns subcription filter policy
   })
   description = "Configuration of glue-sync lambda"
 }
@@ -348,9 +350,3 @@ variable "message_retention_seconds" {
   type    = number
   default = 1209600
 }
-
-variable "sns_subcription_filter_policy" {
-  type        = string
-  default     = ""
-  description = "A map of subscription filter policy to create"
-}