feat: added docker support, closes #21

and added domain url, closes #15

Author: yoshutch

README.md

@@ -26,31 +26,26 @@ Also Note: CodePipeline and CodeDeploy cannot be used together to deploy a Lambd
 ## Usage
 ```hcl
 module "lambda_api" {
-  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v1.3.0"
-  app_name                      = "my-lambda"
-  env                           = "dev"
-  codedeploy_service_role_arn   = module.acs.power_builder_role.arn
-  lambda_zip_file               = "./src/lambda.zip"
-  handler                       = "index.handler"
-  runtime                       = "nodejs12.x"
+  source   = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.0.0"
+  app_name = "my-lambda-dev"
+  env      = "dev"
+  zip_file = {
+    filename = "./src/lambda.zip"
+    handler  = "index.handler"
+    runtime  = "nodejs12.x"
+  }
   hosted_zone                   = module.acs.route53_zone
   https_certificate_arn         = module.acs.certificate.arn
   vpc_id                        = module.acs.vpc.id
   public_subnet_ids             = module.acs.public_subnet_ids
   role_permissions_boundary_arn = module.acs.role_permissions_boundary.arn
-  codedeploy_test_listener_port = 4443
-  use_codedeploy                = true
-  timeout                       = 3
-  memory_size                   = 128
-
-  lambda_vpc_config = {
-    subnet_ids         = module.acs.private_subnet_ids
-    security_group_ids = ["sg-3asdfadsfasdfas"]
-  }
-
-  codedeploy_lifecycle_hooks = {
-    BeforeAllowTraffic = aws_lambda_function.test_lambda.function_name
-    AfterAllowTraffic  = null
+  codedeploy_config = {
+    service_role_arn   = module.acs.power_builder_role.arn
+    test_listener_port = 4443
+    lifecycle_hooks = {
+      BeforeAllowTraffic = aws_lambda_function.test_lambda.function_name
+      AfterAllowTraffic  = null
+    }
   }
 }
 ```
