Skip to content

[GCP] Allow configuring multiple signer secret names #572

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

Merged
AlCutter merged 1 commit into from
Jun 29, 2026
Merged

[GCP] Allow configuring multiple signer secret names #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion deployment/live/gcp/witness/dev/terragrunt.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ inputs = merge(
public_witness_config_urls = ["https://raw.githubusercontent.com/transparency-dev/witness-network/refs/heads/main/lists/testing/log-list.1"]
witness_docker_repo = "https://ghcr.io"
witness_docker_image = "transparency-dev/witness/omniwitness_gcp:latest"
witness_secret_name = "witness_secret_dev"
witness_secret_names = ["witness_secret_dev"]
witness_service_account = "cloudrun-witness-dev-sa@checkpoint-distributor.iam.gserviceaccount.com"

ephemeral = true
Expand Down
18 changes: 11 additions & 7 deletions deployment/modules/gcp/witness/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,21 @@ resource "google_project_service" "cloudrun_api" {
}

data "google_secret_manager_secret" "witness_secret" {
secret_id = var.witness_secret_name
for_each = toset(var.witness_secret_names)
secret_id = each.value
}

data "google_secret_manager_secret_version" "witness_secret_data" {
secret = data.google_secret_manager_secret.witness_secret.id
for_each = toset(var.witness_secret_names)
secret = data.google_secret_manager_secret.witness_secret[each.value].id
version = 1
fetch_secret_data = false
}

# Update service accounts to allow secret access
resource "google_secret_manager_secret_iam_member" "secretaccess_compute_witness" {
secret_id = data.google_secret_manager_secret.witness_secret.id
for_each = toset(var.witness_secret_names)
secret_id = data.google_secret_manager_secret.witness_secret[each.value].id
role = "roles/secretmanager.secretAccessor"
member = "serviceAccount:${data.google_project.project.number}-compute@developer.gserviceaccount.com" # Project's compute service account
}
Expand Down Expand Up @@ -114,7 +117,7 @@ resource "google_artifact_registry_repository" "witness" {
format = "DOCKER"
mode = "REMOTE_REPOSITORY"
remote_repository_config {
description = "Pull-through cache of witness repository"
description = "Pull-through cache of witness repository"
disable_upstream_validation = true
docker_repository {
custom_repository {
Expand Down Expand Up @@ -158,7 +161,8 @@ resource "google_cloud_run_v2_service" "default" {
service_account = var.witness_service_account

max_instance_request_concurrency = 1000
timeout = "1s"
timeout = "1s"


containers {
# Access the witness docker image via our "pull-through" cache artifact registry.
Expand All @@ -168,9 +172,9 @@ resource "google_cloud_run_v2_service" "default" {
"--logtostderr",
"--v=1",
"--listen=:8080",
"--spanner=${local.spanner_db_full}",
"--signer_private_key_secret_name=${data.google_secret_manager_secret_version.witness_secret_data.name}"
"--spanner=${local.spanner_db_full}"
],
formatlist("--signer_private_key_secret_name=%s", values(data.google_secret_manager_secret_version.witness_secret_data)[*].name),
local.public_witness_config_args,
var.extra_args)
ports {
Expand Down
6 changes: 3 additions & 3 deletions deployment/modules/gcp/witness/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ variable "witness_service_account" {
type = string
}

variable "witness_secret_name" {
description = "Secret Manager secret name containing the note-formatted key to use for signing checkpoints."
type = string
variable "witness_secret_names" {
description = "Secret Manager secret names containing the note-formatted key to use for signing checkpoints."
type = list(string)
}
Loading