added support for using container images (#15)

* added support for using container images

fixes #9

* cleanup

* documentation

Author: moritzzimmer

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.32.0
+    rev: v1.45.0
     hooks:
       - id: terraform_fmt
   - repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v3.3.0
     hooks:
       - id: check-merge-conflict
       - id: trailing-whitespace

README.md

@@ -27,11 +27,13 @@ should migrate to this module as a drop-in replacement for all provisions up to
 
 The module can be used for all [runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) supported by AWS Lambda.
 
-Deployment packages can be specified either directly as a local file (using the `filename` argument) or indirectly via Amazon S3 (using the `s3_bucket`, `s3_key` and `s3_object_versions` arguments), see [documentation](https://www.terraform.io/docs/providers/aws/r/lambda_function.html#specifying-the-deployment-package) for details.
+Deployment packages can be specified either directly as a local file (using the `filename` argument), indirectly via Amazon S3 (using the `s3_bucket`, `s3_key` and `s3_object_versions` arguments)
+or using [container images](https://docs.aws.amazon.com/lambda/latest/dg/lambda-images.html) (using `image_uri` and `package_type` arguments),
+see [documentation](https://www.terraform.io/docs/providers/aws/r/lambda_function.html#specifying-the-deployment-package) for details.
 
-**basic**
+**simple**
 
-```terraform
+```hcl
 provider "aws" {
   region = "eu-west-1"
 }
@@ -47,9 +49,21 @@ module "lambda" {
 }
 ```
 
+**using container images**
+
+```hcl
+module "lambda" {
+  source        = "moritzzimmer/lambda/aws"
+  version       = "5.6.0"
+  function_name = "my-function"
+  image_uri     = "111111111111.dkr.ecr.eu-west-1.amazonaws.com/my-image"
+  package_type  = "Image"
+}
+```
+
 **with event trigger**
 
-```terraform
+```hcl
 module "lambda" {
   // see above
 
@@ -62,7 +76,7 @@ module "lambda" {
 
 **in a VPC**
 
-```terraform
+```hcl
 module "lambda" {
   // see above
 
@@ -75,7 +89,7 @@ module "lambda" {
 
 **with access to parameter store**
 
-```terraform
+```hcl
 module "lambda" {
   // see above
 
@@ -87,7 +101,7 @@ module "lambda" {
 
 **with log subscription (stream to ElasticSearch)**
 
-```terraform
+```hcl
 module "lambda" {
   // see above
 
@@ -97,6 +111,7 @@ module "lambda" {
 
 ### Examples
 
+- [container-image](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/container-image)
 - [example-with-cloudwatch-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-cloudwatch-event)
 - [example-with-dynamodb-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-dynamodb-event)
 - [example-with-kinesis-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-kinesis-event)
@@ -105,7 +120,7 @@ module "lambda" {
 - [example-with-sqs-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-sqs-event)
 - [example-with-ssm-permissions](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-ssm-permissions)
 - [example-with-vpc](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-vpc)
-- [example-without-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-without-event)
+- [simple](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/simple)
 
 ### bootstrap with func
 
@@ -127,12 +142,13 @@ MINOR, and PATCH versions on each release to indicate any incompatibilities.
 | Name | Version |
 |------|---------|
 | terraform | >= 0.12.0 |
+| aws | >= 3.19 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | n/a |
+| aws | >= 3.19 |
 
 ## Inputs
 
@@ -141,25 +157,28 @@ MINOR, and PATCH versions on each release to indicate any incompatibilities.
 | description | Description of what your Lambda Function does. | `string` | `""` | no |
 | environment | Environment (e.g. env variables) configuration for the Lambda function enable you to dynamically pass settings to your function code and libraries | <pre>object({<br>    variables = map(string)<br>  })</pre> | `null` | no |
 | event | Event source configuration which triggers the Lambda function. Supported events: cloudwatch-scheduled-event, dynamodb, s3, sns | `map(string)` | `{}` | no |
-| filename | The path to the function's deployment package within the local filesystem. If defined, The s3\_-prefixed options cannot be used. | `string` | `""` | no |
+| filename | The path to the function's deployment package within the local filesystem. If defined, The s3\_-prefixed options and image\_uri cannot be used. | `string` | `null` | no |
 | function\_name | A unique name for your Lambda Function. | `any` | n/a | yes |
-| handler | The function entrypoint in your code. | `any` | n/a | yes |
+| handler | The function entrypoint in your code. | `string` | `""` | no |
+| image\_config | The Lambda OCI [image configurations](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function#image_config) block with three (optional) arguments:<br><br>  - *entry\_point* - The ENTRYPOINT for the docker image (type `list(string)`).<br>  - *command* - The CMD for the docker image (type `list(string)`).<br>  - *working\_directory* - The working directory for the docker image (type `string`). | `any` | `{}` | no |
+| image\_uri | The ECR image URI containing the function's deployment package. Conflicts with filename, s3\_bucket, s3\_key, and s3\_object\_version. | `string` | `null` | no |
 | kms\_key\_arn | Amazon Resource Name (ARN) of the AWS Key Management Service (KMS) key that is used to encrypt environment variables. If this configuration is not provided when environment variables are in use, AWS Lambda uses a default service key. If this configuration is provided when environment variables are not in use, the AWS Lambda API does not save this configuration and Terraform will show a perpetual difference of adding the key. To fix the perpetual difference, remove this configuration. | `string` | `""` | no |
 | layers | List of Lambda Layer Version ARNs (maximum of 5) to attach to your Lambda Function. | `list(string)` | `[]` | no |
-| log\_retention\_in\_days | Specifies the number of days you want to retain log events in the specified log group. Defaults to 14. | `number` | `14` | no |
+| log\_retention\_in\_days | Specifies the number of days you want to retain log events in the specified log group. | `number` | `14` | no |
 | logfilter\_destination\_arn | The ARN of the destination to deliver matching log events to. Kinesis stream or Lambda function ARN. | `string` | `""` | no |
-| memory\_size | Amount of memory in MB your Lambda Function can use at runtime. Defaults to 128. | `number` | `128` | no |
-| publish | Whether to publish creation/change as new Lambda Function Version. Defaults to false. | `bool` | `false` | no |
-| reserved\_concurrent\_executions | The amount of reserved concurrent executions for this lambda function. A value of 0 disables lambda from being triggered and -1 removes any concurrency limitations. Defaults to Unreserved Concurrency Limits -1. | `string` | `"-1"` | no |
-| runtime | The runtime environment for the Lambda function you are uploading. | `any` | n/a | yes |
-| s3\_bucket | The S3 bucket location containing the function's deployment package. Conflicts with filename. This bucket must reside in the same AWS region where you are creating the Lambda function. | `string` | `""` | no |
-| s3\_key | The S3 key of an object containing the function's deployment package. Conflicts with filename. | `string` | `""` | no |
-| s3\_object\_version | The object version containing the function's deployment package. Conflicts with filename. | `string` | `""` | no |
+| memory\_size | Amount of memory in MB your Lambda Function can use at runtime. | `number` | `128` | no |
+| package\_type | The Lambda deployment package type. Valid values are Zip and Image. | `string` | `"Zip"` | no |
+| publish | Whether to publish creation/change as new Lambda Function Version. | `bool` | `false` | no |
+| reserved\_concurrent\_executions | The amount of reserved concurrent executions for this lambda function. A value of 0 disables lambda from being triggered and -1 removes any concurrency limitations. | `string` | `"-1"` | no |
+| runtime | The runtime environment for the Lambda function you are uploading. | `string` | `""` | no |
+| s3\_bucket | The S3 bucket location containing the function's deployment package. Conflicts with filename and image\_uri. This bucket must reside in the same AWS region where you are creating the Lambda function. | `string` | `null` | no |
+| s3\_key | The S3 key of an object containing the function's deployment package. Conflicts with filename and image\_uri. | `string` | `null` | no |
+| s3\_object\_version | The object version containing the function's deployment package. Conflicts with filename and image\_uri. | `string` | `null` | no |
 | source\_code\_hash | Used to trigger updates. Must be set to a base64-encoded SHA256 hash of the package file specified with either filename or s3\_key. The usual way to set this is filebase64sha256('file.zip') where 'file.zip' is the local filename of the lambda function source archive. | `string` | `""` | no |
 | ssm | List of AWS Systems Manager Parameter Store parameter names. The IAM role of this Lambda function will be enhanced with read permissions for those parameters. Parameters must start with a forward slash and can be encrypted with the default KMS key. | <pre>object({<br>    parameter_names = list(string)<br>  })</pre> | `null` | no |
 | ssm\_parameter\_names | DEPRECATED: use `ssm` object instead. This variable will be removed in version 6 of this module. (List of AWS Systems Manager Parameter Store parameters this Lambda will have access to. In order to decrypt secure parameters, a kms\_key\_arn needs to be provided as well.) | `list` | `[]` | no |
 | tags | A mapping of tags to assign to the Lambda function and all resources supporting tags. | `map(string)` | `{}` | no |
-| timeout | The amount of time your Lambda Function has to run in seconds. Defaults to 3. | `number` | `3` | no |
+| timeout | The amount of time your Lambda Function has to run in seconds. | `number` | `3` | no |
 | tracing\_config\_mode | Tracing config mode of the Lambda function. Can be either PassThrough or Active. | `string` | `null` | no |
 | vpc\_config | Provide this to allow your function to access your VPC (if both 'subnet\_ids' and 'security\_group\_ids' are empty then vpc\_config is considered to be empty or unset, see https://docs.aws.amazon.com/lambda/latest/dg/vpc.html for details). | <pre>object({<br>    security_group_ids = list(string)<br>    subnet_ids         = list(string)<br>  })</pre> | `null` | no |
 

docs/part1.md

@@ -27,11 +27,13 @@ should migrate to this module as a drop-in replacement for all provisions up to
 
 The module can be used for all [runtimes](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html) supported by AWS Lambda.
 
-Deployment packages can be specified either directly as a local file (using the `filename` argument) or indirectly via Amazon S3 (using the `s3_bucket`, `s3_key` and `s3_object_versions` arguments), see [documentation](https://www.terraform.io/docs/providers/aws/r/lambda_function.html#specifying-the-deployment-package) for details.
+Deployment packages can be specified either directly as a local file (using the `filename` argument), indirectly via Amazon S3 (using the `s3_bucket`, `s3_key` and `s3_object_versions` arguments)
+or using [container images](https://docs.aws.amazon.com/lambda/latest/dg/lambda-images.html) (using `image_uri` and `package_type` arguments),
+see [documentation](https://www.terraform.io/docs/providers/aws/r/lambda_function.html#specifying-the-deployment-package) for details.
 
-**basic**
+**simple**
 
-```terraform
+```hcl
 provider "aws" {
   region = "eu-west-1"
 }
@@ -47,9 +49,21 @@ module "lambda" {
 }
 ```
 
+**using container images**
+
+```hcl
+module "lambda" {
+  source        = "moritzzimmer/lambda/aws"
+  version       = "5.6.0"
+  function_name = "my-function"
+  image_uri     = "111111111111.dkr.ecr.eu-west-1.amazonaws.com/my-image"
+  package_type  = "Image"
+}
+```
+
 **with event trigger**
 
-```terraform
+```hcl
 module "lambda" {
   // see above
 
@@ -62,7 +76,7 @@ module "lambda" {
 
 **in a VPC**
 
-```terraform
+```hcl
 module "lambda" {
   // see above
 
@@ -75,7 +89,7 @@ module "lambda" {
 
 **with access to parameter store**
 
-```terraform
+```hcl
 module "lambda" {
   // see above
 
@@ -87,7 +101,7 @@ module "lambda" {
 
 **with log subscription (stream to ElasticSearch)**
 
-```terraform
+```hcl
 module "lambda" {
   // see above
 
@@ -97,6 +111,7 @@ module "lambda" {
 
 ### Examples
 
+- [container-image](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/container-image)
 - [example-with-cloudwatch-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-cloudwatch-event)
 - [example-with-dynamodb-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-dynamodb-event)
 - [example-with-kinesis-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-kinesis-event)
@@ -105,7 +120,7 @@ module "lambda" {
 - [example-with-sqs-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-sqs-event)
 - [example-with-ssm-permissions](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-ssm-permissions)
 - [example-with-vpc](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-with-vpc)
-- [example-without-event](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/example-without-event)
+- [simple](https://github.com/moritzzimmer/terraform-aws-lambda/tree/master/examples/simple)
 
 ### bootstrap with func