@@ -79,29 +74,30 @@ module "lambda_api" {
 ## Inputs
 | Name | Type  | Description | Default |
 | --- | --- | --- | --- |
-| app_name | string | application name |
-| env | string | application environment (e.g. dev, stg, prd) |
-| codedeploy_service_role_arn | string | ARN of the IAM Role for the CodeDeploy to use to initiate new deployments. (usually the PowerBuilder Role) |
-| lambda_zip_file | string | File that contains your compiled or zipped source code. |
-| handler | string | Lambda event handler |
-| runtime | string | Lambda runtime |
-| lambda_vpc_config | [object](#lambda_vpc_config) | Lambda VPC object. Used if lambda requires to run inside a VPC | null
-| environment_variables | map(string) | A map that defines environment variables for the Lambda function. |
-| hosted_zone | [object](#hosted_zone) | Hosted Zone object to redirect to ALB. (Can pass in the aws_hosted_zone object). A and AAAA records created in this hosted zone. |
-| https_certificate_arn | string | ARN of the HTTPS certificate of the hosted zone/domain. |
-| codedeploy_lifecycle_hooks | [object](#codedeploy_lifecycle_hooks) | Define Lambda Functions for CodeDeploy lifecycle event hooks. Or set this variable to null to not have any lifecycle hooks invoked. Defaults to null | null
-| appspec_filename | string | Filename (including path) to use when outputing appspec json. | `appspec.json` in the current working directory (i.e. where you ran `terraform apply`) |
-| codedeploy_test_listener_port | number | The port for a codedeploy test listener. If provided CodeDeploy will use this port for test traffic on the new replacement set during the blue-green deployment process before shifting production traffic to the replacement set. Defaults to null | null
-| vpc_id | string | VPC ID to deploy ALB and Lambda (If specified). |
-| public_subnet_ids | list(string) | List of subnet IDs for the ALB. |
-| tags | map(string) | A map of AWS Tags to attach to each resource created | {}
-| role_permissions_boundary_arn | string | IAM Role Permissions Boundary ARN |
-| log_retention_in_days | number | CloudWatch log group retention in days. Defaults to 7. | 7
-| lambda_policies | list(string) | List of IAM Policy ARNs to attach to the lambda role. | []'
-| use_codedeploy | bool | If true, CodeDeploy App and Deployment Group will be created and TF will not update alias to point to new versions of the Lambda (becuase CodeDeploy will do that). | false
-| timeout | number | How long the lambda will run (in seconds) before timing out | 3 (same as terraform default)
-| memory_size | number | Size of the memory of the lambda. CPU will scale along with it | 128 (same as terraform default)
-| xray_enabled | bool | Whether or not the X-Ray daemon should be created with the Lambda API. | false
+| app_name | string | application name (include the env aka. 'my-api-dev') | |
+| zip_file | [object](#zip_file_config) | configuration for a zip file lambda (conflicts with `image_uri`) | null |
+| image_uri | string | ECR Image URI containing the function's deployment package (conflicts with `zip_file`)| null |
+| lambda_vpc_config | [object](#lambda_vpc_config) | Lambda VPC object. Used if lambda requires to run inside a VPC | null |
+| environment_variables | map(string) | A map that defines environment variables for the Lambda function. | |
+| domain_url | string | Custom domain URL for the API, defaults to <app_name>.<hosted_zone_domain> | null | |
+| hosted_zone | [object](#hosted_zone) | Hosted Zone object to redirect to ALB. (Can pass in the aws_hosted_zone object). A and AAAA records created in this hosted zone. | |
+| https_certificate_arn | string | ARN of the HTTPS certificate of the hosted zone/domain. | |
+| codedeploy_config | [object](#codedeploy_config) | Configuration for putting CodeDeploy on the lambda | null |
+| vpc_id | string | VPC ID to deploy ALB and Lambda (If specified). | |
+| public_subnet_ids | list(string) | List of subnet IDs for the ALB. | |
+| tags | map(string) | A map of AWS Tags to attach to each resource created | {} |
+| role_permissions_boundary_arn | string | IAM Role Permissions Boundary ARN | |
+| log_retention_in_days | number | CloudWatch log group retention in days. Defaults to 7. | 7 |
+| lambda_policies | list(string) | List of IAM Policy ARNs to attach to the lambda role. | []' |
+| timeout | number | How long the lambda will run (in seconds) before timing out | 3 (same as terraform default) |
+| memory_size | number | Size of the memory of the lambda. CPU will scale along with it | 128 (same as terraform default) |
+| xray_enabled | bool | Whether or not the X-Ray daemon should be created with the Lambda API. | false |
+
+#### zip_file_config
+This configuration is used for when you are including the zipped up code for the lambda instead of using the `image_uri`
+* `filename` - (string) File that contains your compiled or zipped source code
+* `handler` - (string) Lambda event handler
+* `runtime` - (string) Lambda runtime
 
 #### lambda_vpc_config
 
@@ -110,6 +106,13 @@ This variable is used when the lambda needs to be run from within a VPC.
 * **`subnet_ids`** - List of subnet IDs for the Lambda service. 
 * **`security_group_ids`** - List of extra security group IDs to attach to the lambda.
 
+#### codedeploy_config
+If this configuration is included then this module will add the CodeDeploy App and Group required to deploy new versions of the Lambda through CodeDeploy, also allowing for the use of the LifeCycle hooks. 
+* `service_role_arn` - (string) ARN of the IAM Role for the CodeDeploy to use to initiate new deployments (usually the PowerBuilder Role)
+* `lifecycle_hooks` - ([object](#codedeploy_lifecycle_hooks)) | Define Lambda Functions for CodeDeploy lifecycle event hooks. Or set this variable to null to not have any lifecycle hooks invoked
+* `appspec_filename` - (string) Filename (including path) to use when outputing appspec json (defaults to `appspec.json` in the current working directory)
+* `test_listener_port` - (number) The port for a codedeploy test listener. If provided CodeDeploy will use this port for test traffic on the new replacement set during the blue-green deployment process before shifting production traffic to the replacement set
+
 #### codedeploy_lifecycle_hooks
 
 This variable is used when generating the [appspec.json](#appspec) file. This will define what Lambda Functions to invoke 
@@ -128,7 +131,7 @@ You can pass in either the object from the AWS terraform provider for an AWS Hos
 
 #### CloudWatch logs
 
-This module will create a CloudWatch log group named `/aws/lambda/<app_name>-<env>`.
+This module will create a CloudWatch log group named `/aws/lambda/<app_name>`.
 
 For instance with the [above example](#usage) the logs could be found in the CloudWatch log group: `aws/lambda/my-lambda-dev`.
 

examples/ci-12/ci.tf

@@ -8,16 +8,17 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v2.1.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
 }
 
-module "lambda_api" {
-  source                        = "../../"
-  app_name                      = "my-lambda"
-  env                           = "dev"
-  lambda_zip_file               = "./lambda.zip"
-  handler                       = "index.handler"
-  runtime                       = "nodejs12.x"
+module "lambda_zip_api" {
+  source   = "../../"
+  app_name = "my-lambda"
+  zip_file = {
+    filename = "./lambda.zip"
+    handler  = "index.handler"
+    runtime  = "nodejs12.x"
+  }
   hosted_zone                   = module.acs.route53_zone
   https_certificate_arn         = module.acs.certificate.arn
   vpc_id                        = module.acs.vpc.id
@@ -31,38 +32,19 @@ module "lambda_api" {
   }
 }
 
-output "lambda" {
-  value = module.lambda_api.lambda
-}
-
-output "lambda_security_group" {
-  value = module.lambda_api.lambda_security_group
-}
-
-output "lambda_live_alias" {
-  value = module.lambda_api.lambda_live_alias
-}
-
-output "codedeploy_deployment_group" {
-  value = module.lambda_api.codedeploy_deployment_group
-}
-
-output "codedeploy_appspec_json_file" {
-  value = module.lambda_api.codedeploy_appspec_json_file
-}
-
-output "alb" {
-  value = module.lambda_api.alb
-}
-
-output "alb_security_group" {
-  value = module.lambda_api.alb_security_group
-}
-
-output "dns_record" {
-  value = module.lambda_api.dns_record
-}
+module "lambda_docker_api" {
+  source                        = "../../"
+  app_name                      = "my-docker-lambda"
+  image_uri                     = "crccheck/hello-world:latest"
+  hosted_zone                   = module.acs.route53_zone
+  https_certificate_arn         = module.acs.certificate.arn
+  vpc_id                        = module.acs.vpc.id
+  public_subnet_ids             = module.acs.public_subnet_ids
+  role_permissions_boundary_arn = module.acs.role_permissions_boundary.arn
+  xray_enabled                  = true
 
-output "cloudwatch_log_group" {
-  value = module.lambda_api.cloudwatch_log_group
+  lambda_vpc_config = {
+    subnet_ids         = module.acs.private_subnet_ids
+    security_group_ids = []
+  }
 }

examples/ci-13/ci.tf

@@ -8,16 +8,17 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.1.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
 }
 
 module "lambda_api" {
-  source                        = "../../"
-  app_name                      = "my-lambda"
-  env                           = "dev"
-  lambda_zip_file               = "./lambda.zip"
-  handler                       = "index.handler"
-  runtime                       = "nodejs12.x"
+  source   = "../../"
+  app_name = "my-lambda"
+  zip_file = {
+    filename = "./lambda.zip"
+    handler  = "index.handler"
+    runtime  = "nodejs12.x"
+  }
   hosted_zone                   = module.acs.route53_zone
   https_certificate_arn         = module.acs.certificate.arn
   vpc_id                        = module.acs.vpc.id
@@ -31,38 +32,19 @@ module "lambda_api" {
   }
 }
 
-output "lambda" {
-  value = module.lambda_api.lambda
-}
-
-output "lambda_security_group" {
-  value = module.lambda_api.lambda_security_group
-}
-
-output "lambda_live_alias" {
-  value = module.lambda_api.lambda_live_alias
-}
-
-output "codedeploy_deployment_group" {
-  value = module.lambda_api.codedeploy_deployment_group
-}
-
-output "codedeploy_appspec_json_file" {
-  value = module.lambda_api.codedeploy_appspec_json_file
-}
-
-output "alb" {
-  value = module.lambda_api.alb
-}
-
-output "alb_security_group" {
-  value = module.lambda_api.alb_security_group
-}
-
-output "dns_record" {
-  value = module.lambda_api.dns_record
-}
+module "lambda_docker_api" {
+  source                        = "../../"
+  app_name                      = "my-docker-lambda"
+  image_uri                     = "crccheck/hello-world:latest"
+  hosted_zone                   = module.acs.route53_zone
+  https_certificate_arn         = module.acs.certificate.arn
+  vpc_id                        = module.acs.vpc.id
+  public_subnet_ids             = module.acs.public_subnet_ids
+  role_permissions_boundary_arn = module.acs.role_permissions_boundary.arn
+  xray_enabled                  = true
 
-output "cloudwatch_log_group" {
-  value = module.lambda_api.cloudwatch_log_group
+  lambda_vpc_config = {
+    subnet_ids         = module.acs.private_subnet_ids
+    security_group_ids = []
+  }
 }

examples/docker-lambda/docker.tf

@@ -0,0 +1,65 @@
+terraform {
+  required_version = "0.13.4"
+}
+
+provider "aws" {
+  version = "~> 3.0"
+  region  = "us-west-2"
+}
+
+module "acs" {
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
+}
+
+module "lambda_api" {
+  source                        = "../../"
+  app_name                      = "my-docker-lambda"
+  image                         = "my-image-from-my-ecr:latest"
+  hosted_zone                   = module.acs.route53_zone
+  https_certificate_arn         = module.acs.certificate.arn
+  vpc_id                        = module.acs.vpc.id
+  public_subnet_ids             = module.acs.public_subnet_ids
+  role_permissions_boundary_arn = module.acs.role_permissions_boundary.arn
+  xray_enabled                  = true
+
+  lambda_vpc_config = {
+    subnet_ids         = module.acs.private_subnet_ids
+    security_group_ids = []
+  }
+}
+
+output "lambda" {
+  value = module.lambda_api.lambda
+}
+
+output "lambda_security_group" {
+  value = module.lambda_api.lambda_security_group
+}
+
+output "lambda_live_alias" {
+  value = module.lambda_api.lambda_live_alias
+}
+
+output "codedeploy_deployment_group" {
+  value = module.lambda_api.codedeploy_deployment_group
+}
+
+output "codedeploy_appspec_json_file" {
+  value = module.lambda_api.codedeploy_appspec_json_file
+}
+
+output "alb" {
+  value = module.lambda_api.alb
+}
+
+output "alb_security_group" {
+  value = module.lambda_api.alb_security_group
+}
+
+output "dns_record" {
+  value = module.lambda_api.dns_record
+}
+
+output "cloudwatch_log_group" {
+  value = module.lambda_api.cloudwatch_log_group
+}

examples/no-codedeploy/example.tf

@@ -4,17 +4,18 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.2.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
 }
 
 module "lambda_api" {
-  // source                        = "../../"
-  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v1.3.0"
-  app_name                      = "my-lambda"
-  env                           = "dev"
-  lambda_zip_file               = "./src/lambda.zip"
-  handler                       = "index.handler"
-  runtime                       = "nodejs12.x"
+  source = "../../"
+  #  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v1.3.0"
+  app_name = "my-lambda-dev"
+  zip_file = {
+    filename = "./src/lambda.zip"
+    handler  = "index.handler"
+    runtime  = "nodejs12.x"
+  }
   hosted_zone                   = module.acs.route53_zone
   https_certificate_arn         = module.acs.certificate.arn
   vpc_id                        = module.acs.vpc.id

examples/simple-lambda-in-vpc/example.tf

@@ -4,17 +4,18 @@ provider "aws" {
 }
 
 module "acs" {
-  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v2.1.0"
+  source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.4.0"
 }
 
 module "lambda_api" {
   # source                        = "../../"
-  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v1.3.0"
-  app_name                      = "my-lambda"
-  env                           = "dev"
-  lambda_zip_file               = "./src/lambda.zip"
-  handler                       = "index.handler"
-  runtime                       = "nodejs12.x"
+  source   = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.0.0"
+  app_name = "my-lambda-dev"
+  zip_file = {
+    filename = "./src/lambda.zip"
+    handler  = "index.handler"
+    runtime  = "nodejs12.x"
+  }
   hosted_zone                   = module.acs.route53_zone
   https_certificate_arn         = module.acs.certificate.arn
   vpc_id                        = module.acs.vpc.id