Update suppress func for compute_disk.type and compute_instance.machineType. (#10641) (#18071)

[upstream:0175894d87e576bd69fb198b6d07c8ea19b865c6]

Signed-off-by: Modular Magician <magic-modules@google.com>

Author: modular-magician

google/services/compute/resource_compute_disk.go

@@ -639,7 +639,7 @@ encryption key that protects this resource.`,
 				Type:             schema.TypeString,
 				Optional:         true,
 				ForceNew:         true,
-				DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName,
+				DiffSuppressFunc: tpgresource.CompareResourceNames,
 				Description: `URL of the disk type resource describing which disk type to use to
 create the disk. Provide this when creating the disk.`,
 				Default: "pd-standard",

google/services/compute/resource_compute_disk_test.go

@@ -333,13 +333,14 @@ func TestAccComputeDisk_update(t *testing.T) {
 	t.Parallel()
 
 	diskName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
+	diskType := "pd-ssd"
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccComputeDisk_basic(diskName),
+				Config: testAccComputeDisk_basic(diskName, diskType),
 			},
 			{
 				ResourceName:            "google_compute_disk.foobar",
@@ -348,7 +349,7 @@ func TestAccComputeDisk_update(t *testing.T) {
 				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
 			},
 			{
-				Config: testAccComputeDisk_updated(diskName),
+				Config: testAccComputeDisk_updated(diskName, diskType),
 			},
 			{
 				ResourceName:            "google_compute_disk.foobar",
@@ -359,6 +360,30 @@ func TestAccComputeDisk_update(t *testing.T) {
 		},
 	})
 }
+
+func TestAccComputeDisk_fromTypeUrl(t *testing.T) {
+	t.Parallel()
+
+	diskName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
+	diskType := fmt.Sprintf("projects/%s/zones/us-central1-a/diskTypes/pd-ssd", envvar.GetTestProjectFromEnv())
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeDisk_basic(diskName, diskType),
+			},
+			{
+				ResourceName:            "google_compute_disk.foobar",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
 func TestAccComputeDisk_pdHyperDiskProvisionedIopsLifeCycle(t *testing.T) {
 	t.Parallel()
 
@@ -815,7 +840,7 @@ func TestAccComputeDisk_featuresUpdated(t *testing.T) {
 	})
 }
 
-func testAccComputeDisk_basic(diskName string) string {
+func testAccComputeDisk_basic(diskName string, diskType string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "debian-11"
@@ -826,16 +851,16 @@ resource "google_compute_disk" "foobar" {
   name  = "%s"
   image = data.google_compute_image.my_image.self_link
   size  = 50
-  type  = "pd-ssd"
+  type  = "%s"
   zone  = "us-central1-a"
   labels = {
     my-label = "my-label-value"
   }
 }
-`, diskName)
+`, diskName, diskType)
 }
 
-func testAccComputeDisk_updated(diskName string) string {
+func testAccComputeDisk_updated(diskName string, diskType string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "debian-11"
@@ -846,14 +871,14 @@ resource "google_compute_disk" "foobar" {
   name  = "%s"
   image = data.google_compute_image.my_image.self_link
   size  = 100
-  type  = "pd-ssd"
+  type  = "%s"
   zone  = "us-central1-a"
   labels = {
     my-label    = "my-updated-label-value"
     a-new-label = "a-new-label-value"
   }
 }
-`, diskName)
+`, diskName, diskType)
 }
 
 func testAccComputeDisk_fromSnapshot(projectName, firstDiskName, snapshotName, diskName, ref_selector string) string {

google/services/compute/resource_compute_instance.go

@@ -292,9 +292,10 @@ func ResourceComputeInstance() *schema.Resource {
 			},
 
 			"machine_type": {
-				Type:        schema.TypeString,
-				Required:    true,
-				Description: `The machine type to create.`,
+				Type:             schema.TypeString,
+				Required:         true,
+				Description:      `The machine type to create.`,
+				DiffSuppressFunc: tpgresource.CompareResourceNames,
 			},
 
 			"name": {

google/services/compute/resource_compute_instance_test.go

@@ -273,6 +273,30 @@ func TestAccComputeInstance_resourceManagerTags(t *testing.T) {
 	})
 }
 
+func TestAccComputeInstance_machineTypeUrl(t *testing.T) {
+	t.Parallel()
+
+	var instance compute.Instance
+	var instanceName = fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
+	var machineTypeUrl = "zones/us-central1-a/machineTypes/e2-medium"
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeInstanceDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeInstance_machineType(instanceName, machineTypeUrl),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeInstanceExists(
+						t, "google_compute_instance.foobar", &instance),
+					resource.TestCheckResourceAttr("google_compute_instance.foobar", "description", "old_desc"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccComputeInstance_descriptionUpdate(t *testing.T) {
 	t.Parallel()
 
@@ -3692,6 +3716,32 @@ resource "google_compute_instance" "foobar" {
 `, instance)
 }
 
+func testAccComputeInstance_machineType(instance string, machineType string) string {
+	return fmt.Sprintf(`
+data "google_compute_image" "my_image" {
+  family  = "debian-11"
+  project = "debian-cloud"
+}
+
+resource "google_compute_instance" "foobar" {
+  name         = "%s"
+  machine_type = "%s"
+  zone         = "us-central1-a"
+  description  = "old_desc"
+
+  boot_disk {
+    initialize_params {
+      image = data.google_compute_image.my_image.self_link
+    }
+  }
+
+  network_interface {
+    network = "default"
+  }
+}
+`, instance, machineType)
+}
+
 func testAccComputeInstance_description(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {