feat: allow the use of an existing GCS bucket

PiperOrigin-RevId: 781576884

Author: kunzese

modules/server/README.md

@@ -17,13 +17,15 @@ For example usage, please check the following [example](../../examples/simple/ma
 | abfs\_bucket\_name | The name of the ABFS bucket. | `string` | `"abfs"` | no |
 | abfs\_docker\_image\_uri | Docker image URI for the ABFS server | `string` | n/a | yes |
 | abfs\_license | ABFS license (JSON) | `string` | n/a | yes |
+| abfs\_server\_allow\_stopping\_for\_update | Allow to stop the server to update properties | `bool` | `true` | no |
 | 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 |
 | abfs\_server\_machine\_type | Machine type for ABFS servers | `string` | `"n2-highmem-128"` | no |
 | abfs\_server\_name | Name for the ABFS server | `string` | `"abfs-server"` | no |
 | abfs\_spanner\_database\_name | A unique identifier for the ABFS database, which cannot be changed after the instance is created. | `string` | `"abfs"` | no |
 | abfs\_spanner\_instance\_config | The name of the instance's configuration (similar but not quite the same as a region) which defines the geographic placement and replication of your ABFS database in this instance. | `string` | n/a | yes |
 | abfs\_spanner\_instance\_display\_name | The descriptive name for the ABFS instance as it appears in UIs. | `string` | `"ABFS"` | no |
 | abfs\_spanner\_instance\_name | A unique identifier for the ABFS instance, which cannot be changed after the instance is created. | `string` | `"abfs"` | no |
+| existing\_bucket\_name | The name of the existing ABFS bucket to use. If not specified, a new bucket will be created. | `string` | `""` | no |
 | goog\_cm\_deployment\_name | The name of the deployment for Marketplace | `string` | `""` | no |
 | project\_id | Google Cloud project ID | `string` | n/a | yes |
 | service\_account\_email | Email of service account to attach to the servers | `string` | n/a | yes |

modules/server/gcs.tf

@@ -12,13 +12,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+moved {
+  from = google_storage_bucket.abfs
+  to   = google_storage_bucket.abfs[0]
+}
+
+moved {
+  from = random_bytes.abfs_bucket_prefix
+  to   = random_bytes.abfs_bucket_prefix[0]
+}
+
+data "google_storage_bucket" "abfs" {
+  project = var.project_id
+  name    = var.existing_bucket_name == "" ? google_storage_bucket.abfs[0].name : var.existing_bucket_name
+}
+
 resource "random_bytes" "abfs_bucket_prefix" {
+  count  = var.existing_bucket_name == "" ? 1 : 0
   length = 2
 }
 
 resource "google_storage_bucket" "abfs" {
+  count                       = var.existing_bucket_name == "" ? 1 : 0
   project                     = var.project_id
-  name                        = "${var.abfs_bucket_name}-${random_bytes.abfs_bucket_prefix.hex}"
+  name                        = "${var.abfs_bucket_name}-${random_bytes.abfs_bucket_prefix[0].hex}"
   location                    = var.abfs_bucket_location
   public_access_prevention    = "enforced"
   uniform_bucket_level_access = true

modules/server/main.tf

@@ -136,7 +136,7 @@ data "cloudinit_config" "abfs_server" {
                 envs = {
                   "ABFS_CMD"              = <<-EOT
                     --project ${google_spanner_instance.abfs.project} \
-                    --bucket ${google_storage_bucket.abfs.name} \
+                    --bucket ${data.google_storage_bucket.abfs.name} \
                     --instance ${google_spanner_instance.abfs.name} \
                     --db ${google_spanner_database.abfs.name}
                   EOT

modules/server/metadata.yaml

@@ -48,6 +48,10 @@ spec:
         description: Email of service account to attach to the servers
         varType: string
         required: true
+      - name: abfs_server_allow_stopping_for_update
+        description: Allow to stop the server to update properties
+        varType: bool
+        defaultValue: true
       - name: abfs_server_machine_type
         description: Machine type for ABFS servers
         varType: string
@@ -76,6 +80,10 @@ spec:
         description: The PD regional disk type to use for the ABFS bootdisk
         varType: string
         defaultValue: pd-ssd
+      - name: existing_bucket_name
+        description: The name of the existing ABFS bucket to use. If not specified, a new bucket will be created.
+        varType: string
+        defaultValue: ""
       - name: abfs_bucket_name
         description: The name of the ABFS bucket.
         varType: string

modules/server/variables.tf

@@ -85,6 +85,12 @@ variable "abfs_bootdisk_type" {
 }
 
 // Google Cloud Storage
+variable "existing_bucket_name" {
+  type        = string
+  description = "The name of the existing ABFS bucket to use. If not specified, a new bucket will be created."
+  default     = ""
+}
+
 variable "abfs_bucket_name" {
   type        = string
   description = "The name of the ABFS bucket."

modules/uploaders/README.md

@@ -14,6 +14,7 @@ For example usage, please check the following [example](../../examples/simple/ma
 | abfs\_datadisk\_mountpoint | Location for mounting the ABFS datadisk on the host VM | `string` | `"/mnt/disks/abfs-data"` | no |
 | abfs\_docker\_image\_uri | Docker image URI for the ABFS uploader | `string` | n/a | yes |
 | abfs\_enable\_git\_lfs | Enable Git LFS support | `bool` | `false` | no |
+| abfs\_gerrit\_uploader\_allow\_stopping\_for\_update | Allow to stop uploaders to update properties | `bool` | `true` | no |
 | abfs\_gerrit\_uploader\_count | The number of gerrit uploader instances to create | `number` | `3` | no |
 | 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 |
 | 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 |

modules/uploaders/metadata.yaml

@@ -48,6 +48,10 @@ spec:
         description: Email of service account to attach to the servers
         varType: string
         required: true
+      - name: abfs_gerrit_uploader_allow_stopping_for_update
+        description: Allow to stop uploaders to update properties
+        varType: bool
+        defaultValue: true
       - name: abfs_gerrit_uploader_count
         description: The number of gerrit uploader instances to create
         varType: number