feat: add CWS_custom_images defaults & refactor examples

PiperOrigin-RevId: 811798407

Author: Android Build Filesystem (ABFS) Team

examples/simple/outputs.tf

@@ -26,12 +26,24 @@ output "spanner_database_schema_creation" {
   value = var.abfs_spanner_database_create_tables ? (
     "# The abfs_spanner_database_create_tables variable was set to true; no further action required."
     ) : (
-    join(" ", [
-      "gcloud --project ${data.google_project.project.project_id}",
-      "spanner databases ddl update",
-      "--instance ${module.abfs_server.abfs_spanner_instance.name}",
-      "${module.abfs_server.abfs_spanner_database.name}",
-      "--ddl-file ${module.abfs_server.abfs_spanner_database_schema_file}",
-    ])
+    <<-EOT
+      # Execute the following command to create the Spanner database schema:
+      gcloud --project ${data.google_project.project.project_id} \
+        spanner databases ddl update \
+        --instance ${module.abfs_server.abfs_spanner_instance.name} \
+        ${module.abfs_server.abfs_spanner_database.name} \
+        --ddl-file ${module.abfs_server.abfs_spanner_database_schema_file}
+    EOT
   )
 }
+
+output "webhook_setup_instructions" {
+  description = "Instructions to set up the webhook trigger."
+  value       = var.create_cloud_workstation_resources ? module.cicd_foundation[0].webhook_setup_instructions : null
+  sensitive   = true
+}
+
+output "webhook_setup_instructions_display" {
+  description = "Instructions to set up the webhook trigger."
+  value       = var.create_cloud_workstation_resources ? module.cicd_foundation[0].webhook_setup_instructions_display : null
+}

examples/simple/services.tf

@@ -17,6 +17,7 @@ module "project-services-cloud-resource-manager" {
   version = "18.0.0"
 
   project_id                  = var.project_id
+  enable_apis                 = var.enable_apis
   disable_services_on_destroy = false
   activate_apis = [
     "cloudresourcemanager.googleapis.com"
@@ -28,6 +29,7 @@ module "project-services" {
   version = "18.0.0"
 
   project_id                  = var.project_id
+  enable_apis                 = var.enable_apis
   disable_services_on_destroy = false
   activate_apis = [
     "compute.googleapis.com",

examples/simple/terraform.tfvars.example

@@ -12,9 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-project_id = "YOUR_PROJECT_ID"
-region     = "europe-west1"
-zone       = "europe-west1-c"
+project_id                   = "YOUR_PROJECT_ID"
+region                       = "europe-west1"
+zone                         = "europe-west1-c"
+artifact_registry_region     = "europe-west1"
+cloud_build_region           = "europe-west1"
+secret_manager_region        = "europe-west1"
+secure_source_manager_region = "europe-west4"
+
+# If you don't need or want to enable APIs, set this to false.
+#enable_apis = false
 
 # If you don't need private access to Artifact Registry, set this to false.
 #create_dns_zones = false
@@ -57,16 +64,16 @@ abfs_spanner_database_create_tables = true
 
 create_cloud_workstation_resources = true
 cws_clusters = {
-  "cws-abfs-cluster" = {
+  "cws" = {
     network    = "default"
     region     = "europe-west1"
     subnetwork = "default"
   }
 }
 cws_configs = {
-  "cws-abfs-config" = {
-    cws_cluster                    = "cws-abfs-cluster"
-    idle_timeout                   = 3600
+  "cws-abfs" = {
+    cws_cluster                    = "cws"
+    idle_timeout_seconds           = 3600
     machine_type                   = "e2-standard-8"
     boot_disk_size_gb              = 64
     disable_public_ip_addresses    = true
@@ -76,13 +83,19 @@ cws_configs = {
     persistent_disk_fs_type        = "ext4"
     persistent_disk_type           = "pd-ssd"
     persistent_disk_reclaim_policy = "RETAIN"
+    custom_image_names             = [
+      "android-studio",
+      "android-studio-for-platform",
+      "code-oss",
+      "repo-builder"
+    ]
     creators                       = [
       # "[email protected]",
     ]
     instances                      = [
       {
-        name  = "cws-abfs-instance"
-        users = ["[email protected]"]
+        name  = "cws-abfs"
+        # users = ["[email protected]"]
       }
     ]
   }
@@ -91,10 +104,41 @@ cws_configs = {
 # Example for custom images for Cloud Workstations.
 # The key of the map is the name of the image to be built.
 cws_custom_images = {
-  "asfp" = {
-    # Optional: The region for the Cloud Scheduler job, defaults to the region of the Cloud Build trigger.
-    scheduler_region = "europe-west1"
-    # Optional: The schedule for the image rebuild, defaults to daily at 3 AM.
-    ci_schedule      = "0 3 * * *"
+  "android-studio" : {
+    build = {
+      # Optional: The relative path to the Dockerfile within the repository.
+      dockerfile_path = "examples/images/android/android-studio"
+      # Optional: The timeout for the build in seconds, defaults to 7200.
+      timeout_seconds = 7200
+      # Optional: The machine type to use for the build, defaults to "UNSPECIFIED".
+      machine_type    = "E2_HIGHCPU_32"
+    }
+    #workstation_config = {
+    #  # Optional: The region for the Cloud Scheduler job, defaults to the region of the Cloud Build trigger.
+    #  scheduler_region = "europe-west1"
+    #  # Optional: The schedule for the image rebuild, defaults to daily at 3 AM.
+    #  ci_schedule      = "0 3 * * *"
+    #}
+  },
+  "android-studio-for-platform" = {
+    build = {
+      dockerfile_path = "examples/images/android-open-source-project/android-studio-for-platform"
+      timeout_seconds = 7200
+      machine_type = "E2_HIGHCPU_32"
+    }
   }
+  "code-oss" : {
+    build = {
+      dockerfile_path = "examples/images/android-open-source-project/code-oss"
+      timeout_seconds = 7200
+      machine_type    = "E2_HIGHCPU_32"
+    }
+  },
+  "repo-builder" : {
+    build = {
+      dockerfile_path = "examples/images/android-open-source-project/repo-builder"
+      timeout_seconds = 7200
+      machine_type    = "E2_HIGHCPU_32"
+    }
+  },
 }