refactor(lambda): make package_s3 variable an object

lambda/README.md

@@ -69,9 +69,12 @@ Creates an AWS Lambda function
 
     Path to the zip that contains the Lambda's source. Either `package_path` or `package_s3` is required.
 
-* `package_s3` (`string`, default: `null`)
+* `package_s3` (`object({
+    bucket = string
+    key    = string
+  })`, default: `null`)
 
-    S3 object path to a zip that contains the Lambda's source in a `{bucket}/{key}` format. Either `package_path` or `package_s3` is required.
+    S3 zip object that contains the Lambda's source. Either `package_path` or `package_s3` is required.
 
 * `package_s3_version` (`string`, default: `null`)
 

lambda/layer/README.md

@@ -53,9 +53,12 @@ Creates an AWS Lambda Layer that can be attached to a AWS Lambda Function
 
     Path to the zip that contains the Lambda layer's source. Either `package_path`, `package_s3` or `image` is required.
 
-* `package_s3` (`string`, default: `null`)
+* `package_s3` (`object({
+    bucket = string
+    key    = string
+  })`, default: `null`)
 
-    S3 object path to a zip that contains the Lambda layer's source in a `{bucket}/{key}` format. Either `package_path`, `package_s3` or `image` is required.
+    S3 zip object that contains the Lambda layer's source. Either `package_path` or `package_s3` is required.
 
 * `package_s3_version` (`string`, default: `null`)
 

lambda/layer/main.tf

@@ -1,14 +1,10 @@
 locals {
-  package_s3_match = var.package_s3 != null ? regex(
-    "(?P<bucket>[^/]+)/(?P<key>.+)", var.package_s3
-  ) : { bucket = null, key = null }
-  package_s3_bucket = local.package_s3_match.bucket
-  package_s3_key    = local.package_s3_match.key
+  create_package = var.create && (var.files != null || var.files_dir != null)
 }
 
 module "package" {
   source = "./../../zip"
-  create = var.create && (var.files != null || var.files_dir != null)
+  create = local.create_package
 
   files                      = var.files
   directory                  = var.files_dir
@@ -24,9 +20,9 @@ resource "aws_lambda_layer_version" "layer" {
   layer_name          = var.name
   compatible_runtimes = var.runtimes
 
-  filename          = coalesce(var.package_path, module.package.output_path)
-  s3_bucket         = local.package_s3_bucket
-  s3_key            = local.package_s3_key
+  filename          = local.create_package ? module.package.output_path : var.package_path
+  s3_bucket         = var.package_s3 != null ? var.package_s3.bucket : null
+  s3_key            = var.package_s3 != null ? var.package_s3.key : null
   s3_object_version = var.package_s3_version
 }
 

lambda/layer/variables.tf

@@ -22,9 +22,12 @@ variable "package_path" {
 }
 
 variable "package_s3" {
-  description = "S3 object path to a zip that contains the Lambda layer's source in a `{bucket}/{key}` format. Either `package_path`, `package_s3` or `image` is required."
-  type        = string
-  default     = null
+  description = "S3 zip object that contains the Lambda layer's source. Either `package_path` or `package_s3` is required."
+  type = object({
+    bucket = string
+    key    = string
+  })
+  default = null
 }
 
 variable "package_s3_version" {

lambda/main.tf

@@ -1,14 +1,10 @@
 locals {
-  package_s3_match = var.package_s3 != null ? regex(
-    "(?P<bucket>[^/]+)/(?P<key>.+)", var.package_s3
-  ) : { bucket = null, key = null }
-  package_s3_bucket = local.package_s3_match.bucket
-  package_s3_key    = local.package_s3_match.key
+  create_package = var.create && (var.files != null || var.files_dir != null)
 }
 
 module "package" {
   source = "./../zip"
-  create = var.create && (var.files != null || var.files_dir != null)
+  create = local.create_package
 
   files                      = var.files
   directory                  = var.files_dir
@@ -81,9 +77,9 @@ resource "aws_lambda_function" "lambda" {
 
   function_name = var.name
 
-  filename          = coalesce(var.package_path, module.package.output_path)
-  s3_bucket         = local.package_s3_bucket
-  s3_key            = local.package_s3_key
+  filename          = local.create_package ? module.package.output_path : var.package_path
+  s3_bucket         = var.package_s3 != null ? var.package_s3.bucket : null
+  s3_key            = var.package_s3 != null ? var.package_s3.key : null
   s3_object_version = var.package_s3_version
 
   layers      = var.layer_qualified_arns

lambda/variables.tf

@@ -22,9 +22,12 @@ variable "package_path" {
 }
 
 variable "package_s3" {
-  description = "S3 object path to a zip that contains the Lambda's source in a `{bucket}/{key}` format. Either `package_path` or `package_s3` is required."
-  type        = string
-  default     = null
+  description = "S3 zip object that contains the Lambda's source. Either `package_path` or `package_s3` is required."
+  type = object({
+    bucket = string
+    key    = string
+  })
+  default = null
 }
 
 variable "package_s3_version" {