Fixup

deployment/live/gcp/example-gcp/ci/terragrunt.hcl

@@ -1,5 +1,5 @@
 terraform {
-  source = "${get_repo_root()}/deployment/modules//example-gcp"
+  source = "${get_repo_root()}/deployment/modules/gcp//example-gcp"
 }
 
 include "root" {

deployment/live/gcp/example-gcp/terragrunt.hcl

@@ -1,5 +1,5 @@
 terraform {
-  source = "${get_repo_root()}/deployment/modules//gcp/example-gcp"
+  source = "${get_repo_root()}/deployment/modules/gcp//example-gcp"
 }
 
 locals {

deployment/modules/example-gcp/main.tf → deployment/modules/gcp/example-gcp/main.tf

@@ -5,8 +5,8 @@ terraform {
 ## Call the Tessera GCP module
 ##
 ## This will configure all the storage infrastructure required to run a Tessera log on GCP.
-module "gcp" {
-  source = "..//gcp"
+module "gcs" {
+  source = "..//gcs"
 
   base_name  = var.base_name
   env        = var.env
@@ -40,8 +40,8 @@ resource "google_project_iam_member" "iam_metrics_writer" {
 }
 resource "google_spanner_database_iam_binding" "iam_spanner_database_user" {
   project  = var.project_id
-  instance = module.gcp.log_spanner_instance.name
-  database = module.gcp.log_spanner_db.name
+  instance = module.gcs.log_spanner_instance.name
+  database = module.gcs.log_spanner_db.name
   role     = "roles/spanner.databaseUser"
 
   members = [
@@ -67,8 +67,8 @@ resource "google_cloud_run_v2_service" "default" {
       args = [
         "--logtostderr",
         "--v=1",
-        "--bucket=${module.gcp.log_bucket.id}",
-        "--spanner=${module.gcp.log_spanner_db.id}",
+        "--bucket=${module.gcs.log_bucket.id}",
+        "--spanner=${module.gcs.log_spanner_db.id}",
         "--project=${var.project_id}",
         "--signer=./testgcp.sec",
       ]
@@ -94,7 +94,7 @@ resource "google_cloud_run_v2_service" "default" {
   }
   client = "terraform"
   depends_on = [
-    module.gcp,
+    module.gcs,
     google_project_service.cloudrun_api,
     google_project_iam_member.iam_act_as,
     google_project_iam_member.iam_metrics_writer,