fixes

transparency-dev · Aug 20, 2024 · 3db7706 · 3db7706
1 parent ab8c657
commit 3db7706
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/deployment/live/gcp/example-gcp/terragrunt.hcl b/deployment/live/gcp/example-gcp/terragrunt.hcl
@@ -4,8 +4,8 @@ terraform {
 
 locals {
   env         = path_relative_to_include()
-  project_id = get_env("GOOGLE_PROJECT", "trillian-tessera")
-  location   = get_env("GOOGLE_REGION", "us-central1")
+  project_id  = get_env("GOOGLE_PROJECT", "trillian-tessera")
+  location    = get_env("GOOGLE_REGION", "us-central1")
   base_name   = get_env("TESSERA_BASE_NAME", "${local.env}-example-gcp")
 }
 

diff --git a/deployment/modules/gcp/example-gcp/main.tf b/deployment/modules/gcp/example-gcp/main.tf
@@ -81,6 +81,10 @@ resource "google_project_iam_member" "iam_service_agent" {
   member  = "serviceAccount:${google_service_account.cloudrun_service_account.email}"
 }
 
+locals {
+  spanner_db_full = "projects/${var.project_id}/instances/${module.gcs.log_spanner_instance.name}/databases/${module.gcs.log_spanner_db.name}"
+}
+
 resource "google_cloud_run_v2_service" "default" {
   name         = "example-service-${var.env}"
   location     = var.location
@@ -95,7 +99,7 @@ resource "google_cloud_run_v2_service" "default" {
         "--logtostderr",
         "--v=1",
         "--bucket=${module.gcs.log_bucket.id}",
-        "--spanner=projects/${var.project_id}/instances/${module.gcs.log_spanner_instance.name}/databases/${module.gcs.log_spanner_db.name}",
+        "--spanner=${locals.spanner_db_full}",
         "--project=${var.project_id}",
         "--listen=:8080",
         "--kms_key=${google_kms_crypto_key_version.log_signer.id}",
@@ -115,11 +119,6 @@ resource "google_cloud_run_v2_service" "default" {
         }
       }
     }
-    containers {
-      image      = "us-docker.pkg.dev/cloud-ops-agents-artifacts/cloud-run-gmp-sidecar/cloud-run-gmp-sidecar:1.0.0"
-      name       = "collector"
-      depends_on = ["example-gcp"]
-    }
   }
   client = "terraform"
   depends_on = [