feat: added filter criteria for event source mappings

README.md

@@ -128,6 +128,13 @@ module "lambda" {
       batch_size        = 50
       starting_position = "LATEST"
 
+      // Lambda event filtering, see https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html
+      filter_criteria = {
+        pattern = jsonencode({
+          eventName : ["MODIFY"]
+        })
+      }
+
       // optionally configure a SNS or SQS destination for discarded batches, required IAM
       // permissions will be added automatically by this module,
       // see https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventsourcemapping.html
@@ -201,9 +208,9 @@ see [example](examples/with-cloudwatch-logs-subscription) for details
 module "lambda" {
   // see above
 
-  // disable CloudWatch logs 
-  // cloudwatch_logs_enabled = false 
-  
+  // disable CloudWatch logs
+  // cloudwatch_logs_enabled = false
+
   cloudwatch_logs_retention_in_days = 14
 
   cloudwatch_log_subscription_filters = {
@@ -239,8 +246,6 @@ module "lambda" {
 }
 ```
 
-
-
 For `image` deployment packages, the Lambda Insights extension needs to be added to the [container image](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Lambda-Insights-Getting-Started-docker.html):
 
 ```dockerfile
@@ -297,13 +302,13 @@ should migrate to this module as a drop-in replacement to benefit from new featu
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.8.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.9 |
 
 ## Modules
 

docs/deployment/part2.md

@@ -3,7 +3,7 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.19 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |
 
 ## Providers
 

docs/part1.md

@@ -128,6 +128,13 @@ module "lambda" {
       batch_size        = 50
       starting_position = "LATEST"
 
+      // Lambda event filtering, see https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html
+      filter_criteria = {
+        pattern = jsonencode({
+          eventName : ["MODIFY"]
+        })
+      }
+
       // optionally configure a SNS or SQS destination for discarded batches, required IAM
       // permissions will be added automatically by this module,
       // see https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventsourcemapping.html
@@ -201,9 +208,9 @@ see [example](examples/with-cloudwatch-logs-subscription) for details
 module "lambda" {
   // see above
 
-  // disable CloudWatch logs 
-  // cloudwatch_logs_enabled = false 
-  
+  // disable CloudWatch logs
+  // cloudwatch_logs_enabled = false
+
   cloudwatch_logs_retention_in_days = 14
 
   cloudwatch_log_subscription_filters = {
@@ -239,8 +246,6 @@ module "lambda" {
 }
 ```
 
-
-
 For `image` deployment packages, the Lambda Insights extension needs to be added to the [container image](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Lambda-Insights-Getting-Started-docker.html):
 
 ```dockerfile

docs/part2.md

@@ -3,13 +3,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.61 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.8.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.9 |
 
 ## Modules
 

event_source_mappings.tf

@@ -48,6 +48,16 @@ resource "aws_lambda_event_source_mapping" "event_source" {
       }
     }
   }
+
+  dynamic "filter_criteria" {
+    for_each = try(each.value["filter_criteria"], null) != null ? [true] : []
+
+    content {
+      filter {
+        pattern = try(each.value["filter_criteria"].pattern, null)
+      }
+    }
+  }
 }
 
 // type specific minimal permissions for supported event_sources,

examples/deployment/container-image/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    aws = ">= 3.61"
+    aws = ">= 4.9"
   }
 }

examples/deployment/s3/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    aws = ">= 3.61"
+    aws = ">= 4.9"
   }
 }

examples/simple/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    aws = ">= 3.61"
+    aws = ">= 4.9"
   }
 }

examples/with-cloudwatch-event-rules/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    aws = ">= 3.61"
+    aws = ">= 4.9"
   }
 }

examples/with-cloudwatch-logs-subscription/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    aws = ">= 3.19"
+    aws = ">= 4.9"
   }
 }

examples/with-event-source-mappings/dynamodb-with-alias/main.tf

