Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ci): more tf variable references #3522

Merged
merged 3 commits into from
Dec 1, 2023
Merged

fix(ci): more tf variable references #3522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
898022c
fix(ci): more tf variable references
spypsy Dec 1, 2023
9282d52
add 'testnet' default value for faucet
spypsy Dec 1, 2023
08b0958
tf validate & plan
spypsy Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions l1-contracts/REDEPLOY
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Append value to force redeploy
1
9 changes: 4 additions & 5 deletions yarn-project/aztec-faucet/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 5 additions & 3 deletions yarn-project/aztec-faucet/terraform/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/aztec-node/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down