From ee41186b6e8bd04edfb1805b49820a7237f941a8 Mon Sep 17 00:00:00 2001 From: "Huy, Tae Young" Date: Mon, 28 Mar 2022 18:11:53 +0900 Subject: [PATCH 1/2] feat: Added support for self managed kafka in event source mapping (#278) --- examples/complete/README.md | 1 + examples/event-source-mapping/main.tf | 26 ++++++++++++++++++++++++++ main.tf | 9 ++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/examples/complete/README.md b/examples/complete/README.md index d4dc6595..d0231c02 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -54,6 +54,7 @@ Note that this example may create resources which cost money. Run `terraform des |------|------| | [aws_sqs_queue.dlq](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sqs_queue) | resource | | [random_pet.this](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet) | resource | +| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | ## Inputs diff --git a/examples/event-source-mapping/main.tf b/examples/event-source-mapping/main.tf index 9266dfc9..62e57443 100644 --- a/examples/event-source-mapping/main.tf +++ b/examples/event-source-mapping/main.tf @@ -63,6 +63,32 @@ module "lambda_function" { } ] } + # self_managed_kafka = { + # batch_size = 1 + # starting_position = "TRIM_HORIZON" + # topics = ["topic1", "topic2"] + # self_managed_event_source = [ + # { + # endpoints = { + # KAFKA_BOOTSTRAP_SERVERS = "kafka1.example.com:9092,kafka2.example.com:9092" + # } + # } + # ] + # source_access_configuration = [ + # { + # type = "SASL_SCRAM_512_AUTH", + # uri = "SECRET_AUTH_INFO" + # }, + # { + # type = "VPC_SECURITY_GROUP", + # uri = "security_group:sg-12345678" + # }, + # { + # type = "VPC_SUBNET" + # uri = "subnet:subnet-12345678" + # } + # ] + # } } allowed_triggers = { diff --git a/main.tf b/main.tf index fe32f7e0..fa201996 100644 --- a/main.tf +++ b/main.tf @@ -231,7 +231,7 @@ resource "aws_lambda_event_source_mapping" "this" { function_name = aws_lambda_function.this[0].arn - event_source_arn = each.value.event_source_arn + event_source_arn = try(each.value.event_source_arn, null) batch_size = try(each.value.batch_size, null) maximum_batching_window_in_seconds = try(each.value.maximum_batching_window_in_seconds, null) @@ -255,6 +255,13 @@ resource "aws_lambda_event_source_mapping" "this" { } } + dynamic "self_managed_event_source" { + for_each = try(each.value.self_managed_event_source, []) + content { + endpoints = self_managed_event_source.value.endpoints + } + } + dynamic "source_access_configuration" { for_each = try(each.value.source_access_configuration, []) content { From de9052f305e4176615c114d6ad275fd385afd0b8 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 28 Mar 2022 09:12:35 +0000 Subject: [PATCH 2/2] chore(release): version 3.1.0 [skip ci] ## [3.1.0](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v3.0.1...v3.1.0) (2022-03-28) ### Features * Added support for self managed kafka in event source mapping ([#278](https://github.com/terraform-aws-modules/terraform-aws-lambda/issues/278)) ([ee41186](https://github.com/terraform-aws-modules/terraform-aws-lambda/commit/ee41186b6e8bd04edfb1805b49820a7237f941a8)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a14a30dd..c3c31bb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +## [3.1.0](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v3.0.1...v3.1.0) (2022-03-28) + + +### Features + +* Added support for self managed kafka in event source mapping ([#278](https://github.com/terraform-aws-modules/terraform-aws-lambda/issues/278)) ([ee41186](https://github.com/terraform-aws-modules/terraform-aws-lambda/commit/ee41186b6e8bd04edfb1805b49820a7237f941a8)) + ### [3.0.1](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v3.0.0...v3.0.1) (2022-03-28)