@@ -60,6 +60,13 @@ module "lambda" {
       batch_size             = 50
       maximum_retry_attempts = 3
 
+      // Lambda event filtering, see https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html
+      filter_criteria = {
+        pattern = jsonencode({
+          eventName : ["MODIFY"]
+        })
+      }
+
       // optionally configure a SNS or SQS destination for discarded batches, required IAM
       // permissions will be added automatically by this module,
       // see https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventsourcemapping.html

examples/with-event-source-mappings/dynamodb-with-alias/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12.0"
 
   required_providers {
-    aws = ">= 3.61"
+    aws = ">= 4.9"
   }
 }

examples/with-event-source-mappings/kinesis/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12.0"
 
   required_providers {
-    aws = ">= 3.61"
+    aws = ">= 4.9"
   }
 }

examples/with-event-source-mappings/sqs/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12.0"
 
   required_providers {
-    aws = ">= 3.61"
+    aws = ">= 4.9"
   }
 }

examples/with-sns-subscriptions/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    aws = ">= 3.61"
+    aws = ">= 4.9"
   }
 }

modules/deployment/README.md

@@ -167,7 +167,7 @@ resource "aws_s3_bucket_object" "source" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.19 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9 |
 
 ## Providers
 

modules/deployment/versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12.0"
 
   required_providers {
-    aws = ">= 3.19"
+    aws = ">= 4.9"
   }
 }

test/go.mod

@@ -1,11 +1,100 @@
 module github.com/moritzzimmer/terraform-aws-lambda
 
-go 1.16
+go 1.18
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.9.0
-	github.com/aws/aws-sdk-go-v2/config v1.7.0
-	github.com/aws/aws-sdk-go-v2/service/lambda v1.8.0
-	github.com/gruntwork-io/terratest v0.32.18
-	github.com/stretchr/testify v1.6.1
+	github.com/aws/aws-sdk-go-v2 v1.16.5
+	github.com/aws/aws-sdk-go-v2/config v1.15.10
+	github.com/aws/aws-sdk-go-v2/service/lambda v1.23.2
+	github.com/gruntwork-io/terratest v0.40.16
+	github.com/stretchr/testify v1.7.2
+)
+
+require (
+	cloud.google.com/go v0.83.0 // indirect
+	cloud.google.com/go/storage v1.10.0 // indirect
+	github.com/agext/levenshtein v1.2.3 // indirect
+	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/aws/aws-sdk-go v1.40.56 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.12.5 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.6 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.12 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.6 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.11.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.16.7 // indirect
+	github.com/aws/smithy-go v1.11.3 // indirect
+	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
+	github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
+	github.com/go-logr/logr v0.2.0 // indirect
+	github.com/go-sql-driver/mysql v1.4.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.3 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/uuid v1.2.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/googleapis/gnostic v0.4.1 // indirect
+	github.com/gruntwork-io/go-commons v0.8.0 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-getter v1.6.1 // indirect
+	github.com/hashicorp/go-multierror v1.1.0 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
+	github.com/hashicorp/go-version v1.3.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.9.1 // indirect
+	github.com/hashicorp/terraform-json v0.13.0 // indirect
+	github.com/imdario/mergo v0.3.11 // indirect
+	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
+	github.com/klauspost/compress v1.13.0 // indirect
+	github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pquerna/otp v1.2.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/tmccombs/hcl2json v0.3.3 // indirect
+	github.com/ulikunitz/xz v0.5.8 // indirect
+	github.com/urfave/cli v1.22.2 // indirect
+	github.com/zclconf/go-cty v1.9.1 // indirect
+	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
+	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
+	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
+	golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e // indirect
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
+	golang.org/x/tools v0.1.2 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/api v0.47.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
+	google.golang.org/grpc v1.38.0 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.20.6 // indirect
+	k8s.io/apimachinery v0.20.6 // indirect
+	k8s.io/client-go v0.20.6 // indirect
+	k8s.io/klog/v2 v2.4.0 // indirect
+	k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )