Merge

Author: npalm

modules/runner-binaries-syncer/runner-binaries-syncer.tf

@@ -1,11 +1,15 @@
+locals {
+  lambda_zip = var.lambda_zip == null ? "${path.module}/lambdas/runner-binaries-syncer/runner-binaries-syncer.zip" : var.lambda_zip
+}
+
 resource "aws_lambda_function" "syncer" {
-  filename         = "${path.module}/lambdas/runner-binaries-syncer/runner-binaries-syncer.zip"
-  source_code_hash = filebase64sha256("${path.module}/lambdas/runner-binaries-syncer/runner-binaries-syncer.zip")
+  filename         = local.lambda_zip
+  source_code_hash = filebase64sha256(local.lambda_zip)
   function_name    = "${var.environment}-syncer"
   role             = aws_iam_role.syncer_lambda.arn
   handler          = "index.handler"
   runtime          = "nodejs12.x"
-  timeout          = 300
+  timeout          = var.lambda_timeoutp
 
   environment {
     variables = {

modules/runner-binaries-syncer/variables.tf

@@ -24,3 +24,15 @@ variable "lambda_schedule_expression" {
   type        = string
   default     = "cron(27 * * * ? *)"
 }
+
+variable "lambda_zip" {
+  description = "File location of the lambda zip file."
+  type        = string
+  default     = null
+}
+
+variable "lambda_timeoutp" {
+  description = "Time out of the lambda in seconds."
+  type        = number
+  default     = 300
+}

modules/runners/main.tf

@@ -13,6 +13,7 @@ locals {
   name_sg     = var.overrides["name_sg"] == "" ? local.tags["Name"] : var.overrides["name_sg"]
   name_runner = var.overrides["name_runner"] == "" ? local.tags["Name"] : var.overrides["name_runner"]
 
+  lambda_zip = var.lambda_zip == null ? "${path.module}/lambdas/scale-runners/scale-runners.zip" : var.lambda_zip
 }
 
 data "aws_ami" "runner" {

modules/runners/scale-down.tf

@@ -1,11 +1,11 @@
 resource "aws_lambda_function" "scale_down" {
-  filename         = "${path.module}/lambdas/scale-runners/scale-runners.zip"
-  source_code_hash = filebase64sha256("${path.module}/lambdas/scale-runners/scale-runners.zip")
+  filename         = local.lambda_zip
+  source_code_hash = filebase64sha256(local.lambda_zip)
   function_name    = "${var.environment}-scale-down"
   role             = aws_iam_role.scale_down.arn
   handler          = "index.scaleDown"
   runtime          = "nodejs12.x"
-  timeout          = 60
+  timeout          = var.lambda_timeout_scale_down
 
   environment {
     variables = {

modules/runners/scale-up.tf

@@ -1,11 +1,11 @@
 resource "aws_lambda_function" "scale_up" {
-  filename         = "${path.module}/lambdas/scale-runners/scale-runners.zip"
-  source_code_hash = filebase64sha256("${path.module}/lambdas/scale-runners/scale-runners.zip")
+  filename         = local.lambda_zip
+  source_code_hash = filebase64sha256(local.lambda_zip)
   function_name    = "${var.environment}-scale-up"
   role             = aws_iam_role.scale_up.arn
   handler          = "index.scaleUp"
   runtime          = "nodejs12.x"
-  timeout          = 60
+  timeout          = var.lambda_timeout_scale_up
 
   environment {
     variables = {

modules/runners/variables.tf

@@ -126,3 +126,22 @@ variable "runner_extra_labels" {
   type        = string
   default     = ""
 }
+
+variable "lambda_zip" {
+  description = "File location of the lambda zip file."
+  type        = string
+  default     = null
+}
+
+variable "lambda_timeout_scale_down" {
+  description = "Time out for the scale down lambda in seconds."
+  type        = number
+  default     = 60
+}
+
+variable "lambda_timeout_scale_up" {
+  description = "Time out for the scale up lambda in seconds."
+  type        = number
+  default     = 60
+}
+

modules/webhook/main.tf

@@ -1,5 +1,6 @@
 locals {
   webhook_endpoint = "webhook"
+  lambda_zip       = var.lambda_zip == null ? "${path.module}/lambdas/webhook/webhook.zip" : var.lambda_zip
 }
 
 resource "aws_apigatewayv2_api" "webhook" {
@@ -47,14 +48,14 @@ resource "aws_apigatewayv2_integration" "webhook" {
   integration_uri    = aws_lambda_function.webhook.invoke_arn
 }
 
-
 resource "aws_lambda_function" "webhook" {
-  filename         = "${path.module}/lambdas/webhook/webhook.zip"
-  source_code_hash = filebase64sha256("${path.module}/lambdas/webhook/webhook.zip")
+  filename         = local.lambda_zip
+  source_code_hash = filebase64sha256(local.lambda_zip)
   function_name    = "${var.environment}-webhook"
   role             = aws_iam_role.webhook_lambda.arn
   handler          = "index.githubWebhook"
   runtime          = "nodejs12.x"
+  timeout          = var.lambda_timeoutp
 
   environment {
     variables = {

modules/webhook/variables.tf

@@ -29,3 +29,15 @@ variable "create_sqs_publish_policy" {
   type    = bool
   default = true
 }
+
+variable "lambda_zip" {
+  description = "File location of the lambda zip file."
+  type        = string
+  default     = null
+}
+
+variable "lambda_timeoutp" {
+  description = "Time out of the lambda in seconds."
+  type        = number
+  default     = 300
+}