feat: add the possibility to add extra parameters to the ABFS command

kunzese · sce-taid · commit 7d156b784a05 · 2025-10-27T14:37:32.000Z
chore: bump terraform-google-iam from 8.1.0 to 8.2.0

PiperOrigin-RevId: 822913301
diff --git a/examples/simple/iam.tf b/examples/simple/iam.tf
@@ -96,7 +96,7 @@ resource "google_service_account" "client" {
 
 module "project-iam-bindings" {
   source  = "terraform-google-modules/iam/google//modules/projects_iam"
-  version = "8.1.0"
+  version = "8.2.0"
 
   projects = [data.google_project.project.project_id]
   mode     = "authoritative"
diff --git a/modules/server/README.md b/modules/server/README.md
@@ -16,6 +16,7 @@ For example usage, please check the following [example](../../examples/simple/ma
 | <a name="input_abfs_bucket_location"></a> [abfs\_bucket\_location](#input\_abfs\_bucket\_location) | The location of the ABFS bucket (https://cloud.google.com/storage/docs/locations). | `string` | n/a | yes |
 | <a name="input_abfs_bucket_name"></a> [abfs\_bucket\_name](#input\_abfs\_bucket\_name) | The name of the ABFS bucket. | `string` | `"abfs"` | no |
 | <a name="input_abfs_docker_image_uri"></a> [abfs\_docker\_image\_uri](#input\_abfs\_docker\_image\_uri) | Docker image URI for the ABFS server | `string` | n/a | yes |
+| <a name="input_abfs_extra_params"></a> [abfs\_extra\_params](#input\_abfs\_extra\_params) | A list of extra parameters to append to the abfs command | `list(string)` | `[]` | no |
 | <a name="input_abfs_license"></a> [abfs\_license](#input\_abfs\_license) | ABFS license (JSON) | `string` | n/a | yes |
 | <a name="input_abfs_server_allow_stopping_for_update"></a> [abfs\_server\_allow\_stopping\_for\_update](#input\_abfs\_server\_allow\_stopping\_for\_update) | Allow to stop the server to update properties | `bool` | `true` | no |
 | <a name="input_abfs_server_cos_image_ref"></a> [abfs\_server\_cos\_image\_ref](#input\_abfs\_server\_cos\_image\_ref) | Reference to the COS boot image to use for the ABFS server | `string` | `"projects/cos-cloud/global/images/family/cos-109-lts"` | no |
diff --git a/modules/server/main.tf b/modules/server/main.tf
@@ -141,7 +141,8 @@ data "cloudinit_config" "abfs_server" {
                     --project ${google_spanner_instance.abfs.project} \
                     --bucket ${data.google_storage_bucket.abfs.name} \
                     --instance ${google_spanner_instance.abfs.name} \
-                    --db ${google_spanner_database.abfs.name}
+                    --db ${google_spanner_database.abfs.name} \
+                    ${join(" ", var.abfs_extra_params)}
                   EOT
                   "ABFS_DOCKER_IMAGE_URI" = var.abfs_docker_image_uri,
                 }
diff --git a/modules/server/metadata.yaml b/modules/server/metadata.yaml
@@ -72,6 +72,10 @@ spec:
         description: Docker image URI for the ABFS server
         varType: string
         required: true
+      - name: abfs_extra_params
+        description: A list of extra parameters to append to the abfs command
+        varType: list(string)
+        defaultValue: []
       - name: abfs_bootdisk_size_gb
         description: Size in GB for the ABFS bootdisk that will be attached to the VM
         varType: number
diff --git a/modules/server/variables.tf b/modules/server/variables.tf
@@ -84,6 +84,12 @@ variable "abfs_bootdisk_type" {
   default     = "pd-ssd"
 }
 
+variable "abfs_extra_params" {
+  type        = list(string)
+  description = "A list of extra parameters to append to the abfs command"
+  default     = []
+}
+
 // Google Cloud Storage
 variable "existing_bucket_name" {
   type        = string
diff --git a/modules/uploaders/README.md b/modules/uploaders/README.md
@@ -14,11 +14,13 @@ For example usage, please check the following [example](../../examples/simple/ma
 | <a name="input_abfs_datadisk_mountpoint"></a> [abfs\_datadisk\_mountpoint](#input\_abfs\_datadisk\_mountpoint) | Location for mounting the ABFS datadisk on the host VM | `string` | `"/mnt/disks/abfs-data"` | no |
 | <a name="input_abfs_docker_image_uri"></a> [abfs\_docker\_image\_uri](#input\_abfs\_docker\_image\_uri) | Docker image URI for the ABFS uploader | `string` | n/a | yes |
 | <a name="input_abfs_enable_git_lfs"></a> [abfs\_enable\_git\_lfs](#input\_abfs\_enable\_git\_lfs) | Enable Git LFS support | `bool` | `false` | no |
+| <a name="input_abfs_extra_params"></a> [abfs\_extra\_params](#input\_abfs\_extra\_params) | A list of extra parameters to append to the abfs command | `list(string)` | `[]` | no |
 | <a name="input_abfs_gerrit_uploader_allow_stopping_for_update"></a> [abfs\_gerrit\_uploader\_allow\_stopping\_for\_update](#input\_abfs\_gerrit\_uploader\_allow\_stopping\_for\_update) | Allow to stop uploaders to update properties | `bool` | `true` | no |
 | <a name="input_abfs_gerrit_uploader_count"></a> [abfs\_gerrit\_uploader\_count](#input\_abfs\_gerrit\_uploader\_count) | The number of gerrit uploader instances to create | `number` | `3` | no |
 | <a name="input_abfs_gerrit_uploader_datadisk_name_prefix"></a> [abfs\_gerrit\_uploader\_datadisk\_name\_prefix](#input\_abfs\_gerrit\_uploader\_datadisk\_name\_prefix) | A name prefix for the ABFS gerrit uploader datadisk(s) that will be attached to VM(s). Note, this does not affect the mounting of the disk - the device name is always set to "abfs-server-storage" | `string` | `"abfs-gerrit-uploader-datadisk"` | no |
 | <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_extra_params"></a> [abfs\_gerrit\_uploader\_extra\_params](#input\_abfs\_gerrit\_uploader\_extra\_params) | A list of extra parameters to append to the gerrit upload-daemon sub-command | `list(string)` | `[]` | no |
 | <a name="input_abfs_gerrit_uploader_git_branch"></a> [abfs\_gerrit\_uploader\_git\_branch](#input\_abfs\_gerrit\_uploader\_git\_branch) | Branches from where to find projects (e.g. ["main","v-keystone-qcom-release"]) (default ["main"]) | `set(string)` | <pre>[<br/>  "main"<br/>]</pre> | no |
 | <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 |
diff --git a/modules/uploaders/main.tf b/modules/uploaders/main.tf
@@ -179,10 +179,12 @@ data "cloudinit_config" "abfs_gerrit_uploader_configs" {
                     --remote-servers ${var.abfs_server_name}:50051 \
                     --manifest-project-name ${var.abfs_manifest_project_name} \
                     --lfs=${var.abfs_enable_git_lfs} \
+                    ${join(" ", var.abfs_extra_params)} \
                     gerrit upload-daemon ${var.abfs_gerrit_uploader_count} ${count.index} \
                     --branch ${join(",", var.abfs_gerrit_uploader_git_branch)} \
                     --project-storage-path /abfs-storage \
-                    --manifest-file ${var.abfs_manifest_file}
+                    --manifest-file ${var.abfs_manifest_file} \
+                    ${join(" ", var.abfs_gerrit_uploader_extra_params)}
                   EOT
                   "ABFS_DOCKER_IMAGE_URI"      = var.abfs_docker_image_uri,
                   "DATADISK_MOUNTPOINT"        = var.abfs_datadisk_mountpoint,
diff --git a/modules/uploaders/metadata.yaml b/modules/uploaders/metadata.yaml
@@ -85,6 +85,14 @@ spec:
         varType: set(string)
         defaultValue:
           - main
+      - name: abfs_extra_params
+        description: A list of extra parameters to append to the abfs command
+        varType: list(string)
+        defaultValue: []
+      - name: abfs_gerrit_uploader_extra_params
+        description: A list of extra parameters to append to the gerrit upload-daemon sub-command
+        varType: list(string)
+        defaultValue: []
       - name: abfs_enable_git_lfs
         description: Enable Git LFS support
         varType: bool
diff --git a/modules/uploaders/variables.tf b/modules/uploaders/variables.tf
@@ -86,6 +86,18 @@ variable "abfs_gerrit_uploader_git_branch" {
   default     = ["main"]
 }
 
+variable "abfs_extra_params" {
+  type        = list(string)
+  description = "A list of extra parameters to append to the abfs command"
+  default     = []
+}
+
+variable "abfs_gerrit_uploader_extra_params" {
+  type        = list(string)
+  description = "A list of extra parameters to append to the gerrit upload-daemon sub-command"
+  default     = []
+}
+
 variable "abfs_enable_git_lfs" {
   type        = bool
   description = "Enable Git LFS support"
