Add disk.provisioned_iops to compute_instance_template (#8528) (#6071)

* Add disk.provisioned_iops to compute_instance_template * Add to region template as well * Add provisioned_iops to disk characteristics that are used for array ordering Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Aug 15, 2023 · a5f80e0 · a5f80e0
1 parent 881ed02
commit a5f80e0
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 6 deletions.
diff --git a/.changelog/8528.txt b/.changelog/8528.txt
@@ -0,0 +1,6 @@
+```release-note:enhancement
+compute: added `disk.provisioned_iops` to `google_compute_instance_template`
+```
+```release-note:enhancement
+compute: added `disk.provisioned_iops` to `google_compute_region_instance_template`
+```
diff --git a/google-beta/services/compute/resource_compute_instance_template.go b/google-beta/services/compute/resource_compute_instance_template.go
@@ -163,6 +163,14 @@ func ResourceComputeInstanceTemplate() *schema.Resource {
 							Description: `A set of key/value label pairs to assign to disks,`,
 						},
 
+						"provisioned_iops": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: `Indicates how many IOPS to provision for the disk. This sets the number of I/O operations per second that the disk can handle. Values must be between 10,000 and 120,000. For more details, see the [Extreme persistent disk documentation](https://cloud.google.com/compute/docs/disks/extreme-persistent-disk).`,
+						},
+
 						"source_image": {
 							Type:        schema.TypeString,
 							Optional:    true,
@@ -1090,7 +1098,7 @@ func buildDisks(d *schema.ResourceData, config *transport_tpg.Config) ([]*comput
 		}
 		if v, ok := d.GetOk(prefix + ".source"); ok {
 			disk.Source = v.(string)
-			conflicts := []string{"disk_size_gb", "disk_name", "disk_type", "source_image", "source_snapshot", "labels"}
+			conflicts := []string{"disk_size_gb", "disk_name", "disk_type", "provisioned_iops", "source_image", "source_snapshot", "labels"}
 			for _, conflict := range conflicts {
 				if _, ok := d.GetOk(prefix + "." + conflict); ok {
 					return nil, fmt.Errorf("Cannot use `source` with any of the fields in %s", conflicts)
@@ -1110,6 +1118,9 @@ func buildDisks(d *schema.ResourceData, config *transport_tpg.Config) ([]*comput
 			if v, ok := d.GetOk(prefix + ".disk_type"); ok {
 				disk.InitializeParams.DiskType = v.(string)
 			}
+			if v, ok := d.GetOk(prefix + ".provisioned_iops"); ok {
+				disk.InitializeParams.ProvisionedIops = int64(v.(int))
+			}
 
 			disk.InitializeParams.Labels = tpgresource.ExpandStringMap(d, prefix+".labels")
 
@@ -1307,11 +1318,12 @@ func resourceComputeInstanceTemplateCreate(d *schema.ResourceData, meta interfac
 }
 
 type diskCharacteristics struct {
-	mode        string
-	diskType    string
-	diskSizeGb  string
-	autoDelete  bool
-	sourceImage string
+	mode            string
+	diskType        string
+	diskSizeGb      string
+	autoDelete      bool
+	sourceImage     string
+	provisionedIops string
 }
 
 func diskCharacteristicsFromMap(m map[string]interface{}) diskCharacteristics {
@@ -1340,6 +1352,13 @@ func diskCharacteristicsFromMap(m map[string]interface{}) diskCharacteristics {
 	if v := m["source_image"]; v != nil {
 		dc.sourceImage = v.(string)
 	}
+
+	if v := m["provisioned_iops"]; v != nil {
+		// Terraform and GCP return ints as different types (int vs int64), so just
+		// use strings to compare for simplicity.
+		dc.provisionedIops = fmt.Sprintf("%v", v)
+	}
+
 	return dc
 }
 
@@ -1362,6 +1381,7 @@ func flattenDisk(disk *compute.AttachedDisk, configDisk map[string]any, defaultP
 			diskMap["source_image"] = ""
 		}
 		diskMap["disk_type"] = disk.InitializeParams.DiskType
+		diskMap["provisioned_iops"] = disk.InitializeParams.ProvisionedIops
 		diskMap["disk_name"] = disk.InitializeParams.DiskName
 		diskMap["labels"] = disk.InitializeParams.Labels
 		// The API does not return a disk size value for scratch disks. They are largely only one size,

diff --git a/google-beta/services/compute/resource_compute_instance_template_test.go b/google-beta/services/compute/resource_compute_instance_template_test.go
@@ -330,6 +330,26 @@ func TestAccComputeInstanceTemplate_regionDisks(t *testing.T) {
 	})
 }
 
+func TestAccComputeInstanceTemplate_diskIops(t *testing.T) {
+	t.Parallel()
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeInstanceTemplateDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeInstanceTemplate_diskIops(acctest.RandString(t, 10)),
+			},
+			{
+				ResourceName:      "google_compute_instance_template.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccComputeInstanceTemplate_subnet_auto(t *testing.T) {
 	t.Parallel()
 
@@ -2204,6 +2224,35 @@ resource "google_compute_instance_template" "foobar" {
 `, suffix, suffix)
 }
 
+func testAccComputeInstanceTemplate_diskIops(suffix string) string {
+	return fmt.Sprintf(`
+data "google_compute_image" "my_image" {
+  family  = "debian-11"
+  project = "debian-cloud"
+}
+
+resource "google_compute_instance_template" "foobar" {
+  name         = "tf-test-instance-template-%s"
+  machine_type = "e2-medium"
+
+  disk {
+    source_image = data.google_compute_image.my_image.self_link
+    auto_delete      = true
+    disk_size_gb     = 100
+    boot             = true
+    provisioned_iops = 10000
+    labels = {
+      foo = "bar"
+    }
+  }
+
+  network_interface {
+    network = "default"
+  }
+}
+`, suffix)
+}
+
 func testAccComputeInstanceTemplate_subnet_auto(network, suffix string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {

diff --git a/google-beta/services/compute/resource_compute_region_instance_template.go b/google-beta/services/compute/resource_compute_region_instance_template.go
@@ -143,6 +143,14 @@ func ResourceComputeRegionInstanceTemplate() *schema.Resource {
 							Description: `A set of key/value label pairs to assign to disks,`,
 						},
 
+						"provisioned_iops": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							ForceNew:    true,
+							Computed:    true,
+							Description: `Indicates how many IOPS to provision for the disk. This sets the number of I/O operations per second that the disk can handle. Values must be between 10,000 and 120,000. For more details, see the [Extreme persistent disk documentation](https://cloud.google.com/compute/docs/disks/extreme-persistent-disk).`,
+						},
+
 						"source_image": {
 							Type:        schema.TypeString,
 							Optional:    true,

diff --git a/google-beta/services/compute/resource_compute_region_instance_template_test.go b/google-beta/services/compute/resource_compute_region_instance_template_test.go
@@ -274,6 +274,26 @@ func TestAccComputeRegionInstanceTemplate_regionDisks(t *testing.T) {
 	})
 }
 
+func TestAccComputeRegionInstanceTemplate_diskIops(t *testing.T) {
+	t.Parallel()
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeRegionInstanceTemplateDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeRegionInstanceTemplate_diskIops(acctest.RandString(t, 10)),
+			},
+			{
+				ResourceName:      "google_compute_region_instance_template.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccComputeRegionInstanceTemplate_subnet_auto(t *testing.T) {
 	t.Parallel()
 
@@ -2060,6 +2080,33 @@ resource "google_compute_region_instance_template" "foobar" {
 `, suffix, suffix)
 }
 
+func testAccComputeRegionInstanceTemplate_diskIops(suffix string) string {
+	return fmt.Sprintf(`
+data "google_compute_image" "my_image" {
+  family  = "debian-11"
+  project = "debian-cloud"
+}
+
+resource "google_compute_region_instance_template" "foobar" {
+  name         = "tf-test-instance-template-%s"
+  machine_type = "e2-medium"
+  region       = "us-central1"
+
+  disk {
+    source_image = data.google_compute_image.my_image.self_link
+    auto_delete      = true
+    disk_size_gb     = 100
+    boot             = true
+    provisioned_iops = 10000
+  }
+
+  network_interface {
+    network = "default"
+  }
+}
+`, suffix)
+}
+
 func testAccComputeRegionInstanceTemplate_subnet_auto(network, suffix string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {