From 35f3d0bb98bed3e8ecf1b4416d68b3ebed9f7338 Mon Sep 17 00:00:00 2001
From: Edward Sun <sunedward@google.com>
Date: Tue, 5 Jul 2022 14:38:31 -0700
Subject: [PATCH 1/2] make provisioned_iops Computed true

---
 mmv1/products/compute/terraform.yaml          |  3 ++
 .../tests/resource_compute_disk_test.go.erb   | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/mmv1/products/compute/terraform.yaml b/mmv1/products/compute/terraform.yaml
index 02b5f9312e5b..6f2a7feb6299 100644
--- a/mmv1/products/compute/terraform.yaml
+++ b/mmv1/products/compute/terraform.yaml
@@ -633,6 +633,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         required: false
         default_from_api: true
         custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb'
+      provisionedIops: !ruby/object:Overrides::Terraform::PropertyOverride
+        required: false
+        default_from_api: true
       sourceImage: !ruby/object:Overrides::Terraform::PropertyOverride
         name: image
         diff_suppress_func: 'diskImageDiffSuppress'
diff --git a/mmv1/third_party/terraform/tests/resource_compute_disk_test.go.erb b/mmv1/third_party/terraform/tests/resource_compute_disk_test.go.erb
index 3b9dac61447a..677cad3c4799 100644
--- a/mmv1/third_party/terraform/tests/resource_compute_disk_test.go.erb
+++ b/mmv1/third_party/terraform/tests/resource_compute_disk_test.go.erb
@@ -442,6 +442,27 @@ func TestAccComputeDisk_deleteDetachIGM(t *testing.T) {
 	})
 }
 
+func TestProvisionedIopDisk_basic(t *testing.T) {
+	t.Parallel()
+
+	diskName := fmt.Sprintf("tf-test-%s", randString(t, 10))
+
+	vcrTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testProvisionedIopsDisk_basic(diskName),
+			},
+			{
+				ResourceName:      "google_compute_disk.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 <% unless version == 'ga' -%>
 func TestAccComputeDisk_resourcePolicies(t *testing.T) {
 	t.Parallel()
@@ -775,6 +796,16 @@ resource "google_compute_instance_group_manager" "manager" {
 `, diskName, mgrName)
 }
 
+func testProvisionedIopsDisk_basic(diskName string) string {
+	return fmt.Sprintf(`
+resource "google_compute_disk" "foobar" {
+  name  = "%s"
+  type = "pd-extreme"
+  size = 1
+}
+`, diskName)
+}
+
 <% unless version == 'ga' -%>
 func testAccComputeDisk_resourcePolicies(diskName, policyName string) string {
 	return fmt.Sprintf(`

From bcabb89c279954ef856ecfd481a3d5e915d761c9 Mon Sep 17 00:00:00 2001
From: Edward Sun <sunedward@google.com>
Date: Wed, 6 Jul 2022 13:45:29 -0700
Subject: [PATCH 2/2] update test case name

---
 .../terraform/tests/resource_compute_disk_test.go.erb       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mmv1/third_party/terraform/tests/resource_compute_disk_test.go.erb b/mmv1/third_party/terraform/tests/resource_compute_disk_test.go.erb
index 677cad3c4799..fdb457f3e7c7 100644
--- a/mmv1/third_party/terraform/tests/resource_compute_disk_test.go.erb
+++ b/mmv1/third_party/terraform/tests/resource_compute_disk_test.go.erb
@@ -442,7 +442,7 @@ func TestAccComputeDisk_deleteDetachIGM(t *testing.T) {
 	})
 }
 
-func TestProvisionedIopDisk_basic(t *testing.T) {
+func TestAccComputeDisk_pdExtremeImplicitProvisionedIops(t *testing.T) {
 	t.Parallel()
 
 	diskName := fmt.Sprintf("tf-test-%s", randString(t, 10))
@@ -452,7 +452,7 @@ func TestProvisionedIopDisk_basic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testProvisionedIopsDisk_basic(diskName),
+				Config: testAccComputeDisk_pdExtremeImplicitProvisionedIops(diskName),
 			},
 			{
 				ResourceName:      "google_compute_disk.foobar",
@@ -796,7 +796,7 @@ resource "google_compute_instance_group_manager" "manager" {
 `, diskName, mgrName)
 }
 
-func testProvisionedIopsDisk_basic(diskName string) string {
+func testAccComputeDisk_pdExtremeImplicitProvisionedIops(diskName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_disk" "foobar" {
   name  = "%s"