Skip to content

Commit a790d9e

Browse files
authored
Terraform cleanup: rename directory + split step (#289)
* s/conformance/cloudrun * print output in different step # Conflicts: # deployment/modules/gcp/cloudbuild/tesseract/main.tf
1 parent 8932c92 commit a790d9e

File tree

8 files changed

+22
-5
lines changed

8 files changed

+22
-5
lines changed

deployment/live/gcp/static-ct-staging/logs/arche2025h1/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Overview
44

5-
This config uses the [gcp/tesseract/conformance](/deployment/modules/gcp/tesseract/conformance) module to
5+
This config uses the [gcp/tesseract/cloudrun](/deployment/modules/gcp/tesseract/cloudrun) module to
66
run TesseraCT on Cloud Run, backed by Trillian Tessera and preloaded with argon2025h1 entries.
77

88
### Update the roots

deployment/live/gcp/static-ct-staging/logs/arche2025h1/terragrunt.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
source = "${get_repo_root()}/deployment/modules/gcp//tesseract/conformance"
2+
source = "${get_repo_root()}/deployment/modules/gcp//tesseract/cloudrun"
33
}
44

55
locals {

deployment/live/gcp/static-ct/logs/ci/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Overview
44

5-
This config uses the [gcp/conformance](/deployment/modules/gcp/tesseract/conformance) module to
5+
This config uses the [gcp/cloudrun](/deployment/modules/gcp/tesseract/cloudrun) module to
66
define a CI environment to run the SCTFE on Cloud Run, backed by Trillian Tessera.
77

88
At a high level, this environment consists of:

deployment/live/gcp/static-ct/logs/ci/terragrunt.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
source = "${get_repo_root()}/deployment/modules/gcp//tesseract/conformance"
2+
source = "${get_repo_root()}/deployment/modules/gcp//tesseract/cloudrun"
33
}
44

55
locals {

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,23 @@ resource "google_cloudbuild_trigger" "build_trigger" {
109109
name = "alpine/terragrunt"
110110
script = <<EOT
111111
terragrunt --terragrunt-non-interactive --terragrunt-no-color apply -auto-approve -no-color 2>&1
112+
EOT
113+
dir = "deployment/live/gcp/static-ct-staging/logs/arche2025h1"
114+
env = [
115+
"GOOGLE_PROJECT=${var.project_id}",
116+
"TF_IN_AUTOMATION=1",
117+
"TF_INPUT=false",
118+
"TF_VAR_project_id=${var.project_id}",
119+
"DOCKER_CONTAINER_TAG=$SHORT_SHA"
120+
]
121+
wait_for = ["docker_push_conformance_gcp"]
122+
}
123+
124+
## Print terraform output.
125+
step {
126+
id = "terraform_print_output"
127+
name = "alpine/terragrunt"
128+
script = <<EOT
112129
terragrunt --terragrunt-no-color output --raw conformance_url -no-color > /workspace/conformance_url
113130
terragrunt --terragrunt-no-color output --raw conformance_bucket_name -no-color > /workspace/conformance_bucket_name
114131
terragrunt --terragrunt-no-color output --raw ecdsa_p256_public_key_data -no-color > /workspace/conformance_log_public_key.pem
@@ -124,7 +141,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
124141
"TF_VAR_project_id=${var.project_id}",
125142
"DOCKER_CONTAINER_TAG=$SHORT_SHA"
126143
]
127-
wait_for = ["docker_push_conformance_gcp"]
144+
wait_for = ["terraform_apply_conformance_staging"]
128145
}
129146

130147
options {

0 commit comments

Comments
 (0)