don't chain preloader

Author: phbnf

deployment/live/gcp/static-ct-staging/cloudbuild/preloader/terragrunt.hcl

@@ -3,11 +3,14 @@ terraform {
 }
 
 locals {
-  env            = "staging"
-  docker_env     = "staging"
+  env            = get_env("GOOGLE_ENV", "staging")
+  docker_env     = get_env("GOOGLE_ENV", "staging")
   project_id     = get_env("GOOGLE_PROJECT", "static-ct-staging")
   location       = get_env("GOOGLE_REGION", "us-central1")
   github_owner   = get_env("GITHUB_OWNER", "transparency-dev")
+  source_log_uri = get_env("SOURCE_LOG_URI", "https://ct.googleapis.com/logs/us1/argon2025h1")
+  submission_url = get_env("SUBMISSION_URL", "https://arche2025h1-64t3hlisgq-uc.a.run.app/arche2025h1.ct.transparency.dev")
+  monitoring_url = get_env("MONITORING_URL", " https://storage.googleapis.com/static-ct-staging-arche2025h1-bucket")
 }
 
 inputs = local

deployment/modules/gcp/cloudbuild/tesseract/main.tf

@@ -127,28 +127,6 @@ resource "google_cloudbuild_trigger" "build_trigger" {
       wait_for = ["docker_push_conformance_gcp"]
     }
 
-    ## Apply the deployment/live/gcp/static-staging/cloudbuild/preloader terragrunt config.
-    ## This will bring up the preloader agaist the conformance infrastructure.
-    step {
-      id     = "terraform_apply_preloader"
-      name   = "alpine/terragrunt"
-      script = <<EOT
-        terragrunt --terragrunt-non-interactive --terragrunt-no-color apply -auto-approve -no-color -var="submission_url=$(cat /workspace/conformance_url)/arche2025h1.ct.transparency.dev/" -var="monitoring_url=https://storage.googleapis.com/$(cat /workspace/conformance_bucket_name)" 2>&1
-      EOT
-      dir    = "deployment/live/gcp/static-ct-staging/cloudbuild/preloader"
-      env = [
-        "GOOGLE_PROJECT=${var.project_id}",
-        "TF_IN_AUTOMATION=1",
-        "TF_INPUT=false",
-        "TF_VAR_project_id=${var.project_id}",
-        "TF_VAR_location=${var.location}",
-        "TF_VAR_env=${var.env}",
-        "TF_VAR_github_owner=${var.github_owner}",
-        "TF_VAR_source_log_uri=${var.source_log_uri}",
-      ]
-      wait_for = ["terraform_apply_conformance_staging"]
-    }
-
     options {
       logging      = "CLOUD_LOGGING_ONLY"
       machine_type = "E2_HIGHCPU_8"

deployment/modules/gcp/cloudbuild/tesseract/variables.tf

@@ -22,8 +22,3 @@ variable "github_owner" {
   description = "GitHub owner used in Cloud Build trigger repository mapping"
   type        = string
 }
-
-variable "source_log_uri" {
-  description = "URL of the source RFC6962 log to be preloaded."
-  type        = string
-}