Update SQS module (#73)

Flaconi · Oct 17, 2022 · 05e83dc · 05e83dc
1 parent cc8a292
commit 05e83dc
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 45 deletions.
diff --git a/iam.tf b/iam.tf
@@ -233,7 +233,7 @@ data "aws_iam_policy_document" "sqs1_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs1.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs1.sqs_queue_name}",
     ]
 
     actions = [
@@ -246,7 +246,7 @@ data "aws_iam_policy_document" "sqs1_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs1.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs1.sqs_queue_name}",
     ]
 
     actions = [
@@ -283,7 +283,7 @@ data "aws_iam_policy_document" "sqs2_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs2.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs2.sqs_queue_name}",
     ]
 
     actions = [
@@ -296,7 +296,7 @@ data "aws_iam_policy_document" "sqs2_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs2.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs2.sqs_queue_name}",
     ]
 
     actions = [
@@ -333,7 +333,7 @@ data "aws_iam_policy_document" "sqs3_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs3.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs3.sqs_queue_name}",
     ]
 
     actions = [
@@ -346,7 +346,7 @@ data "aws_iam_policy_document" "sqs3_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs3.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs3.sqs_queue_name}",
     ]
 
     actions = [
@@ -383,7 +383,7 @@ data "aws_iam_policy_document" "sqs4_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs4.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs4.sqs_queue_name}",
     ]
 
     actions = [
@@ -396,7 +396,7 @@ data "aws_iam_policy_document" "sqs4_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs4.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs4.sqs_queue_name}",
     ]
 
     actions = [
@@ -433,7 +433,7 @@ data "aws_iam_policy_document" "sqs5_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs5.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs5.sqs_queue_name}",
     ]
 
     actions = [
@@ -446,7 +446,7 @@ data "aws_iam_policy_document" "sqs5_full_access" {
     effect = "Allow"
 
     resources = [
-      "arn:aws:sqs:*:*:${module.sqs5.this_sqs_queue_name}",
+      "arn:aws:sqs:*:*:${module.sqs5.sqs_queue_name}",
     ]
 
     actions = [

diff --git a/outputs.tf b/outputs.tf
@@ -341,112 +341,112 @@ output "this_aws_s3_bucket_arn" {
 # -------------------------------------------------------------------------------------------------
 output "sqs1_queue_name" {
   description = "SQS queue name"
-  value       = module.sqs1.this_sqs_queue_name
+  value       = module.sqs1.sqs_queue_name
 }
 
 output "sqs1_queue_id" {
   description = "SQS queue ID"
-  value       = module.sqs1.this_sqs_queue_id
+  value       = module.sqs1.sqs_queue_id
 }
 
 output "sqs1_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs1.this_sqs_queue_arn
+  value       = module.sqs1.sqs_queue_arn
 }
 
 output "sqs1_dlq_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs1-dlq.this_sqs_queue_arn
+  value       = module.sqs1-dlq.sqs_queue_arn
 }
 
 # -------------------------------------------------------------------------------------------------
 # SQS 2
 # -------------------------------------------------------------------------------------------------
 output "sqs2_queue_name" {
   description = "SQS queue name"
-  value       = module.sqs2.this_sqs_queue_name
+  value       = module.sqs2.sqs_queue_name
 }
 
 output "sqs2_queue_id" {
   description = "SQS queue ID"
-  value       = module.sqs2.this_sqs_queue_id
+  value       = module.sqs2.sqs_queue_id
 }
 
 output "sqs2_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs2.this_sqs_queue_arn
+  value       = module.sqs2.sqs_queue_arn
 }
 
 output "sqs2_dlq_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs2-dlq.this_sqs_queue_arn
+  value       = module.sqs2-dlq.sqs_queue_arn
 }
 
 # -------------------------------------------------------------------------------------------------
 # SQS 3
 # -------------------------------------------------------------------------------------------------
 output "sqs3_queue_name" {
   description = "SQS queue name"
-  value       = module.sqs3.this_sqs_queue_name
+  value       = module.sqs3.sqs_queue_name
 }
 
 output "sqs3_queue_id" {
   description = "SQS queue ID"
-  value       = module.sqs3.this_sqs_queue_id
+  value       = module.sqs3.sqs_queue_id
 }
 
 output "sqs3_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs3.this_sqs_queue_arn
+  value       = module.sqs3.sqs_queue_arn
 }
 
 output "sqs3_dlq_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs3-dlq.this_sqs_queue_arn
+  value       = module.sqs3-dlq.sqs_queue_arn
 }
 
 # -------------------------------------------------------------------------------------------------
 # SQS 4
 # -------------------------------------------------------------------------------------------------
 output "sqs4_queue_name" {
   description = "SQS queue name"
-  value       = module.sqs4.this_sqs_queue_name
+  value       = module.sqs4.sqs_queue_name
 }
 
 output "sqs4_queue_id" {
   description = "SQS queue ID"
-  value       = module.sqs4.this_sqs_queue_id
+  value       = module.sqs4.sqs_queue_id
 }
 
 output "sqs4_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs4.this_sqs_queue_arn
+  value       = module.sqs4.sqs_queue_arn
 }
 
 output "sqs4_dlq_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs4-dlq.this_sqs_queue_arn
