Merge pull request #2 from byu-oit/feature/jar-support

feature/jar-support -> master

Author: joshgubler

README.md

@@ -18,11 +18,11 @@ This is done by:
 ## Usage
 ```hcl
 module "lambda_api" {
-  source                        = "../../"
+  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v0.0.2"
   app_name                      = "my-lambda"
   env                           = "dev"
   codedeploy_service_role_arn   = module.acs.power_builder_role.arn
-  lambda_src_dir                = "./src"
+  lambda_zip_file               = "./src/lambda.zip"
   handler                       = "index.handler"
   runtime                       = "nodejs12.x"
   hosted_zone                   = module.acs.route53_zone
@@ -69,7 +69,7 @@ module "lambda_api" {
 | 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_src_dir | string | Directory that contains your lambda source code |
+| lambda_zip_file | string | File that contains your compiled or zipped source code. |
 | handler | string | Lambda event handler |
 | runtime | string | Lambda runtime |
 | environment_variables | map(string) | A map that defines environment variables for the Lambda function. |

examples/simple-lambda-with-deploy-test/example.tf

@@ -8,11 +8,12 @@ module "acs" {
 }
 
 module "lambda_api" {
-  source                        = "../../"
+  // source                        = "../../"
+  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v0.0.2"
   app_name                      = "my-lambda"
   env                           = "dev"
   codedeploy_service_role_arn   = module.acs.power_builder_role.arn
-  lambda_src_dir                = "./src"
+  lambda_zip_file               = "./src/lambda.zip"
   handler                       = "index.handler"
   runtime                       = "nodejs12.x"
   hosted_zone                   = module.acs.route53_zone

main.tf

@@ -219,12 +219,6 @@ resource "aws_iam_role_policy_attachment" "lambda_policy_attach" {
   role       = aws_iam_role.iam_for_lambda.name
 }
 
-data "archive_file" "cleanup_lambda_zip" {
-  source_dir  = var.lambda_src_dir
-  output_path = "lambda_function_payload.zip"
-  type        = "zip"
-}
-
 # TODO: the SG fails to destroy because the lambda's ENI is still using it.
 resource "aws_security_group" "lambda_sg" {
   name        = "${local.long_name}-lambda-sg"
@@ -243,8 +237,8 @@ resource "aws_security_group" "lambda_sg" {
 }
 
 resource "aws_lambda_function" "api_lambda" {
-  filename         = data.archive_file.cleanup_lambda_zip.output_path
-  source_code_hash = data.archive_file.cleanup_lambda_zip.output_base64sha256
+  filename         = var.lambda_zip_file
+  source_code_hash = filebase64sha256(var.lambda_zip_file)
   function_name    = local.long_name
   role             = aws_iam_role.iam_for_lambda.arn
   handler          = var.handler

variables.tf

@@ -13,9 +13,9 @@ variable "codedeploy_service_role_arn" {
   description = "ARN of the IAM Role for the CodeDeploy to use to initiate new deployments. (usually the PowerBuilder Role)"
 }
 
-variable "lambda_src_dir" {
+variable "lambda_zip_file" {
   type        = string
-  description = "Directory that contains your lambda source code"
+  description = "File that contains your compiled or zipped source code."
 }
 
 variable "handler" {