Merge pull request #1514 from api3dao/v0.9-fix-secrets-quotation

[v0.9] Fix handling of quotation marks in secrets
api3dao · Oct 31, 2022 · 4f9fb08 · 4f9fb08
2 parents a2e7a03 + 1826e56
commit 4f9fb08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/five-rivers-brush.md b/.changeset/five-rivers-brush.md
@@ -0,0 +1,5 @@
+---
+'@api3/airnode-deployer': patch
+---
+
+Fix handling of quotation marks in secrets
diff --git a/packages/airnode-deployer/terraform/aws/modules/function/main.tf b/packages/airnode-deployer/terraform/aws/modules/function/main.tf
@@ -54,7 +54,7 @@ resource "aws_lambda_function" "lambda" {
   environment {
     variables = merge(
       var.environment_variables,
-      fileexists(var.secrets_file) ? { for tuple in regexall("(.*?)=(.*)", file(var.secrets_file)) : tuple[0] => tuple[1] } : {},
+      fileexists(var.secrets_file) ? { for tuple in regexall("(.*?)=(.*)", file(var.secrets_file)) : tuple[0] => trim(tuple[1], "\"'") } : {},
       { AIRNODE_CLOUD_PROVIDER = "aws" }
     )
   }

diff --git a/packages/airnode-deployer/terraform/gcp/modules/function/main.tf b/packages/airnode-deployer/terraform/gcp/modules/function/main.tf
@@ -67,7 +67,7 @@ resource "google_cloudfunctions_function" "function" {
   max_instances         = var.max_instances
   environment_variables = merge(
     var.environment_variables,
-    fileexists(var.secrets_file) ? { for tuple in regexall("(.*?)=(.*)", file(var.secrets_file)) : tuple[0] => tuple[1] } : {},
+    fileexists(var.secrets_file) ? { for tuple in regexall("(.*?)=(.*)", file(var.secrets_file)) : tuple[0] => trim(tuple[1], "\"'") } : {},
     { AIRNODE_CLOUD_PROVIDER = "gcp" }
   )
   service_account_email = google_service_account.function_service_account.email