Add labels to resources/modules where missing

resources/compute/simple-instance/README.md

@@ -55,6 +55,7 @@ No modules.
 
 | Name | Type |
 |------|------|
+| [google_compute_disk.boot_disk](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_disk) | resource |
 | [google_compute_instance.compute_vm](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance) | resource |
 | [google_compute_image.compute_image](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_image) | data source |
 

resources/compute/simple-instance/main.tf

@@ -19,6 +19,18 @@ data "google_compute_image" "compute_image" {
   project = var.instance_image.project
 }
 
+resource "google_compute_disk" "boot_disk" {
+  count = var.instance_count
+
+  name = var.name_prefix != null ? (
+    "${var.name_prefix}-boot-disk-${count.index}") : (
+  "${var.deployment_name}-boot-disk-${count.index}")
+  image  = data.google_compute_image.compute_image.self_link
+  type   = var.disk_type
+  size   = var.disk_size_gb
+  labels = var.labels
+}
+
 resource "google_compute_instance" "compute_vm" {
   count = var.instance_count
 
@@ -31,11 +43,9 @@ resource "google_compute_instance" "compute_vm" {
   labels = var.labels
 
   boot_disk {
-    initialize_params {
-      image = data.google_compute_image.compute_image.self_link
-      type  = var.disk_type
-      size  = var.disk_size_gb
-    }
+    source      = google_compute_disk.boot_disk[count.index].self_link
+    device_name = google_compute_disk.boot_disk[count.index].name
+    auto_delete = true
   }
 
   network_interface {

resources/compute/simple-instance/module.json

@@ -139,6 +139,15 @@
     }
   ],
   "resources": [
+    {
+      "type": "compute_disk",
+      "name": "boot_disk",
+      "provider": "google",
+      "source": "hashicorp/google",
+      "mode": "managed",
+      "version": "latest",
+      "description": null
+    },
     {
       "type": "compute_instance",
       "name": "compute_vm",

resources/project/new-project/README.md

@@ -59,6 +59,7 @@ No resources.
 | <a name="input_billing_account"></a> [billing\_account](#input\_billing\_account) | The ID of the billing account to associate projects with. | `string` | n/a | yes |
 | <a name="input_default_service_account"></a> [default\_service\_account](#input\_default\_service\_account) | Project default service account setting: can be one of `delete`, `deprivilege`, `disable`, or `keep`. | `string` | `"keep"` | no |
 | <a name="input_folder_id"></a> [folder\_id](#input\_folder\_id) | ID of the Folder | `string` | n/a | yes |
+| <a name="input_labels"></a> [labels](#input\_labels) | Labels for the project. List key, value pairs. | `any` | n/a | yes |
 | <a name="input_org_id"></a> [org\_id](#input\_org\_id) | ID of the organization | `string` | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | ID of the Project | `string` | n/a | yes |
 

resources/project/new-project/main.tf

@@ -24,4 +24,5 @@ module "project_factory" {
   org_id                  = var.org_id
   billing_account         = var.billing_account
   default_service_account = var.default_service_account
+  labels                  = var.labels
 }

resources/project/new-project/module.json

@@ -23,6 +23,13 @@
       "default": null,
       "required": true
     },
+    {
+      "name": "labels",
+      "type": "any",
+      "description": "Labels for the project. List key, value pairs.",
+      "default": null,
+      "required": true
+    },
     {
       "name": "org_id",
       "type": "string",

resources/project/new-project/variables.tf

@@ -39,3 +39,8 @@ variable "org_id" {
   description = "ID of the organization"
   type        = string
 }
+
+variable "labels" {
+  description = "Labels for the project. List key, value pairs."
+  type        = any
+}

resources/scripts/startup-script/README.md

@@ -112,6 +112,7 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_debug_file"></a> [debug\_file](#input\_debug\_file) | Path to an optional local to be written with 'startup\_script\_content'. | `string` | `null` | no |
 | <a name="input_deployment_name"></a> [deployment\_name](#input\_deployment\_name) | Name of the HPC deployment, used to name GCS bucket for startup scripts. | `string` | n/a | yes |
+| <a name="input_labels"></a> [labels](#input\_labels) | Labels for the created GCS bucket. List key, value pairs. | `any` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The region to deploy to | `string` | n/a | yes |
 | <a name="input_runners"></a> [runners](#input\_runners) | List of runners to run on remote VM.<br>    Runners can be of type ansible-local, shell or data.<br>    A runner must specify one of 'source' or 'content'.<br>    All runners must specify 'destination'. If 'destination' does not include a<br>    path, it will be copied in a temporary folder and deleted after running.<br>    Runners may also pass 'args', which will be passed as argument to shell runners only. | `list(map(string))` | `[]` | no |
 

resources/scripts/startup-script/main.tf

@@ -63,6 +63,7 @@ resource "google_storage_bucket" "configs_bucket" {
   uniform_bucket_level_access = true
   location                    = var.region
   storage_class               = "REGIONAL"
+  labels                      = var.labels
 }
 
 resource "google_storage_bucket_object" "scripts" {

resources/scripts/startup-script/module.json

@@ -16,6 +16,13 @@
       "default": null,
       "required": true
     },
+    {
+      "name": "labels",
+      "type": "any",
+      "description": "Labels for the created GCS bucket. List key, value pairs.",
+      "default": null,
+      "required": true
+    },
     {
       "name": "region",
       "type": "string",

resources/scripts/startup-script/variables.tf

@@ -31,6 +31,11 @@ variable "debug_file" {
   default     = null
 }
 
+variable "labels" {
+  description = "Labels for the created GCS bucket. List key, value pairs."
+  type        = any
+}
+
 variable "runners" {
   description = <<EOT
     List of runners to run on remote VM.