+  value       = module.sqs4-dlq.sqs_queue_arn
 }
 
 # -------------------------------------------------------------------------------------------------
 # SQS 5
 # -------------------------------------------------------------------------------------------------
 output "sqs5_queue_name" {
   description = "SQS queue name"
-  value       = module.sqs5.this_sqs_queue_name
+  value       = module.sqs5.sqs_queue_name
 }
 
 output "sqs5_queue_id" {
   description = "SQS queue ID"
-  value       = module.sqs5.this_sqs_queue_id
+  value       = module.sqs5.sqs_queue_id
 }
 
 output "sqs5_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs5.this_sqs_queue_arn
+  value       = module.sqs5.sqs_queue_arn
 }
 
 output "sqs5_dlq_queue_arn" {
   description = "SQS queue ARN"
-  value       = module.sqs5-dlq.this_sqs_queue_arn
+  value       = module.sqs5-dlq.sqs_queue_arn
 }
diff --git a/sqs1.tf b/sqs1.tf
@@ -4,7 +4,7 @@ locals {
 
 module "sqs1" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs1_enabled ? "true" : "false"
   name   = local.sqs1_name
@@ -13,13 +13,13 @@ module "sqs1" {
   fifo_queue                 = var.sqs1_fifo_queue
   max_message_size           = var.sqs1_max_message_size
   receive_wait_time_seconds  = var.sqs1_receive_wait_time_seconds
-  redrive_policy             = var.sqs1_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs1-dlq.this_sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs1_redrive_policy
+  redrive_policy             = var.sqs1_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs1-dlq.sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs1_redrive_policy
   visibility_timeout_seconds = var.sqs1_visibility_timeout_seconds
 }
 
 module "sqs1-dlq" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs1_dlq_enabled ? "true" : "false"
   name   = "${local.sqs1_name}-deadletter"

diff --git a/sqs2.tf b/sqs2.tf
@@ -4,7 +4,7 @@ locals {
 
 module "sqs2" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs2_enabled ? "true" : "false"
   name   = local.sqs2_name
@@ -13,13 +13,13 @@ module "sqs2" {
   fifo_queue                 = var.sqs2_fifo_queue
   max_message_size           = var.sqs2_max_message_size
   receive_wait_time_seconds  = var.sqs2_receive_wait_time_seconds
-  redrive_policy             = var.sqs2_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs2-dlq.this_sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs2_redrive_policy
+  redrive_policy             = var.sqs2_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs2-dlq.sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs2_redrive_policy
   visibility_timeout_seconds = var.sqs2_visibility_timeout_seconds
 }
 
 module "sqs2-dlq" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs2_dlq_enabled ? "true" : "false"
   name   = "${local.sqs2_name}-deadletter"

diff --git a/sqs3.tf b/sqs3.tf
@@ -4,7 +4,7 @@ locals {
 
 module "sqs3" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs3_enabled ? "true" : "false"
   name   = local.sqs3_name
@@ -13,13 +13,13 @@ module "sqs3" {
   fifo_queue                 = var.sqs3_fifo_queue
   max_message_size           = var.sqs3_max_message_size
   receive_wait_time_seconds  = var.sqs3_receive_wait_time_seconds
-  redrive_policy             = var.sqs3_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs3-dlq.this_sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs3_redrive_policy
+  redrive_policy             = var.sqs3_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs3-dlq.sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs3_redrive_policy
   visibility_timeout_seconds = var.sqs3_visibility_timeout_seconds
 }
 
 module "sqs3-dlq" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs3_dlq_enabled ? "true" : "false"
   name   = "${local.sqs3_name}-deadletter"

diff --git a/sqs4.tf b/sqs4.tf
@@ -4,7 +4,7 @@ locals {
 
 module "sqs4" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs4_enabled ? "true" : "false"
   name   = local.sqs4_name
@@ -13,13 +13,13 @@ module "sqs4" {
   fifo_queue                 = var.sqs4_fifo_queue
   max_message_size           = var.sqs4_max_message_size
   receive_wait_time_seconds  = var.sqs4_receive_wait_time_seconds
-  redrive_policy             = var.sqs4_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs4-dlq.this_sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs4_redrive_policy
+  redrive_policy             = var.sqs4_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs4-dlq.sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs4_redrive_policy
   visibility_timeout_seconds = var.sqs4_visibility_timeout_seconds
 }
 
 module "sqs4-dlq" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs4_dlq_enabled ? "true" : "false"
   name   = "${local.sqs4_name}-deadletter"

diff --git a/sqs5.tf b/sqs5.tf
@@ -4,7 +4,7 @@ locals {
 
 module "sqs5" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs5_enabled ? "true" : "false"
   name   = local.sqs5_name
@@ -13,13 +13,13 @@ module "sqs5" {
   fifo_queue                 = var.sqs5_fifo_queue
   max_message_size           = var.sqs5_max_message_size
   receive_wait_time_seconds  = var.sqs5_receive_wait_time_seconds
-  redrive_policy             = var.sqs5_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs5-dlq.this_sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs5_redrive_policy
+  redrive_policy             = var.sqs5_dlq_enabled ? "{\"deadLetterTargetArn\":\"${module.sqs5-dlq.sqs_queue_arn}\",\"maxReceiveCount\":4}" : var.sqs5_redrive_policy
   visibility_timeout_seconds = var.sqs5_visibility_timeout_seconds
 }
 
 module "sqs5-dlq" {
   source  = "terraform-aws-modules/sqs/aws"
-  version = "~> 2.0"
+  version = "3.4.1"
 
   create = var.sqs5_dlq_enabled ? "true" : "false"
   name   = "${local.sqs5_name}-deadletter"