Supporting labelling of disks (GoogleCloudPlatform#2106)

Merged PR GoogleCloudPlatform#2106.
george-oakling · Jul 26, 2019 · 928e6ce · 928e6ce
1 parent 36eac66
commit 928e6ce
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/resources/resource_compute_instance.go b/third_party/terraform/resources/resource_compute_instance.go
@@ -115,6 +115,13 @@ func resourceComputeInstance() *schema.Resource {
 										ForceNew:         true,
 										DiffSuppressFunc: diskImageDiffSuppress,
 									},
+
+									"labels": {
+										Type:     schema.TypeMap,
+										Optional: true,
+										Computed: true,
+										ForceNew: true,
+									},
 								},
 							},
 						},
@@ -1652,6 +1659,10 @@ func expandBootDisk(d *schema.ResourceData, config *Config, zone *compute.Zone,
 
 			disk.InitializeParams.SourceImage = imageUrl
 		}
+
+		if _, ok := d.GetOk("boot_disk.0.initialize_params.0.labels"); ok {
+			disk.InitializeParams.Labels = expandStringMap(d, "boot_disk.0.initialize_params.0.labels")
+		}
 	}
 
 	return disk, nil
@@ -1682,8 +1693,9 @@ func flattenBootDisk(d *schema.ResourceData, disk *computeBeta.AttachedDisk, con
 			"type": GetResourceNameFromSelfLink(diskDetails.Type),
 			// If the config specifies a family name that doesn't match the image name, then
 			// the diff won't be properly suppressed. See DiffSuppressFunc for this field.
-			"image": diskDetails.SourceImage,
-			"size":  diskDetails.SizeGb,
+			"image":  diskDetails.SourceImage,
+			"size":   diskDetails.SizeGb,
+			"labels": diskDetails.Labels,
 		}}
 	}
 

diff --git a/third_party/terraform/resources/resource_compute_instance_template.go b/third_party/terraform/resources/resource_compute_instance_template.go
@@ -99,6 +99,15 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 							Computed: true,
 						},
 
+						"labels": {
+							Type:     schema.TypeMap,
+							Optional: true,
+							ForceNew: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+
 						"source_image": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -599,6 +608,8 @@ func buildDisks(d *schema.ResourceData, config *Config) ([]*computeBeta.Attached
 				}
 				disk.InitializeParams.SourceImage = imageUrl
 			}
+
+			disk.InitializeParams.Labels = expandStringMap(d, prefix+".labels")
 		}
 
 		if v, ok := d.GetOk(prefix + ".interface"); ok {
@@ -784,6 +795,7 @@ func flattenDisk(disk *computeBeta.AttachedDisk, defaultProject string) (map[str
 		diskMap["disk_type"] = disk.InitializeParams.DiskType
 		diskMap["disk_name"] = disk.InitializeParams.DiskName
 		diskMap["disk_size_gb"] = disk.InitializeParams.DiskSizeGb
+		diskMap["labels"] = disk.InitializeParams.Labels
 	}
 
 	if disk.DiskEncryptionKey != nil {

diff --git a/third_party/terraform/tests/resource_compute_instance_template_test.go b/third_party/terraform/tests/resource_compute_instance_template_test.go
@@ -1335,6 +1335,9 @@ resource "google_compute_instance_template" "foobar" {
 		auto_delete = true
 		disk_size_gb = 100
 		boot = true
+		labels = {
+			foo = "bar"
+		}
 	}
 
 	disk {