Support interface for attached_disk (GoogleCloudPlatform#11286)

Author: chentaozgoogle

mmv1/third_party/terraform/services/compute/resource_compute_attached_disk.go.erb

@@ -87,6 +87,14 @@ func ResourceComputeAttachedDisk() *schema.Resource {
 				Description:  `The mode in which to attach this disk, either READ_WRITE or READ_ONLY. If not specified, the default is to attach the disk in READ_WRITE mode.`,
 				ValidateFunc: validation.StringInSlice([]string{"READ_ONLY", "READ_WRITE"}, false),
 			},
+                        "interface": {
+                                Type:         schema.TypeString,
+                                ForceNew:     true,
+                                Optional:     true,
+                                Description:  `The disk interface used for attaching this disk. One of SCSI or NVME. (This field is only used for specific cases, please don't specify this field without advice from Google.)`,
+                                ValidateFunc: validation.StringInSlice([]string{"SCSI", "NVME"}, false),
+                        },
+
 		},
 		UseJSONNumber: true,
 	}
@@ -121,6 +129,7 @@ func resourceAttachedDiskCreate(d *schema.ResourceData, meta interface{}) error
 		Source:     diskSrc,
 		Mode:       d.Get("mode").(string),
 		DeviceName: d.Get("device_name").(string),
+                Interface:  d.Get("interface").(string),
 	}
 
 	op, err := config.NewComputeClient(userAgent).Instances.AttachDisk(zv.Project, zv.Zone, zv.Name, &attachedDisk).Do()
@@ -179,7 +188,7 @@ func resourceAttachedDiskRead(d *schema.ResourceData, meta interface{}) error {
 	}
 	if err := d.Set("mode", ad.Mode); err != nil {
 		return fmt.Errorf("Error setting mode: %s", err)
-	}
+        }
 
 	// Force the referenced resources to a self-link in state because it's more specific then name.
 	instancePath, err := tpgresource.GetRelativePath(instance.SelfLink)

mmv1/third_party/terraform/services/compute/resource_compute_attached_disk_test.go

@@ -315,3 +315,110 @@ resource "google_compute_attached_disk" "test" {
 }
 `, diskPrefix, count, instanceName)
 }
+
+func TestAccComputeAttachedDisk_diskInterface(t *testing.T) {
+	t.Parallel()
+
+	diskName1 := fmt.Sprintf("tf-test1-%d", acctest.RandInt(t))
+	diskName2 := fmt.Sprintf("tf-test2-%d", acctest.RandInt(t))
+	attachedDiskName1 := fmt.Sprintf("tf-test1-%d", acctest.RandInt(t))
+	attachedDiskName2 := fmt.Sprintf("tf-test2-%d", acctest.RandInt(t))
+	instanceName1 := fmt.Sprintf("tf-test1-%d", acctest.RandInt(t))
+	instanceName2 := fmt.Sprintf("tf-test2-%d", acctest.RandInt(t))
+	importID1 := fmt.Sprintf("%s/us-central1-a/%s/%s", envvar.GetTestProjectFromEnv(), instanceName1, diskName1)
+	importID2 := fmt.Sprintf("%s/us-central1-a/%s/%s", envvar.GetTestProjectFromEnv(), instanceName2, diskName2)
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             nil,
+		Steps: []resource.TestStep{
+			{
+				Config: testAttachedDiskResource(diskName1, instanceName1) + testAccComputeAttachedDisk_interface(attachedDiskName1, "SCSI"),
+			},
+			{
+				ResourceName:      "google_compute_attached_disk." + attachedDiskName1,
+				ImportStateId:     importID1,
+				ImportState:       true,
+				ImportStateVerify: false,
+			},
+			{
+				Config: testAttachedDiskResource(diskName1, instanceName1) + testAccComputeAttachedDisk_noInterface(attachedDiskName1),
+			},
+			{
+				ResourceName:      "google_compute_attached_disk." + attachedDiskName1,
+				ImportStateId:     importID1,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAttachedDiskResource(diskName1, instanceName1) + testAccComputeAttachedDisk_interface(attachedDiskName1, "SCSI"),
+			},
+			{
+				ResourceName:      "google_compute_attached_disk." + attachedDiskName1,
+				ImportStateId:     importID1,
+				ImportState:       true,
+				ImportStateVerify: false,
+			},
+			// API server will use NVME even SCSI is specified
+			{
+				Config: testAttachedDiskResourceWithMachineType(diskName2, instanceName2, "h3-standard-88") + testAccComputeAttachedDisk_interface(attachedDiskName2, "SCSI"),
+			},
+			{
+				ResourceName:      "google_compute_attached_disk." + attachedDiskName2,
+				ImportStateId:     importID2,
+				ImportState:       true,
+				ImportStateVerify: false,
+			},
+		},
+	})
+
+}
+
+func testAccComputeAttachedDisk_interface(resourceName, diskInterface string) string {
+	return fmt.Sprintf(`
+resource "google_compute_attached_disk" "%s" {
+  disk     = google_compute_disk.test1.self_link
+  instance = google_compute_instance.test.self_link
+  interface = "%s"
+}
+`, resourceName, diskInterface)
+}
+
+func testAccComputeAttachedDisk_noInterface(resourceName string) string {
+	return fmt.Sprintf(`
+resource "google_compute_attached_disk" "%s" {
+  disk     = google_compute_disk.test1.self_link
+  instance = google_compute_instance.test.self_link
+}
+`, resourceName)
+}
+
+func testAttachedDiskResourceWithMachineType(diskName, instanceName, machineType string) string {
+	return fmt.Sprintf(`
+resource "google_compute_disk" "test1" {
+  name = "%s"
+  zone = "us-central1-a"
+  type = "hyperdisk-balanced"
+}
+
+resource "google_compute_instance" "test" {
+  name         = "%s"
+  machine_type = "%s"
+  zone         = "us-central1-a"
+
+  lifecycle {
+    ignore_changes = [attached_disk]
+  }
+
+  boot_disk {
+    initialize_params {
+      image = "debian-cloud/debian-11"
+    }
+  }
+
+  network_interface {
+    network = "default"
+  }
+}
+`, diskName, instanceName, machineType)
+}

mmv1/third_party/terraform/website/docs/r/compute_attached_disk.html.markdown

@@ -101,6 +101,18 @@ The following arguments are supported:
 	  "READ_ONLY"
 	  "READ_WRITE"
 
+* `interface` -
+  (Optional)
+  The disk interface used for attaching this disk.
+
+	This field is only used for specific cases, please don't specify
+	this field without advice from Google. Not specifying the field
+	will allow the the server to assign the correct interface.
+
+	Possible values:
+	  "SCSI"
+	  "NVME"
+
 ## Attributes Reference
 
 In addition to the arguments listed above, the following computed attributes are exported: