fix: using links within modules to template files to permit local sources

PiperOrigin-RevId: 814205125

Author: Android Build Filesystem (ABFS) Team

examples/simple/abfs.tf

@@ -23,7 +23,7 @@ moved {
 }
 
 module "abfs_server" {
-  source = "github.com/terraform-google-modules/terraform-google-abfs//modules/server?ref=v0.8.0"
+  source = "github.com/terraform-google-modules/terraform-google-abfs//modules/server?ref=v0.9.0"
 
   project_id                          = data.google_project.project.project_id
   zone                                = var.zone
@@ -38,7 +38,7 @@ module "abfs_server" {
 }
 
 module "abfs_uploaders" {
-  source = "github.com/terraform-google-modules/terraform-google-abfs//modules/uploaders?ref=v0.8.0"
+  source = "github.com/terraform-google-modules/terraform-google-abfs//modules/uploaders?ref=v0.9.0"
 
   project_id                            = data.google_project.project.project_id
   zone                                  = var.zone

examples/simple/workstations.tf

@@ -15,7 +15,7 @@
 module "cicd_foundation" {
   count = var.create_cloud_workstation_resources ? 1 : 0
 
-  source = "github.com/GoogleCloudPlatform/cicd-foundation//infra/modules/cicd_foundation?ref=v3.0.0"
+  source = "github.com/GoogleCloudPlatform/cicd-foundation//infra/modules/cicd_foundation?ref=v3.1.0"
 
   project_id  = data.google_project.project.project_id
   enable_apis = var.enable_apis

modules/server/files

@@ -0,0 +1 @@
+../../files

modules/server/main.tf

@@ -43,6 +43,8 @@ locals {
     ]
   ])
 
+  templates_files_root = "${path.module}/files/templates"
+
   runcmd = [
     "systemctl daemon-reload",
     "systemctl restart abfs-docker-warmup.service",
@@ -115,7 +117,7 @@ data "cloudinit_config" "abfs_server" {
             permissions = "0644"
             owner       = "root"
             encoding    = "gzip+base64"
-            content = base64gzip(templatefile("${local.common_files_root}/templates/abfs_container.env.tftpl",
+            content = base64gzip(templatefile("${local.templates_files_root}/abfs_container.env.tftpl",
               {
                 envs = {
                   "NEEDS_GIT" = false
@@ -132,7 +134,7 @@ data "cloudinit_config" "abfs_server" {
             permissions = "0755"
             owner       = "root"
             encoding    = "gzip+base64"
-            content = base64gzip(templatefile("${local.common_files_root}/templates/abfs_base.sh.tftpl",
+            content = base64gzip(templatefile("${local.templates_files_root}/abfs_base.sh.tftpl",
               {
                 envs = {
                   "ABFS_CMD"              = <<-EOT
@@ -152,7 +154,7 @@ data "cloudinit_config" "abfs_server" {
             permissions = "0644"
             owner       = "root"
             encoding    = "gzip+base64"
-            content = base64gzip(templatefile("${local.common_files_root}/templates/abfs-server.service.tftpl",
+            content = base64gzip(templatefile("${local.templates_files_root}/abfs-server.service.tftpl",
               {
                 type = "server"
             }))

modules/uploaders/files/templates

@@ -0,0 +1 @@
+../../../files/templates

modules/uploaders/main.tf

@@ -30,6 +30,8 @@ locals {
     ]
   ])
 
+  templates_files_root = "${path.module}/files/templates"
+
   pre_start_hooks = var.pre_start_hooks == null ? [] : [
     for filename in fileset(var.pre_start_hooks, "*") :
     {
@@ -151,7 +153,7 @@ data "cloudinit_config" "abfs_gerrit_uploader_configs" {
             permissions = "0644"
             owner       = "root"
             encoding    = "gzip+base64"
-            content = base64gzip(templatefile("${local.common_files_root}/templates/abfs_container.env.tftpl",
+            content = base64gzip(templatefile("${local.templates_files_root}/abfs_container.env.tftpl",
               {
                 envs = {
                   "NEEDS_GIT"       = true # gerrit uploaders need git access
@@ -169,7 +171,7 @@ data "cloudinit_config" "abfs_gerrit_uploader_configs" {
             permissions = "0755"
             owner       = "root"
             encoding    = "gzip+base64"
-            content = base64gzip(templatefile("${local.common_files_root}/templates/abfs_base.sh.tftpl",
+            content = base64gzip(templatefile("${local.templates_files_root}/abfs_base.sh.tftpl",
               {
                 envs = {
                   "ABFS_CMD"                   = <<-EOT
@@ -195,7 +197,7 @@ data "cloudinit_config" "abfs_gerrit_uploader_configs" {
             permissions = "0644"
             owner       = "root"
             encoding    = "gzip+base64"
-            content = base64gzip(templatefile("${local.common_files_root}/templates/abfs-server.service.tftpl",
+            content = base64gzip(templatefile("${local.templates_files_root}/abfs-server.service.tftpl",
               {
                 type = "uploader"
             }))