Fix Terraform secrets parsing for older TF version

api3dao · Mar 29, 2023 · 332aa56 · 332aa56
1 parent 6cfc8f2
commit 332aa56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/airnode-deployer/terraform/aws/modules/function/variables.tf b/packages/airnode-deployer/terraform/aws/modules/function/variables.tf
@@ -10,7 +10,7 @@ locals {
   # Trim whitespaces from the line
   secrets_lines_trimmed = [for line in local.secrets_lines : trimspace(line)]
   # Discard commented lines (starting with '#')
-  secrets_lines_uncommented = [for line in local.secrets_lines_trimmed : line if !startswith(line, "#")]
+  secrets_lines_uncommented = [for line in local.secrets_lines_trimmed : line if can(regex("^[^#]+.*$", line))]
   # Discard lines not matching the pattern and split them. We're looking for line that has non-whitespace characters before '=' and anything after
   secrets_lines_matched = [for line in local.secrets_lines_uncommented : regex("^([^[:space:]]+?)=(.*)$", line) if can(regex("^([^[:space:]]+?)=(.*)$", line))]
   # Convert the list to a map, remove quotation marks around the values. When duplicate keys are encountered the last found value is used.

diff --git a/packages/airnode-deployer/terraform/gcp/modules/function/variables.tf b/packages/airnode-deployer/terraform/gcp/modules/function/variables.tf
@@ -14,7 +14,7 @@ locals {
   # Trim whitespaces from the line
   secrets_lines_trimmed = [for line in local.secrets_lines : trimspace(line)]
   # Discard commented lines (starting with '#')
-  secrets_lines_uncommented = [for line in local.secrets_lines_trimmed : line if !startswith(line, "#")]
+  secrets_lines_uncommented = [for line in local.secrets_lines_trimmed : line if can(regex("^[^#]+.*$", line))]
   # Discard lines not matching the pattern and split them. We're looking for line that has non-whitespace characters before '=' and anything after
   secrets_lines_matched = [for line in local.secrets_lines_uncommented : regex("^([^[:space:]]+?)=(.*)$", line) if can(regex("^([^[:space:]]+?)=(.*)$", line))]
   # Convert the list to a map, remove quotation marks around the values. When duplicate keys are encountered the last found value is used.