Skip to content

Commit

Permalink
added correct naming convention for LB stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
kmaus-near committed Nov 14, 2023
1 parent e69cf16 commit cd8b8dd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions infra/mpc-recovery-dev/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ terraform {
}

locals {
credentials = var.credentials != null ? var.credentials : file(var.credentials_file)
client_email = jsondecode(local.credentials).client_email
client_id = jsondecode(local.credentials).client_id
# credentials = var.credentials != null ? var.credentials : file(var.credentials_file)
# client_email = jsondecode(local.credentials).client_email
# client_id = jsondecode(local.credentials).client_id

env = {
defaults = {
Expand All @@ -38,8 +38,8 @@ data "external" "git_checkout" {
}

provider "google" {
credentials = local.credentials
# credentials = file("~/.config/gcloud/application_default_credentials.json")
# credentials = local.credentials
credentials = file("~/.config/gcloud/application_default_credentials.json")

project = var.project
region = var.region
Expand All @@ -59,8 +59,8 @@ resource "google_service_account_iam_binding" "serivce-account-iam" {
role = "roles/iam.serviceAccountUser"

members = [
"serviceAccount:${local.client_email}",
# "serviceAccount:mpc-recovery@pagoda-discovery-platform-dev.iam.gserviceaccount.com"
# "serviceAccount:${local.client_email}",
"serviceAccount:mpc-recovery@pagoda-discovery-platform-dev.iam.gserviceaccount.com"
]
}

Expand Down Expand Up @@ -105,7 +105,7 @@ module "mpc-signer-lb" {

count = length(var.signer_configs)
source = "../modules/internal_cloudrun_lb"
name = "mpc-dev-signer-${count.index}-${var.env}"
name = "mpc-${var.env}-signer-${count.index}"
network_id = data.google_compute_network.prod_network.id
subnetwork_id = data.google_compute_subnetwork.prod_subnetwork.id
project_id = var.project
Expand All @@ -115,7 +115,7 @@ module "mpc-signer-lb" {

module "mpc-leader-lb" {
source = "../modules/internal_cloudrun_lb"
name = "mpc-dev-leader-${var.env}"
name = "mpc-${var.env}-leader"
network_id = data.google_compute_network.prod_network.id
subnetwork_id = data.google_compute_subnetwork.prod_subnetwork.id
project_id = var.project
Expand Down
2 changes: 1 addition & 1 deletion infra/mpc-recovery-dev/terraform-dev.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project = "pagoda-discovery-platform-dev"
docker_image = "us-east1-docker.pkg.dev/pagoda-discovery-platform-dev/mpc-recovery/mpc-recovery-dev:f405e5594e666ef6a6e5ccf701c0d70c9673d4fe"

account_creator_id = "mpc-recovery-dev-creator.testnet"
account_creator_sk_secret_id = "mpc-recovery-account-creator-sk-dev"
account_creator_sk_secret_id = "mpc-account-creator-sk-dev"
fast_auth_partners_secret_id = "mpc-fast-auth-partners-dev"
signer_configs = [
{
Expand Down

0 comments on commit cd8b8dd

Please sign in to comment.