Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions sqs/.github/CODEOWNERS

This file was deleted.

38 changes: 0 additions & 38 deletions sqs/.github/semantic.yml

This file was deleted.

104 changes: 0 additions & 104 deletions sqs/.github/workflows/00_testPullRequests.yaml

This file was deleted.

41 changes: 0 additions & 41 deletions sqs/.github/workflows/01_triggerReleaseWorkflow.yml

This file was deleted.

18 changes: 0 additions & 18 deletions sqs/.releaserc

This file was deleted.

34 changes: 17 additions & 17 deletions sqs/main.tf
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
data "aws_sns_topic" "sns_topic_to_access" {
count = var.sqs_queue_to_create["sns_subscription"] != null ? length(var.sqs_queue_to_create["sns_subscription"]) : 0
name = var.sqs_queue_to_create["sns_subscription"][count.index]["topic_name"]
count = var.sqs_queue_to_create["sns_subscription"] != null ? length(var.sqs_queue_to_create["sns_subscription"]) : 0
name = var.sqs_queue_to_create["sns_subscription"][count.index]["topic_name"]
}

module "sqs-dead-letter" {
count = var.sqs_queue_to_create != null ? 1 : 0
source = "terraform-aws-modules/sqs/aws"
version = "3.2.1"
version = "4.1.0"

name = "${var.sqs_queue_to_create["name"]}-dead-letter"
name = "${var.sqs_queue_to_create["name"]}-dead-letter"
message_retention_seconds = 1209600 #14 days
}
module "sqs" {
count = var.sqs_queue_to_create != null ? 1 : 0
source = "terraform-aws-modules/sqs/aws"
version = "3.2.1"
version = "4.1.0"

name = var.sqs_queue_to_create["name"]
name = var.sqs_queue_to_create["name"]
message_retention_seconds = 1209600 #14 days
redrive_policy = <<EOF
redrive_policy = <<EOF
{
"deadLetterTargetArn": "${module.sqs-dead-letter[0].sqs_queue_arn}",
"maxReceiveCount": 3
Expand All @@ -27,20 +27,20 @@ EOF
}

data "aws_iam_policy_document" "sqs_allow_messages_from_sns_topic" {
count = var.sqs_queue_to_create["sns_subscription"] != null ? length(var.sqs_queue_to_create["sns_subscription"]) : 0
count = var.sqs_queue_to_create["sns_subscription"] != null ? length(var.sqs_queue_to_create["sns_subscription"]) : 0

statement {
sid = "${count.index}"
sid = count.index

actions = [
"sqs:SendMessage"
]

principals {
type = "AWS"
type = "AWS"
identifiers = ["*"]
}

resources = [
"${module.sqs[0].sqs_queue_arn}"
]
Expand All @@ -49,19 +49,19 @@ data "aws_iam_policy_document" "sqs_allow_messages_from_sns_topic" {
test = "ArnEquals"
variable = "aws:SourceArn"

values = [ "${data.aws_sns_topic.sns_topic_to_access[count.index].arn}" ]
values = ["${data.aws_sns_topic.sns_topic_to_access[count.index].arn}"]
}
}
}

module "SQS_policy_concatenation" {
count = var.sqs_queue_to_create["sns_subscription"] != null ? 1 : 0
source = "github.com/cloudposse/terraform-aws-iam-policy-document-aggregator?ref=0.8.0"
count = var.sqs_queue_to_create["sns_subscription"] != null ? 1 : 0
source = "github.com/cloudposse/terraform-aws-iam-policy-document-aggregator?ref=0.8.0"
source_documents = data.aws_iam_policy_document.sqs_allow_messages_from_sns_topic[*].json
}

resource "aws_sqs_queue_policy" "sqs_queue_policy_for_sns" {
count = var.sqs_queue_to_create["sns_subscription"] != null ? 1 : 0
count = var.sqs_queue_to_create["sns_subscription"] != null ? 1 : 0
queue_url = module.sqs[0].sqs_queue_id

policy = module.SQS_policy_concatenation[0].result_document
Expand All @@ -75,4 +75,4 @@ resource "aws_sns_topic_subscription" "sns_topic" {
endpoint = module.sqs[0].sqs_queue_arn

filter_policy = var.sqs_queue_to_create["sns_subscription"][count.index]["filter_policy"]
}
}
4 changes: 2 additions & 2 deletions sqs/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {

aws = {
source = "hashicorp/aws"
version = ">= 3.47.0"
version = "~> 5.0"
}
}
}
}