Skip to content

gcs_use_grpc defaults to true #802

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

Open
phbnf wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −36
Open

gcs_use_grpc defaults to true #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d34da8
gcs_use_grpc defaults to true
phbnf Mar 19, 2026
736b00d
remove http client
phbnf Mar 19, 2026
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
22 changes: 4 additions & 18 deletions cmd/tesseract/gcp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ var (

// Infrastructure setup flags
bucket = flag.String("bucket", "", "Name of the GCS bucket to store the log in.")
gcsUseGRPC = flag.Bool("gcs_use_grpc", false, "Use gRPC-based GCS client.")
gcsConnections = flag.Int("gcs_connections", 4, "Size of connection pool for GCS gRPC client.")
spannerDB = flag.String("spanner_db_path", "", "Spanner database path: projects/{projectId}/instances/{instanceId}/databases/{databaseId}.")
spannerAntispamDB = flag.String("spanner_antispam_db_path", "", "Spanner antispam deduplication database path projects/{projectId}/instances/{instanceId}/databases/{databaseId}.")
Expand Down Expand Up @@ -167,7 +166,10 @@ func main() {
Timeout: *clientHTTPTimeout,
}

gcsClient := gcsClientFromFlags(ctx, hc)
gcsClient, err := gcs.NewGRPCClient(ctx, option.WithGRPCConnectionPool(*gcsConnections))
if err != nil {
klog.Exitf("Failed to create gRPC GCS client: %v", err)
}
fetchedRootsBackupStorage, err := gcp.NewRootsStorage(ctx, *bucket, gcsClient)
if err != nil {
klog.Exitf("failed to initialize GCS backup storage for remotely fetched roots: %v", err)
Expand Down Expand Up @@ -399,19 +401,3 @@ func notBeforeRLFromFlags() *tesseract.NotBeforeRL {
}
return &tesseract.NotBeforeRL{AgeThreshold: a, RateLimit: l}
}

func gcsClientFromFlags(ctx context.Context, httpClient *http.Client) *gcs.Client {
if *gcsUseGRPC {
gcsClient, err := gcs.NewGRPCClient(ctx, option.WithGRPCConnectionPool(*gcsConnections))
if err != nil {
klog.Exitf("Failed to create gRPC GCS client: %v", err)
}
return gcsClient
}

gcsClient, err := gcs.NewClient(ctx, gcs.WithJSONReads(), option.WithHTTPClient(httpClient))
if err != nil {
klog.Exitf("Failed to create GCS client: %v", err)
}
return gcsClient
}
1 change: 0 additions & 1 deletion deployment/live/gcp/static-ct-staging/logs/arche2025h1/terragrunt.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ locals {
log_public_key_secret_name = "projects/${include.root.locals.project_id}/secrets/${local.base_name}-ecdsa-p256-public-key/versions/1" # Legacy key name pattern.
log_private_key_secret_name = "projects/${include.root.locals.project_id}/secrets/${local.base_name}-ecdsa-p256-private-key/versions/1" # Legacy key name pattern.
additional_signer_private_key_secret_names = ["projects/${include.root.locals.project_id}/secrets/${local.base_name}-ed25519-private-key/versions/1"]
gcs_use_grpc = true
garbage_collection_interval = "10s"
extra_tesseract_flags = []
log_db_name_override = "${local.base_name}-db"
Expand Down
1 change: 0 additions & 1 deletion deployment/live/gcp/static-ct-staging/logs/arche2025h2/terragrunt.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ locals {
log_public_key_secret_name = "projects/${include.root.locals.project_id}/secrets/${local.base_name}-ecdsa-p256-public-key/versions/1" # Legacy key name pattern.
log_private_key_secret_name = "projects/${include.root.locals.project_id}/secrets/${local.base_name}-ecdsa-p256-private-key/versions/1" # Legacy key name pattern.
additional_signer_private_key_secret_names = ["projects/${include.root.locals.project_id}/secrets/${local.base_name}-ed25519-private-key/versions/1"]
gcs_use_grpc = true
garbage_collection_interval = "10s"
extra_tesseract_flags = []
log_db_name_override = "${local.base_name}-db"
Expand Down
1 change: 0 additions & 1 deletion deployment/live/gcp/static-ct-staging/logs/arche2026h1/terragrunt.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ locals {
log_public_key_secret_name = "projects/${include.root.locals.project_id}/secrets/${local.base_name}-ecdsa-p256-public-key/versions/1" # Legacy key name pattern.
log_private_key_secret_name = "projects/${include.root.locals.project_id}/secrets/${local.base_name}-ecdsa-p256-private-key/versions/1" # Legacy key name pattern.
additional_signer_private_key_secret_names = ["projects/${include.root.locals.project_id}/secrets/${local.base_name}-ed25519-private-key/versions/1"]
gcs_use_grpc = true
garbage_collection_interval = "10s"
extra_tesseract_flags = []
log_db_name_override = "${local.base_name}-db"
Expand Down
1 change: 0 additions & 1 deletion deployment/modules/gcp/cloudrun/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ resource "google_cloud_run_v2_service" "default" {
"--batch_max_age=${var.batch_max_age}",
"--roots_remote_fetch_url=${var.roots_remote_fetch_url}",
"--roots_remote_fetch_interval=${var.roots_remote_fetch_interval}",
"--gcs_use_grpc=true",
])
ports {
container_port = 6962
Expand Down
1 change: 0 additions & 1 deletion deployment/modules/gcp/gce/tesseract/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ locals {
length(var.roots_reject_fingerprints) == 0 ? "" : join(" ", formatlist("-roots_reject_fingerprints=%s", var.roots_reject_fingerprints)),
var.witness_policy == "" ? "" : "-witness_policy_file=${local.witness_policy_file}",
length(var.additional_signer_private_key_secret_names) == 0 ? "" : join(" ", formatlist("-additional_signer_private_key_secret_name=%s", var.additional_signer_private_key_secret_names)),
"-gcs_use_grpc=${var.gcs_use_grpc}",
var.garbage_collection_interval == null ? "" : "-garbage_collection_interval=${var.garbage_collection_interval}",
], var.extra_tesseract_flags)

Expand Down
6 changes: 0 additions & 6 deletions deployment/modules/gcp/gce/tesseract/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,6 @@ variable "roots_reject_fingerprints" {
default = []
}

variable "gcs_use_grpc" {
description = "Use gRPC for GCS access."
type = bool
default = false
}

variable "garbage_collection_interval" {
description = "Interval between garbage collection runs, e.g. \"10s\"."
type = string
Expand Down
1 change: 0 additions & 1 deletion deployment/modules/gcp/tesseract/gce/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ module "gce" {
roots_remote_fetch_url = var.roots_remote_fetch_url
roots_remote_fetch_interval = var.roots_remote_fetch_interval
roots_reject_fingerprints = var.roots_reject_fingerprints
gcs_use_grpc = var.gcs_use_grpc
garbage_collection_interval = var.garbage_collection_interval
extra_tesseract_flags = var.extra_tesseract_flags

Expand Down
6 changes: 0 additions & 6 deletions deployment/modules/gcp/tesseract/gce/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,6 @@ variable "roots_reject_fingerprints" {
default = []
}

variable "gcs_use_grpc" {
description = "Use gRPC for GCS access."
type = bool
default = false
}

variable "garbage_collection_interval" {
description = "Interval between garbage collection runs, e.g. \"10s\"."
type = string
Expand Down
Loading