remove network calls to determine disk type self link (#4054)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

google/disk_type.go

@@ -1,26 +1,11 @@
 package google
 
-import (
-	computeBeta "google.golang.org/api/compute/v0.beta"
-	"google.golang.org/api/compute/v1"
-)
-
 // readDiskType finds the disk type with the given name.
-func readDiskType(c *Config, zone *compute.Zone, project, name string) (*compute.DiskType, error) {
-	diskType, err := c.clientCompute.DiskTypes.Get(project, zone.Name, name).Do()
-	if err == nil && diskType != nil && diskType.SelfLink != "" {
-		return diskType, nil
-	} else {
-		return nil, err
-	}
+func readDiskType(c *Config, d TerraformResourceData, name string) (*ZonalFieldValue, error) {
+	return parseZonalFieldValue("diskTypes", name, "project", "zone", d, c, false)
 }
 
 // readRegionDiskType finds the disk type with the given name.
-func readRegionDiskType(c *Config, region *compute.Region, project, name string) (*computeBeta.DiskType, error) {
-	diskType, err := c.clientComputeBeta.RegionDiskTypes.Get(project, region.Name, name).Do()
-	if err == nil && diskType != nil && diskType.SelfLink != "" {
-		return diskType, nil
-	} else {
-		return nil, err
-	}
+func readRegionDiskType(c *Config, d TerraformResourceData, name string) (*RegionalFieldValue, error) {
+	return parseRegionalFieldValue("diskTypes", name, "project", "region", "zone", d, c, false)
 }

google/resource_compute_disk.go

@@ -1232,26 +1232,16 @@ func resourceComputeDiskEncoder(d *schema.ResourceData, meta interface{}, obj ma
 	if err != nil {
 		return nil, err
 	}
-	// Get the zone
-	z, err := getZone(d, config)
-	if err != nil {
-		return nil, err
-	}
-	zone, err := config.clientCompute.Zones.Get(project, z).Do()
-	if err != nil {
-		return nil, err
-	}
-
 	if v, ok := d.GetOk("type"); ok {
 		log.Printf("[DEBUG] Loading disk type: %s", v.(string))
-		diskType, err := readDiskType(config, zone, project, v.(string))
+		diskType, err := readDiskType(config, d, v.(string))
 		if err != nil {
 			return nil, fmt.Errorf(
 				"Error loading disk type '%s': %s",
 				v.(string), err)
 		}
 
-		obj["type"] = diskType.SelfLink
+		obj["type"] = diskType.RelativeLink()
 	}
 
 	if v, ok := d.GetOk("image"); ok {

google/resource_compute_instance.go

@@ -1636,11 +1636,11 @@ func expandBootDisk(d *schema.ResourceData, config *Config, zone *compute.Zone,
 
 		if v, ok := d.GetOk("boot_disk.0.initialize_params.0.type"); ok {
 			diskTypeName := v.(string)
-			diskType, err := readDiskType(config, zone, project, diskTypeName)
+			diskType, err := readDiskType(config, d, diskTypeName)
 			if err != nil {
 				return nil, fmt.Errorf("Error loading disk type '%s': %s", diskTypeName, err)
 			}
-			disk.InitializeParams.DiskType = diskType.SelfLink
+			disk.InitializeParams.DiskType = diskType.RelativeLink()
 		}
 
 		if v, ok := d.GetOk("boot_disk.0.initialize_params.0.image"); ok {
@@ -1702,7 +1702,7 @@ func flattenBootDisk(d *schema.ResourceData, disk *computeBeta.AttachedDisk, con
 }
 
 func expandScratchDisks(d *schema.ResourceData, config *Config, zone *compute.Zone, project string) ([]*computeBeta.AttachedDisk, error) {
-	diskType, err := readDiskType(config, zone, project, "local-ssd")
+	diskType, err := readDiskType(config, d, "local-ssd")
 	if err != nil {
 		return nil, fmt.Errorf("Error loading disk type 'local-ssd': %s", err)
 	}
@@ -1715,7 +1715,7 @@ func expandScratchDisks(d *schema.ResourceData, config *Config, zone *compute.Zo
 			Type:       "SCRATCH",
 			Interface:  d.Get(fmt.Sprintf("scratch_disk.%d.interface", i)).(string),
 			InitializeParams: &computeBeta.AttachedDiskInitializeParams{
-				DiskType: diskType.SelfLink,
+				DiskType: diskType.RelativeLink(),
 			},
 		})
 	}

google/resource_compute_region_disk.go

@@ -876,26 +876,16 @@ func resourceComputeRegionDiskEncoder(d *schema.ResourceData, meta interface{},
 	if err != nil {
 		return nil, err
 	}
-	// Get the region
-	r, err := getRegion(d, config)
-	if err != nil {
-		return nil, err
-	}
-	region, err := config.clientCompute.Regions.Get(project, r).Do()
-	if err != nil {
-		return nil, err
-	}
-
 	if v, ok := d.GetOk("type"); ok {
 		log.Printf("[DEBUG] Loading disk type: %s", v.(string))
-		diskType, err := readRegionDiskType(config, region, project, v.(string))
+		diskType, err := readRegionDiskType(config, d, v.(string))
 		if err != nil {
 			return nil, fmt.Errorf(
 				"Error loading disk type '%s': %s",
 				v.(string), err)
 		}
 
-		obj["type"] = diskType.SelfLink
+		obj["type"] = diskType.RelativeLink()
 	}
 
 	if v, ok := d.GetOk("image"); ok {