From fcecbc4cbbcf06e2d628b301b6e6df201cd5548f Mon Sep 17 00:00:00 2001 From: gmariano Date: Mon, 29 Jul 2019 10:32:31 +0200 Subject: [PATCH] Add initial dummy zip to all modules creating lambda --- apps/lambda_function/lambda.tf | 13 +++++++++++-- .../lambda.tf | 13 +++++++++++-- .../lambda.tf | 14 +++++++++++--- .../lambda.tf | 14 +++++++++++--- apps/lambda_function_event_pattern/lambda.tf | 15 +++++++++++---- apps/lambda_function_scheduled/lambda.tf | 12 +++++++++++- apps/lambda_function_scheduled_vpc/lambda.tf | 12 +++++++++++- apps/lambda_function_sns/lambda.tf | 13 +++++++++++-- apps/lambda_function_sns_no_vpc/lambda.tf | 13 +++++++++++-- apps/lambda_function_sqs_no_vpc/lambda.tf | 12 +++++++++++- apps/lambda_function_sqs_vpc/lambda.tf | 12 +++++++++++- apps/lambda_function_vpc/lambda.tf | 13 +++++++++++-- 12 files changed, 132 insertions(+), 24 deletions(-) diff --git a/apps/lambda_function/lambda.tf b/apps/lambda_function/lambda.tf index cfb188b6..df6b6eb2 100644 --- a/apps/lambda_function/lambda.tf +++ b/apps/lambda_function/lambda.tf @@ -1,10 +1,19 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" s3_bucket = "${var.lambda_bucket_name}" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" - // s3_object_version = "$LATEST" + s3_key = "${module.lambda_s3_bucket_object.key}" handler = "${var.handler}" runtime = "${var.runtime}" memory_size = "${var.memory_size}" diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/lambda.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/lambda.tf index dbb1f839..9e49ef39 100644 --- a/apps/lambda_function_api_gateway_all_methods_passthrough/lambda.tf +++ b/apps/lambda_function_api_gateway_all_methods_passthrough/lambda.tf @@ -1,7 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { s3_bucket = "${var.lambda_bucket_name}" -// s3_object_version = "$LATEST" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/lambda.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/lambda.tf index 7a2edfd7..9742c892 100644 --- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/lambda.tf +++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_authentication/lambda.tf @@ -1,8 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { s3_bucket = "${var.lambda_bucket_name}" - // filename = "${var.filename}" -// s3_object_version = "$LATEST" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/lambda.tf b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/lambda.tf index 7a2edfd7..9742c892 100644 --- a/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/lambda.tf +++ b/apps/lambda_function_api_gateway_all_methods_passthrough_no_vpc_custom_authenticator/lambda.tf @@ -1,8 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { s3_bucket = "${var.lambda_bucket_name}" - // filename = "${var.filename}" -// s3_object_version = "$LATEST" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_event_pattern/lambda.tf b/apps/lambda_function_event_pattern/lambda.tf index 5deb3c0a..af4bc30b 100644 --- a/apps/lambda_function_event_pattern/lambda.tf +++ b/apps/lambda_function_event_pattern/lambda.tf @@ -1,9 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { -// filename = "${var.filename}" -// source_code_hash = "${base64sha256(file(${var.lambda_bucket_name}/builds/lambda/${var.app_name}.zip))}" s3_bucket = "${var.lambda_bucket_name}" - // s3_object_version = "$LATEST" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_scheduled/lambda.tf b/apps/lambda_function_scheduled/lambda.tf index c5bd0ef9..9645d608 100644 --- a/apps/lambda_function_scheduled/lambda.tf +++ b/apps/lambda_function_scheduled/lambda.tf @@ -1,3 +1,13 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "${var.s3_key}" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { function_name = "${var.app_name}" description = "${var.description}" @@ -8,7 +18,7 @@ resource "aws_lambda_function" "app" { timeout = "${var.timeout}" count = "${var.enabled}" s3_bucket = "${var.s3_bucket}" - s3_key = "${var.s3_key}" + s3_key = "${module.lambda_s3_bucket_object.key}" tags = "${local.tags}" } diff --git a/apps/lambda_function_scheduled_vpc/lambda.tf b/apps/lambda_function_scheduled_vpc/lambda.tf index 02acb8d4..eda64e63 100644 --- a/apps/lambda_function_scheduled_vpc/lambda.tf +++ b/apps/lambda_function_scheduled_vpc/lambda.tf @@ -1,6 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { s3_bucket = "${var.lambda_bucket_name}" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_sns/lambda.tf b/apps/lambda_function_sns/lambda.tf index d9101eff..8311c7f4 100644 --- a/apps/lambda_function_sns/lambda.tf +++ b/apps/lambda_function_sns/lambda.tf @@ -1,7 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { s3_bucket = "${var.lambda_bucket_name}" -// s3_object_version = "$LATEST" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_sns_no_vpc/lambda.tf b/apps/lambda_function_sns_no_vpc/lambda.tf index 7cd9bfeb..a01cdb52 100644 --- a/apps/lambda_function_sns_no_vpc/lambda.tf +++ b/apps/lambda_function_sns_no_vpc/lambda.tf @@ -1,7 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { s3_bucket = "${var.lambda_bucket_name}" -// s3_object_version = "$LATEST" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_sqs_no_vpc/lambda.tf b/apps/lambda_function_sqs_no_vpc/lambda.tf index f621ccdb..25f1db7b 100644 --- a/apps/lambda_function_sqs_no_vpc/lambda.tf +++ b/apps/lambda_function_sqs_no_vpc/lambda.tf @@ -1,6 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { s3_bucket = "${var.lambda_bucket_name}" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_sqs_vpc/lambda.tf b/apps/lambda_function_sqs_vpc/lambda.tf index e4225be1..7cd0dac6 100644 --- a/apps/lambda_function_sqs_vpc/lambda.tf +++ b/apps/lambda_function_sqs_vpc/lambda.tf @@ -1,6 +1,16 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { s3_bucket = "${var.lambda_bucket_name}" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" + s3_key = "${module.lambda_s3_bucket_object.key}" function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" diff --git a/apps/lambda_function_vpc/lambda.tf b/apps/lambda_function_vpc/lambda.tf index 274e983b..5e57f9c3 100644 --- a/apps/lambda_function_vpc/lambda.tf +++ b/apps/lambda_function_vpc/lambda.tf @@ -1,10 +1,19 @@ +module "lambda_s3_bucket_object" { + source = "../../apps/lambda_s3_bucket_object" + lambda_bucket_name = "${var.lambda_bucket_name}" + s3_object_key = "builds/lambda/${var.app_name}/lambda.zip" + tags = "${local.tags}" + providers = { + aws = "aws" + } +} + resource "aws_lambda_function" "app" { function_name = "${var.app_name}" description = "${var.description}" role = "${aws_iam_role.iam_for_app.arn}" s3_bucket = "${var.lambda_bucket_name}" - s3_key = "builds/lambda/${var.app_name}/lambda.zip" - // s3_object_version = "$LATEST" + s3_key = "${module.lambda_s3_bucket_object.key}" handler = "${var.handler}" runtime = "${var.runtime}" memory_size = "${var.memory_size}"