From df019fa7f413c4720f35029ebc56861d6c7a4c6d Mon Sep 17 00:00:00 2001 From: Philippe Boneff Date: Wed, 18 Mar 2026 14:56:09 +0000 Subject: [PATCH] rename databases --- .../logs/arche2025h1/terragrunt.hcl | 2 ++ .../logs/arche2025h2/terragrunt.hcl | 2 ++ .../logs/arche2026h1/terragrunt.hcl | 2 ++ deployment/modules/gcp/storage/main.tf | 4 ++-- deployment/modules/gcp/storage/variables.tf | 12 ++++++++++++ deployment/modules/gcp/tesseract/gce/main.tf | 3 +++ deployment/modules/gcp/tesseract/gce/variables.tf | 12 ++++++++++++ 7 files changed, 35 insertions(+), 2 deletions(-) diff --git a/deployment/live/gcp/static-ct-staging/logs/arche2025h1/terragrunt.hcl b/deployment/live/gcp/static-ct-staging/logs/arche2025h1/terragrunt.hcl index 8364f84b..75a8be22 100644 --- a/deployment/live/gcp/static-ct-staging/logs/arche2025h1/terragrunt.hcl +++ b/deployment/live/gcp/static-ct-staging/logs/arche2025h1/terragrunt.hcl @@ -23,6 +23,8 @@ locals { gcs_use_grpc = true garbage_collection_interval = "10s" extra_tesseract_flags = [] + log_db_name_override = "${local.base_name}-db" + antispam_db_name_override = "${local.base_name}-antispam-db" } include "root" { diff --git a/deployment/live/gcp/static-ct-staging/logs/arche2025h2/terragrunt.hcl b/deployment/live/gcp/static-ct-staging/logs/arche2025h2/terragrunt.hcl index 0d8737dc..95d51b86 100644 --- a/deployment/live/gcp/static-ct-staging/logs/arche2025h2/terragrunt.hcl +++ b/deployment/live/gcp/static-ct-staging/logs/arche2025h2/terragrunt.hcl @@ -24,6 +24,8 @@ locals { gcs_use_grpc = true garbage_collection_interval = "10s" extra_tesseract_flags = [] + log_db_name_override = "${local.base_name}-db" + antispam_db_name_override = "${local.base_name}-antispam-db" } include "root" { diff --git a/deployment/live/gcp/static-ct-staging/logs/arche2026h1/terragrunt.hcl b/deployment/live/gcp/static-ct-staging/logs/arche2026h1/terragrunt.hcl index 1baca690..37f33c6a 100644 --- a/deployment/live/gcp/static-ct-staging/logs/arche2026h1/terragrunt.hcl +++ b/deployment/live/gcp/static-ct-staging/logs/arche2026h1/terragrunt.hcl @@ -24,6 +24,8 @@ locals { gcs_use_grpc = true garbage_collection_interval = "10s" extra_tesseract_flags = [] + log_db_name_override = "${local.base_name}-db" + antispam_db_name_override = "${local.base_name}-antispam-db" } include "root" { diff --git a/deployment/modules/gcp/storage/main.tf b/deployment/modules/gcp/storage/main.tf index 230257d1..bb6a5cd2 100644 --- a/deployment/modules/gcp/storage/main.tf +++ b/deployment/modules/gcp/storage/main.tf @@ -66,7 +66,7 @@ resource "google_spanner_instance" "log_spanner" { resource "google_spanner_database" "log_db" { instance = google_spanner_instance.log_spanner.name - name = "${var.base_name}-db" + name = coalesce(var.log_db_name_override, "${var.base_name}-log") ddl = [ "CREATE TABLE IF NOT EXISTS Tessera (id INT64 NOT NULL, compatibilityVersion INT64 NOT NULL) PRIMARY KEY (id)", "CREATE TABLE IF NOT EXISTS SeqCoord (id INT64 NOT NULL, next INT64 NOT NULL,) PRIMARY KEY (id)", @@ -79,7 +79,7 @@ resource "google_spanner_database" "log_db" { resource "google_spanner_database" "antispam_db" { instance = google_spanner_instance.log_spanner.name - name = "${var.base_name}-antispam-db" + name = coalesce(var.antispam_db_name_override, "${var.base_name}-aspam") ddl = [ "CREATE TABLE IF NOT EXISTS FollowCoord (id INT64 NOT NULL, nextIdx INT64 NOT NULL) PRIMARY KEY (id)", "CREATE TABLE IF NOT EXISTS IDSeq (h BYTES(32) NOT NULL, idx INT64 NOT NULL) PRIMARY KEY (h)", diff --git a/deployment/modules/gcp/storage/variables.tf b/deployment/modules/gcp/storage/variables.tf index 52769bdc..f64b34fb 100644 --- a/deployment/modules/gcp/storage/variables.tf +++ b/deployment/modules/gcp/storage/variables.tf @@ -35,3 +35,15 @@ variable "public_bucket" { type = bool default = false } + +variable "log_db_name_override" { + description = "Optional. Name of the Spanner DB to use for the log, overriding the default name format. This variable is optional and should only be used for legacy compatibility." + type = string + default = null +} + +variable "antispam_db_name_override" { + description = "Optional. Name of the Spanner DB to use for the antispam deduplication, overriding the default name format. This variable is optional and should only be used for legacy compatibility." + type = string + default = null +} diff --git a/deployment/modules/gcp/tesseract/gce/main.tf b/deployment/modules/gcp/tesseract/gce/main.tf index 9f2248f8..aa452214 100644 --- a/deployment/modules/gcp/tesseract/gce/main.tf +++ b/deployment/modules/gcp/tesseract/gce/main.tf @@ -18,6 +18,9 @@ module "storage" { ephemeral = var.ephemeral spanner_pu = var.spanner_pu public_bucket = var.public_bucket + + log_db_name_override = var.log_db_name_override + antispam_db_name_override = var.antispam_db_name_override } module "gce" { diff --git a/deployment/modules/gcp/tesseract/gce/variables.tf b/deployment/modules/gcp/tesseract/gce/variables.tf index 4e03fe32..a1958ced 100644 --- a/deployment/modules/gcp/tesseract/gce/variables.tf +++ b/deployment/modules/gcp/tesseract/gce/variables.tf @@ -186,3 +186,15 @@ variable "extra_tesseract_flags" { default = [] } +variable "log_db_name_override" { + description = "Optional. Name of the Spanner DB to use for the log, overriding the default name format. This variable is optional and should only be used for legacy compatibility." + type = string + default = null +} + +variable "antispam_db_name_override" { + description = "Optional. Name of the Spanner DB to use for the antispam deduplication, overriding the default name format. This variable is optional and should only be used for legacy compatibility." + type = string + default = null +} +