fix(ci): tf variable references & formatting(#3522)

AztecProtocol · Dec 1, 2023 · d37cf52 · d37cf52
1 parent 14b9736
commit d37cf52
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/l1-contracts/REDEPLOY b/l1-contracts/REDEPLOY
@@ -0,0 +1,2 @@
+# Append value to force redeploy
+1
diff --git 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,16 +114,16 @@ 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",
         "value": "${var.CHAIN_ID}"
       },
       {
         "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
@@ -3,22 +3,24 @@ variable "DEPLOY_TAG" {
 }
 
 variable "RPC_URL" {
-  type = string
+  type    = string
+  default = "testnet"
 }
 
 variable "API_KEY" {
   type = string
 }
 
 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
@@ -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)
 }