Update module versions, examples and tests (#24)

* Update module versions

* Update module versions

* Update module versions, examples and tests

* Update module versions, examples and tests

* Update module versions, examples and tests

* Update module versions, examples and tests

* Update module versions, examples and tests

* Update module versions, examples and tests

* Update module versions, examples and tests

Author: aknysh

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 Cloud Posse, LLC
+   Copyright 2021-2022 Cloud Posse, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -52,16 +52,16 @@ related:
     url: "https://github.com/cloudposse/terraform-null-label"
 
 description: |-
-  This module deploys an AWS Lambda function from a zip file or from a docker image. Additionally, it creates an IAM 
-  role for the Lambda function, which optionally attaches policies to allow for Cloudwatch Logs, Cloudwatch Insights, 
+  This module deploys an AWS Lambda function from a Zip file or from a Docker image. Additionally, it creates an IAM 
+  role for the Lambda function, which optionally attaches policies to allow for CloudWatch Logs, Cloudwatch Insights, 
   VPC Access and X-Ray tracing.
-    # Example usage
 
 # How to use this module. Should be an easy example to copy and paste.
 usage: |-
   For a complete example, see [examples/complete](examples/complete).
   For automated tests of the complete example using [bats](https://github.com/bats-core/bats-core) and [Terratest](https://github.com/gruntwork-io/terratest)
   (which tests and deploys the example on AWS), see [test](test).
+  
   ```hcl
   module "lambda" {
     source  = "cloudposse/lambda-function/aws"
@@ -75,8 +75,8 @@ usage: |-
   ```
 
 examples: |-
-  Here is an example of using this module:
-  - [`examples/complete`](https://github.com/cloudposse/terraform-aws-lambda-function/) - complete example of using this module
+  - [`examples/complete`](https://github.com/cloudposse/terraform-aws-lambda-function/examples/complete) - complete example of using this module
+  - [`examples/docker-image`](https://github.com/cloudposse/terraform-aws-lambda-function/examples/docker-image) - example of using Lambda with Docker images
 
 # Other files to include in this README from the project folder
 include:
@@ -89,3 +89,5 @@ contributors:
     github: "mcalhoun"
   - name: "PePe Amengual"
     github: "jamengual"
+  - name: "Andriy Knysh"
+    github: "aknysh"

README.yaml

@@ -3,6 +3,6 @@ namespace   = "eg"
 environment = "ue2"
 stage       = "test"
 
-function_name = "example-complete-function"
+function_name = "example-complete"
 handler       = "handler.handler"
 runtime       = "nodejs14.x"

docs/terraform.md

@@ -1,3 +1,3 @@
 exports.handler = async function (_event, _context) {
-  return { data: "Hello World" };
+    return {data: "Hello World"};
 };

examples/complete/fixtures.us-east-2.tfvars

@@ -10,6 +10,7 @@ locals {
     join("", data.aws_partition.current.*.partition),
     join("", data.aws_caller_identity.current.*.account_id),
   )
+
   policy_arn_inside = format("%s/%s", local.policy_arn_prefix, local.policy_name_inside)
 
   policy_json = jsonencode({
@@ -53,7 +54,7 @@ resource "aws_iam_policy" "inside" {
   count       = local.enabled ? 1 : 0
   name        = local.policy_name_inside
   path        = "/"
-  description = "My policy attached inside the lambda module"
+  description = "The policy attached inside the Lambda module"
 
   policy = local.policy_json
 }
@@ -62,7 +63,7 @@ resource "aws_iam_policy" "outside" {
   count       = local.enabled ? 1 : 0
   name        = local.policy_name_outside
   path        = "/"
-  description = "My policy attached outside the lambda module"
+  description = "The policy attached outside the Lambda module"
 
   policy = local.policy_json
 }
@@ -76,10 +77,11 @@ resource "aws_iam_role_policy_attachment" "outside" {
 module "lambda" {
   source = "../.."
 
-  filename      = join("", data.archive_file.lambda_zip.*.output_path)
-  function_name = module.label.id
-  handler       = var.handler
-  runtime       = var.runtime
+  filename               = join("", data.archive_file.lambda_zip.*.output_path)
+  function_name          = module.label.id
+  handler                = var.handler
+  runtime                = var.runtime
+  iam_policy_description = var.iam_policy_description
 
   custom_iam_policy_arns = [
     "arn:aws:iam::aws:policy/job-function/ViewOnlyAccess",
@@ -89,7 +91,5 @@ module "lambda" {
 
   context = module.this.context
 
-  depends_on = [
-    aws_iam_policy.inside,
-  ]
+  depends_on = [aws_iam_policy.inside]
 }

examples/complete/handler.js

@@ -4,18 +4,24 @@ variable "region" {
 }
 
 variable "function_name" {
-  description = "Unique name for the Lambda Function."
   type        = string
+  description = "Unique name for the Lambda Function."
 }
 
 variable "handler" {
+  type        = string
   description = "The function entrypoint in your code."
   default     = ""
-  type        = string
 }
 
 variable "runtime" {
+  type        = string
   description = "The runtime environment for the Lambda function you are uploading."
   default     = ""
+}
+
+variable "iam_policy_description" {
   type        = string
+  description = "Description of the IAM policy for the Lambda IAM role"
+  default     = "Minimum SSM read permissions for Lambda"
 }

examples/complete/main.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 0.14"
 
   required_providers {
     aws = {

examples/complete/variables.tf

@@ -6,4 +6,4 @@ COPY handler.js ${LAMBDA_TASK_ROOT}
 ENV NODE_ENV=production
 
 # start app
-CMD [ "handler.handler" ]
+CMD [ "handler.handler" ]