Merge pull request #28 from byu-oit/patch/function-name

fix: update function name so terraform can deploy resources in the right order

Author: stuft2

README.md

@@ -27,7 +27,7 @@ Also Note: CodePipeline and CodeDeploy cannot be used together to deploy a Lambd
 For a Zip file lambda
 ```hcl
 module "lambda_api" {
-  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.0"
+  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
   app_name     = "my-lambda-codedeploy-dev"
   zip_filename = "./src/lambda.zip"
   zip_handler  = "index.handler"
@@ -50,7 +50,7 @@ module "lambda_api" {
 For a docker image lambda:
 ```hcl
 module "lambda_api" {
-  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.0"
+  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
   app_name                      = "my-docker-lambda"
   image_uri                     = "my-image-from-my-ecr:latest"
   hosted_zone                   = module.acs.route53_zone

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.1.1
+4/25/2022 - fixed race condition when resources depend on the function existing before their creation
+- updated references to the lambda arn where it should be the function name
+
 ## v2.1.0
 4/22/2022 - `lambda_layers` variable added as pass-through to `layers` variable of `aws_lambda_function` resource
 

examples/docker-lambda/docker.tf

@@ -9,7 +9,7 @@ module "acs" {
 
 module "lambda_api" {
   #  source                        = "../../"
-  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.0"
+  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
   app_name                      = "my-docker-lambda"
   image_uri                     = "my-image-from-my-ecr:latest"
   hosted_zone                   = module.acs.route53_zone

examples/no-codedeploy/example.tf

@@ -9,7 +9,7 @@ module "acs" {
 
 module "lambda_api" {
   #  source = "../../"
-  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.0"
+  source                        = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
   app_name                      = "my-lambda-dev"
   zip_filename                  = "./src/lambda.zip"
   zip_handler                   = "index.handler"

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

@@ -9,7 +9,7 @@ module "acs" {
 
 module "lambda_api" {
   # source                        = "../../"
-  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.0"
+  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
   app_name     = "my-lambda-dev"
   zip_filename = "./src/lambda.zip"
   zip_handler  = "index.handler"

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

@@ -9,7 +9,7 @@ module "acs" {
 
 module "lambda_api" {
   #  source = "../../"
-  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.0"
+  source       = "github.com/byu-oit/terraform-aws-lambda-api?ref=v2.1.1"
   app_name     = "my-lambda-codedeploy-dev"
   env          = "dev"
   zip_filename = "./src/lambda.zip"

main.tf

@@ -140,7 +140,7 @@ resource "aws_alb_listener" "http_to_https" {
 resource "aws_lambda_permission" "with_lb" {
   statement_id  = "AllowExecutionFromlb"
   action        = "lambda:InvokeFunction"
-  function_name = var.app_name
+  function_name = local.use_zip ? aws_lambda_function.zip_api[0].function_name : aws_lambda_function.docker_api[0].function_name
   principal     = "elasticloadbalancing.amazonaws.com"
   source_arn    = aws_alb_target_group.tg.arn
   qualifier     = local.use_codedeploy ? aws_lambda_alias.live_codedeploy[0].name : aws_lambda_alias.live[0].name
@@ -150,7 +150,7 @@ resource "aws_lambda_permission" "with_tst_lb" {
   count         = local.use_codedeploy ? 1 : 0
   statement_id  = "AllowExecutionFromlb"
   action        = "lambda:InvokeFunction"
-  function_name = var.app_name
+  function_name = local.use_zip ? aws_lambda_function.zip_api[0].function_name : aws_lambda_function.docker_api[0].function_name
   principal     = "elasticloadbalancing.amazonaws.com"
   source_arn    = aws_alb_target_group.tst_tg[0].arn
 }
@@ -310,15 +310,15 @@ resource "aws_lambda_alias" "live" {
   count            = !local.use_codedeploy ? 1 : 0
   name             = "live"
   description      = "ALB sends traffic to this version"
-  function_name    = local.use_zip ? aws_lambda_function.zip_api[0].arn : aws_lambda_function.docker_api[0].arn
+  function_name    = local.use_zip ? aws_lambda_function.zip_api[0].function_name : aws_lambda_function.docker_api[0].function_name
   function_version = local.use_zip ? aws_lambda_function.zip_api[0].version : aws_lambda_function.docker_api[0].version
 }
 
 resource "aws_lambda_alias" "live_codedeploy" {
   count         = local.use_codedeploy ? 1 : 0
   name          = "live"
   description   = "ALB sends traffic to this version"
-  function_name = var.app_name
+  function_name = local.use_zip ? aws_lambda_function.zip_api[0].function_name : aws_lambda_function.docker_api[0].function_name
   # Get the version of the lambda when it is first created
   function_version = local.use_zip ? aws_lambda_function.zip_api[0].version : aws_lambda_function.docker_api[0].version
   # Let CodeDeploy handle changes to the function version that this alias refers to