fix: align with abfs --manifest-server (#2)

kunzese · web-flow · commit d68a50c3dc9e · 2025-05-13T17:15:38.000+02:00
BREAKING CHANGE: renamed `abfs_gerrit_uploader_git_servers` to
`abfs_gerrit_uploader_manifest_server` and changed type from `list(string)` to
`string`
diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -26,14 +26,14 @@ module "abfs-deployment" {
 module "abfs-uploaders" {
   source = "../../modules/uploaders"
 
-  project_id                       = var.project_id
-  zone                             = var.zone
-  service_account_email            = google_service_account.abfs_server.email
-  subnetwork                       = module.abfs-vpc.subnets["${var.region}/abfs-subnet"].name
-  abfs_docker_image_uri            = var.abfs_docker_image_uri
-  abfs_gerrit_uploader_git_servers = var.abfs_gerrit_uploader_git_servers
-  abfs_license                     = var.abfs_license
-  abfs_server_name                 = module.abfs-deployment.abfs_server_name
+  project_id                           = var.project_id
+  zone                                 = var.zone
+  service_account_email                = google_service_account.abfs_server.email
+  subnetwork                           = module.abfs-vpc.subnets["${var.region}/abfs-subnet"].name
+  abfs_docker_image_uri                = var.abfs_docker_image_uri
+  abfs_gerrit_uploader_manifest_server = var.abfs_gerrit_uploader_manifest_server
+  abfs_license                         = var.abfs_license
+  abfs_server_name                     = module.abfs-deployment.abfs_server_name
 }
 
 module "monitoring" {
diff --git a/examples/simple/variables.tf b/examples/simple/variables.tf
@@ -32,9 +32,10 @@ variable "abfs_docker_image_uri" {
   type        = string
 }
 
-variable "abfs_gerrit_uploader_git_servers" {
-  description = "List of git servers to upload to the ABFS server (e.g. [\"android.googlesource.com\"])"
-  type        = list(string)
+variable "abfs_gerrit_uploader_manifest_server" {
+  default     = "android.googlesource.com"
+  description = "The manifest server to assume"
+  type        = string
 }
 
 variable "abfs_license" {
diff --git a/metadata.display.yaml b/metadata.display.yaml
@@ -32,12 +32,12 @@ spec:
           name: goog_cm_deployment_name
           title: Deployment name
           subtext: If set, this value will be used as a prefix for all VM and disk names
-        abfs_gerrit_uploader_git_servers:
-          name: abfs_gerrit_uploader_git_servers
+        abfs_gerrit_uploader_manifest_server:
+          name: abfs_gerrit_uploader_manifest_server
           title: ABFS Gerrit Uploader Git Servers
           section: gerrit_config
           subtext: |
-            Format: ["android.googlesource.com","gerrit.example.com"]
+            Format: "android.googlesource.com"
         abfs_gerrit_uploader_git_branch:
           name: abfs_gerrit_uploader_git_branch
           title: ABFS Gerrit Uploader Git Branch
@@ -184,4 +184,4 @@ spec:
           title: Gerrit Uploaders
           subtext: Configuration for the Gerrit uploaders - these servers are responsible for uploading the git tree from Gerrit servers to the cache on the ABFS server.
         - name: advanced
-          title: Advanced properties
+          title: Advanced properties
diff --git a/metadata.yaml b/metadata.yaml
@@ -108,11 +108,11 @@ spec:
         description: The PD regional disk type to use for the ABFS gerrit uploader datadisk(s)
         varType: string
         defaultValue: pd-ssd
-      - name: abfs_gerrit_uploader_git_servers
-        description: List of git servers to upload to the ABFS server (e.g. ["android.googlesource.com"])
-        varType: list(string)
+      - name: abfs_gerrit_uploader_manifest_server
+        description: The manifest server to assume
+        varType: string
         required: true
-        defaultValue: ["android.googlesource.com"]
+        defaultValue: "android.googlesource.com"
       - name: abfs_gerrit_uploader_git_branch
         description: Git branch to upload to the ABFS server (e.g.main)
         varType: string
diff --git a/modules/uploaders/README.md b/modules/uploaders/README.md
@@ -42,14 +42,14 @@ No modules.
 | <a name="input_abfs_gerrit_uploader_datadisk_size_gb"></a> [abfs\_gerrit\_uploader\_datadisk\_size\_gb](#input\_abfs\_gerrit\_uploader\_datadisk\_size\_gb) | Size in GB for the ABFS gerrit uploader datadisk(s) that will be attached to the VM(s) | `number` | `4096` | no |
 | <a name="input_abfs_gerrit_uploader_datadisk_type"></a> [abfs\_gerrit\_uploader\_datadisk\_type](#input\_abfs\_gerrit\_uploader\_datadisk\_type) | The PD regional disk type to use for the ABFS gerrit uploader datadisk(s) | `string` | `"pd-ssd"` | no |
 | <a name="input_abfs_gerrit_uploader_git_branch"></a> [abfs\_gerrit\_uploader\_git\_branch](#input\_abfs\_gerrit\_uploader\_git\_branch) | Git branch to upload to the ABFS server (e.g. main) | `string` | `"main"` | no |
-| <a name="input_abfs_gerrit_uploader_git_servers"></a> [abfs\_gerrit\_uploader\_git\_servers](#input\_abfs\_gerrit\_uploader\_git\_servers) | List of git servers to upload to the ABFS server (e.g. ["android.googlesource.com"]) | `list(string)` | n/a | yes |
 | <a name="input_abfs_gerrit_uploader_machine_type"></a> [abfs\_gerrit\_uploader\_machine\_type](#input\_abfs\_gerrit\_uploader\_machine\_type) | Machine type for ABFS gerrit uploaders | `string` | `"n2d-standard-48"` | no |
+| <a name="input_abfs_gerrit_uploader_manifest_server"></a> [abfs\_gerrit\_uploader\_manifest\_server](#input\_abfs\_gerrit\_uploader\_manifest\_server) | The manifest server to assume | `string` | `"android.googlesource.com"` | no |
 | <a name="input_abfs_gerrit_uploader_name_prefix"></a> [abfs\_gerrit\_uploader\_name\_prefix](#input\_abfs\_gerrit\_uploader\_name\_prefix) | Name prefix for the ABFS gerrit uploader VM(s) | `string` | `"abfs-gerrit-uploader"` | no |
 | <a name="input_abfs_license"></a> [abfs\_license](#input\_abfs\_license) | ABFS license (JSON) | `string` | n/a | yes |
 | <a name="input_abfs_manifest_file"></a> [abfs\_manifest\_file](#input\_abfs\_manifest\_file) | Relative path from the manifest project root to the manifest file | `string` | `"default.xml"` | no |
 | <a name="input_abfs_manifest_project_name"></a> [abfs\_manifest\_project\_name](#input\_abfs\_manifest\_project\_name) | Name of the git project on the manifest-server containing manifests | `string` | `"platform/manifest"` | no |
-| <a name="input_abfs_uploader_cos_image_ref"></a> [abfs\_puser\_cos\_image\_ref](#input\_abfs\_puser\_cos\_image\_ref) | Reference to the COS boot image to use for the ABFS uploader | `string` | `"projects/cos-cloud/global/images/family/cos-109-lts"` | no |
 | <a name="input_abfs_server_name"></a> [abfs\_server\_name](#input\_abfs\_server\_name) | The name of the ABFS server | `string` | n/a | yes |
+| <a name="input_abfs_uploader_cos_image_ref"></a> [abfs\_uploader\_cos\_image\_ref](#input\_abfs\_uploader\_cos\_image\_ref) | Reference to the COS boot image to use for the ABFS uploader | `string` | `"projects/cos-cloud/global/images/family/cos-109-lts"` | no |
 | <a name="input_goog_cm_deployment_name"></a> [goog\_cm\_deployment\_name](#input\_goog\_cm\_deployment\_name) | The name of the deployment for Marketplace | `string` | `""` | no |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | Google Cloud project ID | `string` | n/a | yes |
 | <a name="input_service_account_email"></a> [service\_account\_email](#input\_service\_account\_email) | Email of service account to attach to the servers | `string` | n/a | yes |
diff --git a/modules/uploaders/main.tf b/modules/uploaders/main.tf
@@ -143,7 +143,7 @@ data "cloudinit_config" "abfs_gerrit_uploader_configs" {
                 abfs_datadisk_mountpoint = var.abfs_datadisk_mountpoint
                 # FIXME: Find a better way to parameterize the abfs command
                 abfs_command = <<-EOT
-                               --manifest-server ${join(",", var.abfs_gerrit_uploader_git_servers)} \
+                               --manifest-server ${var.abfs_gerrit_uploader_manifest_server} \
                                --remote-servers ${var.abfs_server_name}:50051 \
                                --manifest-project-name ${var.abfs_manifest_project_name} \
                                gerrit upload-daemon ${var.abfs_gerrit_uploader_count} ${count.index} \
diff --git a/modules/uploaders/variables.tf b/modules/uploaders/variables.tf
@@ -68,9 +68,10 @@ variable "abfs_gerrit_uploader_datadisk_type" {
   type        = string
 }
 
-variable "abfs_gerrit_uploader_git_servers" {
-  description = "List of git servers to upload to the ABFS server (e.g. [\"android.googlesource.com\"])"
-  type        = list(string)
+variable "abfs_gerrit_uploader_manifest_server" {
+  default     = "android.googlesource.com"
+  description = "The manifest server to assume"
+  type        = string
 }
 
 variable "abfs_gerrit_uploader_git_branch" {

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,10 @@ variable "abfs_docker_image_uri" {`
`32`	`32`	`type = string`
`33`	`33`	`}`
`34`	`34`
`35`		`-variable "abfs_gerrit_uploader_git_servers" {`
`36`		`- description = "List of git servers to upload to the ABFS server (e.g. [\"android.googlesource.com\"])"`
`37`		`- type = list(string)`
	`35`	`+variable "abfs_gerrit_uploader_manifest_server" {`
	`36`	`+ default = "android.googlesource.com"`
	`37`	`+ description = "The manifest server to assume"`
	`38`	`+ type = string`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`variable "abfs_license" {`
Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,10 @@ variable "abfs_gerrit_uploader_datadisk_type" {`
`68`	`68`	`type = string`
`69`	`69`	`}`
`70`	`70`
`71`		`-variable "abfs_gerrit_uploader_git_servers" {`
`72`		`- description = "List of git servers to upload to the ABFS server (e.g. [\"android.googlesource.com\"])"`
`73`		`- type = list(string)`
	`71`	`+variable "abfs_gerrit_uploader_manifest_server" {`
	`72`	`+ default = "android.googlesource.com"`
	`73`	`+ description = "The manifest server to assume"`
	`74`	`+ type = string`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`variable "abfs_gerrit_uploader_git_branch" {`