From 11a3f9ce4062c4d30cb0d81b3037c153e3779fe4 Mon Sep 17 00:00:00 2001 From: Philippe Boneff Date: Thu, 25 Jul 2024 14:06:18 +0000 Subject: [PATCH] tidy things up --- deployment/live/example-gcp/README.md | 8 ++------ deployment/live/example-gcp/terragrunt.hcl | 2 +- deployment/modules/gcs/main.tf | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/deployment/live/example-gcp/README.md b/deployment/live/example-gcp/README.md index 1fb0c01c9..66e5bc2b9 100644 --- a/deployment/live/example-gcp/README.md +++ b/deployment/live/example-gcp/README.md @@ -6,14 +6,10 @@ the project: gcloud auth application-default login ``` -Then, specify your Google Cloud project ID: +Eventually, customize the GCP project ID (defaults to "trillian-tessera"), region +(defaults to "us-central1"), and bucket name prefix (defaults to "example-gcp"): ```bash export GOOGLE_PROJECT={VALUE} -``` - -Eventually, customize the region (defaults to "us-central1"), and bucket name prefix -(defaults to "tessera-example"): -```bash export GOOGLE_REGION={VALUE} export TESSERA_BASE_NAME={VALUE} ``` diff --git a/deployment/live/example-gcp/terragrunt.hcl b/deployment/live/example-gcp/terragrunt.hcl index af6e117b7..3ec9d58a0 100644 --- a/deployment/live/example-gcp/terragrunt.hcl +++ b/deployment/live/example-gcp/terragrunt.hcl @@ -3,7 +3,7 @@ terraform { } locals { - project_id = get_env("GOOGLE_PROJECT", "trillian-example") + project_id = get_env("GOOGLE_PROJECT", "trillian-tessera") location = get_env("GOOGLE_REGION", "us-central1") base_name = get_env("TESSERA_BASE_NAME", "example-gcp") } diff --git a/deployment/modules/gcs/main.tf b/deployment/modules/gcs/main.tf index c5d819a5b..6f2fd3392 100644 --- a/deployment/modules/gcs/main.tf +++ b/deployment/modules/gcs/main.tf @@ -52,7 +52,7 @@ resource "google_storage_bucket_iam_binding" "log_bucket_writer" { resource "google_spanner_instance" "log_spanner" { name = var.base_name config = "regional-${var.location}" - display_name = "${var.base_name}" + display_name = "${var.base_name} Spanner Instance" processing_units = 100 }