CCM-14149: Support Container Based Lambdas

Author: jamesthompson26-nhs

infrastructure/modules/lambda/data_archive_file_lambda.tf

@@ -1,5 +1,5 @@
 data "archive_file" "lambda" {
-  count = var.package_type == "Zip" ? 1 : 0
+  count = local.package_type == "zip" ? 1 : 0
   type       = "zip"
   source_dir = "${path.root}/${var.function_code_base_path}/${var.function_code_dir}"
 

infrastructure/modules/lambda/data_iam_policy_document_ecr.tf

@@ -18,6 +18,9 @@ data "aws_iam_policy_document" "ecr" {
       "ecr:BatchCheckLayerAvailability",
     ]
 
-    resources = ["arn:aws:ecr:${var.region}:${var.aws_account_id}:repository/*"]
+    resources = [
+      for repo_name in var.image_repository_names :
+      "arn:aws:ecr:${var.region}:${var.aws_account_id}:repository/${repo_name}"
+    ]
   }
 }

infrastructure/modules/lambda/iam_role_policy_ecr.tf

@@ -1,5 +1,5 @@
 resource "aws_iam_role_policy" "ecr" {
-  count  = var.package_type == "Image" ? 1 : 0
+  count  = local.package_type == "image" ? 1 : 0
   name   = "${local.csi}-ecr"
   role   = aws_iam_role.main.id
   policy = data.aws_iam_policy_document.ecr.json

infrastructure/modules/lambda/lambda_function.tf

@@ -2,21 +2,21 @@ resource "aws_lambda_function" "main" {
   description   = var.description
   function_name = local.csi
   role          = aws_iam_role.main.arn
-  handler       = var.package_type == "Zip" ? "${var.function_module_name}.${var.handler_function_name}" : null
-  runtime       = var.package_type == "Zip" ? var.runtime : null
-  package_type  = var.package_type
+  handler       = local.package_type == "zip" ? "${var.function_module_name}.${var.handler_function_name}" : null
+  runtime       = local.package_type == "zip" ? var.runtime : null
+  package_type  = title(local.package_type)
   publish       = true
   memory_size   = var.memory
   timeout       = var.timeout
 
-  s3_bucket         = var.package_type == "Zip" ? aws_s3_object.lambda[0].bucket : null
-  s3_key            = var.package_type == "Zip" ? aws_s3_object.lambda[0].key : null
-  s3_object_version = var.package_type == "Zip" ? aws_s3_object.lambda[0].version_id : null
+  s3_bucket         = local.package_type == "zip" ? aws_s3_object.lambda[0].bucket : null
+  s3_key            = local.package_type == "zip" ? aws_s3_object.lambda[0].key : null
+  s3_object_version = local.package_type == "zip" ? aws_s3_object.lambda[0].version_id : null
 
-  image_uri = var.package_type == "Image" ? var.image_uri : null
+  image_uri = local.package_type == "image" ? var.image_uri : null
 
   dynamic "image_config" {
-    for_each = var.package_type == "Image" && var.image_config != null ? [1] : []
+    for_each = local.package_type == "image" && var.image_config != null ? [1] : []
     content {
       entry_point       = try(var.image_config.entry_point, null)
       command           = try(var.image_config.command, null)
@@ -31,7 +31,7 @@ resource "aws_lambda_function" "main" {
     system_log_level      = var.system_log_level
   }
 
-  layers = var.package_type == "Zip" ? compact(concat(
+  layers = local.package_type == "zip" ? compact(concat(
     var.layers,
     [
       var.enable_lambda_insights && var.lambda_at_edge == false ? "arn:aws:lambda:${var.region}:580247275435:layer:LambdaInsightsExtension:53" : null

infrastructure/modules/lambda/locals.tf

@@ -1,6 +1,8 @@
 locals {
   module = "lambda"
 
+  package_type = lower(var.package_type)
+
   # Compound Scope Identifier
   csi = replace(
     format(

infrastructure/modules/lambda/s3_object_lambda.tf

@@ -1,5 +1,5 @@
 resource "aws_s3_object" "lambda" {
-  count  = var.package_type == "Zip" ? 1 : 0
+  count  = local.package_type == "zip" ? 1 : 0
   bucket = var.function_s3_bucket
   key    = "${local.csi}.zip"
   source = data.archive_file.lambda[0].output_path

infrastructure/modules/lambda/variables.tf

@@ -95,7 +95,7 @@ variable "runtime" {
   default     = null
 
   validation {
-    condition     = var.package_type != "Zip" || (var.runtime != null && var.runtime != "")
+    condition     = lower(var.package_type) != "zip" || (var.runtime != null && var.runtime != "")
     error_message = "runtime must be set when package_type is Zip."
   }
 }
@@ -106,7 +106,7 @@ variable "package_type" {
   default     = "Zip"
 
   validation {
-    condition     = contains(["Zip", "Image"], var.package_type)
+    condition     = contains(["zip", "image"], lower(var.package_type))
     error_message = "package_type must be either Zip or Image."
   }
 }
@@ -117,7 +117,7 @@ variable "image_uri" {
   default     = null
 
   validation {
-    condition     = var.package_type != "Image" || (var.image_uri != null && var.image_uri != "")
+    condition     = lower(var.package_type) != "image" || (var.image_uri != null && var.image_uri != "")
     error_message = "image_uri must be set when package_type is Image."
   }
 }
@@ -163,7 +163,7 @@ variable "function_code_dir" {
   default     = null
 
   validation {
-    condition     = var.package_type != "Zip" || (var.function_code_dir != null && var.function_code_dir != "")
+    condition     = lower(var.package_type) != "zip" || (var.function_code_dir != null && var.function_code_dir != "")
     error_message = "function_code_dir must be set when package_type is Zip."
   }
 }
@@ -174,7 +174,7 @@ variable "function_s3_bucket" {
   default     = null
 
   validation {
-    condition     = var.package_type != "Zip" || (var.function_s3_bucket != null && var.function_s3_bucket != "")
+    condition     = lower(var.package_type) != "zip" || (var.function_s3_bucket != null && var.function_s3_bucket != "")
     error_message = "function_s3_bucket must be set when package_type is Zip."
   }
 }