From d37cf520348e17acdc9de93bc2cf83560ccf57d5 Mon Sep 17 00:00:00 2001
From: spypsy <spypsy@users.noreply.github.com>
Date: Fri, 1 Dec 2023 22:00:19 +0000
Subject: [PATCH] fix(ci): tf variable references & formatting(#3522)

---
 l1-contracts/REDEPLOY                            | 2 ++
 yarn-project/aztec-faucet/terraform/main.tf      | 9 ++++-----
 yarn-project/aztec-faucet/terraform/variables.tf | 8 +++++---
 yarn-project/aztec-node/terraform/main.tf        | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 l1-contracts/REDEPLOY

diff --git a/l1-contracts/REDEPLOY b/l1-contracts/REDEPLOY
new file mode 100644
index 00000000000..fe5516129de
--- /dev/null
+++ b/l1-contracts/REDEPLOY
@@ -0,0 +1,2 @@
+# Append value to force redeploy
+1
\ No newline at end of file
diff --git a/yarn-project/aztec-faucet/terraform/main.tf b/yarn-project/aztec-faucet/terraform/main.tf
index bfbb82a982b..65aa239d550 100644
--- a/yarn-project/aztec-faucet/terraform/main.tf
+++ b/yarn-project/aztec-faucet/terraform/main.tf
@@ -79,8 +79,7 @@ resource "aws_ecs_task_definition" "aztec-faucet" {
   memory                   = "4096"
   execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
   task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
-
-  container_definitions = <<DEFINITIONS
+  container_definitions    = <<DEFINITIONS
 [
   {
     "name": "${var.DEPLOY_TAG}-faucet",
@@ -115,7 +114,7 @@ resource "aws_ecs_task_definition" "aztec-faucet" {
       },
       {
         "name": "API_PREFIX",
-        "value": "/${var.DEPLOY_TAG}/aztec-faucet/${API_PREFIX}"
+        "value": "/${var.DEPLOY_TAG}/aztec-faucet/${var.API_PREFIX}"
       },
       {
         "name": "CHAIN_ID",
@@ -123,8 +122,8 @@ resource "aws_ecs_task_definition" "aztec-faucet" {
       },
       {
         "name": "PRIVATE_KEY",
-        "value": "${var.PRIVATE_KEY}"
-      }
+        "value": "${var.FAUCET_PRIVATE_KEY}"
+      },
       {
         "name": "INTERVAL",
         "value": "86400"
diff --git a/yarn-project/aztec-faucet/terraform/variables.tf b/yarn-project/aztec-faucet/terraform/variables.tf
index c5e11b4bbde..ae556c6c842 100644
--- a/yarn-project/aztec-faucet/terraform/variables.tf
+++ b/yarn-project/aztec-faucet/terraform/variables.tf
@@ -3,7 +3,8 @@ variable "DEPLOY_TAG" {
 }
 
 variable "RPC_URL" {
-  type = string
+  type    = string
+  default = "testnet"
 }
 
 variable "API_KEY" {
@@ -11,14 +12,15 @@ variable "API_KEY" {
 }
 
 variable "API_PREFIX" {
-  type = string
+  type    = string
+  default = ""
 }
 
 variable "CHAIN_ID" {
   type = string
 }
 
-variable "PRIVATE_KEY" {
+variable "FAUCET_PRIVATE_KEY" {
   type = string
 }
 
diff --git a/yarn-project/aztec-node/terraform/main.tf b/yarn-project/aztec-node/terraform/main.tf
index 5d1b767e364..4970090b8b2 100644
--- a/yarn-project/aztec-node/terraform/main.tf
+++ b/yarn-project/aztec-node/terraform/main.tf
@@ -65,7 +65,7 @@ locals {
   node_p2p_private_keys  = [var.NODE_1_PRIVATE_KEY, var.NODE_2_PRIVATE_KEY]
   node_count             = length(local.publisher_private_keys)
   bootnodes = [for i in range(0, local.node_count) :
-    "/dns4/${var.DEPLOY_TAG}-aztec-bootstrap-${i + 1}.local/tcp/${var.BOOTNODE_LISTEN_PORT + i}/p2p/${bootnode_ids[i]}"
+    "/dns4/${var.DEPLOY_TAG}-aztec-bootstrap-${i + 1}.local/tcp/${var.BOOTNODE_LISTEN_PORT + i}/p2p/${local.bootnode_ids[i]}"
   ]
   combined_bootnodes = join(",", local.bootnodes)
 }