From e03bf8063d1cd8df95912b9b0ffd3a411e8f18ea Mon Sep 17 00:00:00 2001 From: aahel Date: Mon, 26 Feb 2024 11:12:25 +0530 Subject: [PATCH] readded reg arch --- modules/lambda-registrator/main.tf | 1 + modules/lambda-registrator/variables.tf | 11 +++++++++++ test/acceptance/tests/basic_test.go | 1 + test/acceptance/tests/setup/main.tf | 1 + test/acceptance/tests/setup/variables.tf | 6 ++++++ 5 files changed, 20 insertions(+) diff --git a/modules/lambda-registrator/main.tf b/modules/lambda-registrator/main.tf index 1212a8cf..ade84bbe 100644 --- a/modules/lambda-registrator/main.tf +++ b/modules/lambda-registrator/main.tf @@ -186,6 +186,7 @@ resource "aws_lambda_function" "registration" { image_uri = var.enable_auto_publish_ecr_image ? local.generated_ecr_image_uri : var.ecr_image_uri package_type = "Image" function_name = var.name + architectures = var.arch role = aws_iam_role.registration.arn timeout = var.timeout reserved_concurrent_executions = var.reserved_concurrent_executions diff --git a/modules/lambda-registrator/variables.tf b/modules/lambda-registrator/variables.tf index 9adaf7c0..48163089 100644 --- a/modules/lambda-registrator/variables.tf +++ b/modules/lambda-registrator/variables.tf @@ -146,3 +146,14 @@ variable "enable_auto_publish_ecr_image" { type = bool default = false } + +variable "arch" { + type = string + default = "x86_64" + description = "Lambda Architecture. Valid values are arm64 and x86_64" + + validation { + condition = can(regex("^(arm64|x86_64)$", var.arch)) + error_message = "Invalid value for 'arch', options: 'arm64', 'x86_64'." + } +} \ No newline at end of file diff --git a/test/acceptance/tests/basic_test.go b/test/acceptance/tests/basic_test.go index 5141288f..c6afdeb8 100644 --- a/test/acceptance/tests/basic_test.go +++ b/test/acceptance/tests/basic_test.go @@ -67,6 +67,7 @@ func TestBasic(t *testing.T) { } tfVars := config.TFVars() tfVars["secure"] = c.secure + tfVars["arch"] = config.Arch namespace := "" partition := "" queryString := "" diff --git a/test/acceptance/tests/setup/main.tf b/test/acceptance/tests/setup/main.tf index 4b0b8fc9..60e534d7 100644 --- a/test/acceptance/tests/setup/main.tf +++ b/test/acceptance/tests/setup/main.tf @@ -75,4 +75,5 @@ module "lambda-registration" { enable_auto_publish_ecr_image = var.enable_auto_publish_ecr_image consul_extension_data_prefix = "/${var.suffix}" private_ecr_repo_name = var.private_ecr_repo_name + arch = var.arch == "arm64" ? "arm64" : "x86_64" } diff --git a/test/acceptance/tests/setup/variables.tf b/test/acceptance/tests/setup/variables.tf index 5e2eb1b2..c0c2f654 100644 --- a/test/acceptance/tests/setup/variables.tf +++ b/test/acceptance/tests/setup/variables.tf @@ -79,3 +79,9 @@ variable "private_ecr_repo_name" { type = string default = "" } + +variable "arch" { + type = string + default = "x86_64" + description = "Lambda Architecture" +} \ No newline at end of file