Fixes the CHECK_URLs list (#39)

* Fixes the CHECK_URLs list * fix syntax
chime · Nov 28, 2022 · 670e251 · 670e251
1 parent fa346ab
commit 670e251
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/functions/replace-route/app.py b/functions/replace-route/app.py
@@ -358,7 +358,7 @@ def connectivity_test_handler(event, context):
     logger.info("Starting NAT instance connectivity test")
 
     check_interval = int(os.getenv("CONNECTIVITY_CHECK_INTERVAL", DEFAULT_CONNECTIVITY_CHECK_INTERVAL))
-    check_urls = os.getenv("CHECK_URLS", DEFAULT_CHECK_URLS)
+    check_urls = "CHECK_URLS" in os.environ and os.getenv("CHECK_URLS").split(",") or DEFAULT_CHECK_URLS
 
     # Run connectivity checks for approximately 1 minute
     run = 0

diff --git a/modules/terraform-aws-alternat/lambda.tf b/modules/terraform-aws-alternat/lambda.tf
@@ -8,7 +8,6 @@ resource "aws_lambda_function" "alternat_autoscaling_hook" {
   environment {
     variables = {
       PRIVATE_SUBNET_SUFFIX = var.subnet_suffix
-      CHECK_URLS            = var.connectivity_test_check_urls
     }
   }
   tags = merge({
@@ -119,6 +118,12 @@ resource "aws_lambda_function" "alternat_connectivity_tester" {
 
   role = aws_iam_role.nat_lambda_role.arn
 
+  environment {
+    variables = {
+      CHECK_URLS = join(",", var.connectivity_test_check_urls)
+    }
+  }
+
   vpc_config {
     subnet_ids         = [var.vpc_private_subnet_ids[count.index]]
     security_group_ids = [aws_security_group.nat_lambda.id]