Skip to content

Commit eee3dc7

Browse files
Android Build Filesystem (ABFS) Teamsce-taid
authored andcommitted
exposing some variables from modules in example
PiperOrigin-RevId: 780534777
1 parent f6901ce commit eee3dc7

File tree

5 files changed

+51
-30
lines changed

5 files changed

+51
-30
lines changed

examples/simple/main.tf

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,27 @@ module "abfs_server" {
3232
abfs_docker_image_uri = var.abfs_docker_image_uri
3333
abfs_license = var.abfs_license
3434
abfs_bucket_location = var.abfs_bucket_location
35+
abfs_server_machine_type = var.abfs_server_machine_type
3536
abfs_spanner_instance_config = var.abfs_spanner_instance_config
3637
}
3738

3839
module "abfs_uploaders" {
3940
source = "github.com/terraform-google-modules/terraform-google-abfs//modules/uploaders?ref=v0.6.0"
4041

41-
project_id = data.google_project.project.project_id
42-
zone = var.zone
43-
service_account_email = data.google_service_account.abfs.email
44-
subnetwork = module.abfs-vpc.subnets["${var.region}/abfs-subnet"].name
45-
abfs_docker_image_uri = var.abfs_docker_image_uri
46-
abfs_gerrit_uploader_manifest_server = var.abfs_gerrit_uploader_manifest_server
47-
abfs_gerrit_uploader_git_branch = var.abfs_gerrit_uploader_git_branch
48-
abfs_manifest_project_name = var.abfs_manifest_project_name
49-
abfs_manifest_file = var.abfs_manifest_file
50-
abfs_license = var.abfs_license
51-
abfs_server_name = module.abfs_server.abfs_server_name
42+
project_id = data.google_project.project.project_id
43+
zone = var.zone
44+
service_account_email = data.google_service_account.abfs.email
45+
subnetwork = module.abfs-vpc.subnets["${var.region}/abfs-subnet"].name
46+
abfs_docker_image_uri = var.abfs_docker_image_uri
47+
abfs_gerrit_uploader_count = var.abfs_gerrit_uploader_count
48+
abfs_gerrit_uploader_machine_type = var.abfs_gerrit_uploader_machine_type
49+
abfs_gerrit_uploader_datadisk_size_gb = var.abfs_gerrit_uploader_datadisk_size_gb
50+
abfs_gerrit_uploader_manifest_server = var.abfs_gerrit_uploader_manifest_server
51+
abfs_gerrit_uploader_git_branch = var.abfs_gerrit_uploader_git_branch
52+
abfs_manifest_project_name = var.abfs_manifest_project_name
53+
abfs_manifest_file = var.abfs_manifest_file
54+
abfs_license = var.abfs_license
55+
abfs_server_name = module.abfs_server.abfs_server_name
5256
}
5357

5458
module "monitoring" {

examples/simple/monitoring/terraform.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ terraform {
2121
}
2222
}
2323
}
24+
25+
provider "google" {
26+
project = var.project_id
27+
region = var.region
28+
zone = var.zone
29+
}

examples/simple/providers.tf

Lines changed: 0 additions & 19 deletions
This file was deleted.

examples/simple/terraform.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,9 @@ terraform {
2727
# prefix = "terraform/abfs"
2828
# }
2929
}
30+
31+
provider "google" {
32+
project = var.project_id
33+
region = var.region
34+
zone = var.zone
35+
}

examples/simple/variables.tf

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,24 @@ variable "abfs_manifest_file" {
5050
default = "default.xml"
5151
}
5252

53+
variable "abfs_gerrit_uploader_count" {
54+
type = number
55+
description = "The number of gerrit uploader instances to create"
56+
default = 3
57+
}
58+
59+
variable "abfs_gerrit_uploader_machine_type" {
60+
type = string
61+
description = "Machine type for ABFS gerrit uploaders"
62+
default = "n2d-standard-48"
63+
}
64+
65+
variable "abfs_gerrit_uploader_datadisk_size_gb" {
66+
type = number
67+
description = "Size in GB for the ABFS gerrit uploader datadisk(s) that will be attached to the VM(s)"
68+
default = 4096
69+
}
70+
5371
variable "abfs_gerrit_uploader_manifest_server" {
5472
type = string
5573
description = "The manifest server to assume"
@@ -71,6 +89,12 @@ variable "abfs_service_account_id" {
7189
description = "ABFS service account ID (e.g. abfs@<project-id>.iam.gserviceaccount.com)"
7290
}
7391

92+
variable "abfs_server_machine_type" {
93+
type = string
94+
description = "Machine type for ABFS servers"
95+
default = "n2-highmem-128"
96+
}
97+
7498
variable "abfs_bucket_location" {
7599
type = string
76100
description = "The location of the ABFS bucket (https://cloud.google.com/storage/docs/locations)."

0 commit comments

Comments
 (0)