Merge pull request #6112 from hashicorp/sethvargo/gcp_project

Move GCP projece attribute onto resources, inherit from provider

builtin/providers/google/provider.go

@@ -33,8 +33,8 @@ func Provider() terraform.ResourceProvider {
 
 			"project": &schema.Schema{
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("GOOGLE_PROJECT", nil),
+				DefaultFunc: schema.EnvDefaultFunc("GOOGLE_PROJECT", ""),
 			},
 
 			"region": &schema.Schema{
@@ -158,3 +158,31 @@ func getRegionFromZone(zone string) string {
 	}
 	return ""
 }
+
+// getRegion reads the "region" field from the given resource data and falls
+// back to the provider's value if not given. If the provider's value is not
+// given, an error is returned.
+func getRegion(d *schema.ResourceData, config *Config) (string, error) {
+	res, ok := d.GetOk("region")
+	if !ok {
+		if config.Region != "" {
+			return config.Region, nil
+		}
+		return "", fmt.Errorf("%q: required field is not set", "region")
+	}
+	return res.(string), nil
+}
+
+// getProject reads the "project" field from the given resource data and falls
+// back to the provider's value if not given. If the provider's value is not
+// given, an error is returned.
+func getProject(d *schema.ResourceData, config *Config) (string, error) {
+	res, ok := d.GetOk("project")
+	if !ok {
+		if config.Project != "" {
+			return config.Project, nil
+		}
+		return "", fmt.Errorf("%q: required field is not set", "project")
+	}
+	return res.(string), nil
+}

builtin/providers/google/resource_compute_address.go

@@ -27,9 +27,10 @@ func resourceComputeAddress() *schema.Resource {
 				Computed: true,
 			},
 
-			"self_link": &schema.Schema{
+			"project": &schema.Schema{
 				Type:     schema.TypeString,
-				Computed: true,
+				Optional: true,
+				ForceNew: true,
 			},
 
 			"region": &schema.Schema{
@@ -37,26 +38,32 @@ func resourceComputeAddress() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 			},
-		},
-	}
-}
 
-func getOptionalRegion(d *schema.ResourceData, config *Config) string {
+			"self_link": &schema.Schema{
-	if res, ok := d.GetOk("region"); !ok {
+				Type:     schema.TypeString,
-		return config.Region
+				Computed: true,
-	} else {
+			},
-		return res.(string)
+		},
 	}
 }
 
 func resourceComputeAddressCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	region := getOptionalRegion(d, config)
+
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	// Build the address parameter
 	addr := &compute.Address{Name: d.Get("name").(string)}
 	op, err := config.clientCompute.Addresses.Insert(
-		config.Project, region, addr).Do()
+		project, region, addr).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating address: %s", err)
 	}
@@ -75,10 +82,18 @@ func resourceComputeAddressCreate(d *schema.ResourceData, meta interface{}) erro
 func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	region := getOptionalRegion(d, config)
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	addr, err := config.clientCompute.Addresses.Get(
-		config.Project, region, d.Id()).Do()
+		project, region, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			// The resource doesn't exist anymore
@@ -100,11 +115,20 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error
 func resourceComputeAddressDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	region := getOptionalRegion(d, config)
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the address
 	log.Printf("[DEBUG] address delete request")
 	op, err := config.clientCompute.Addresses.Delete(
-		config.Project, region, d.Id()).Do()
+		project, region, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting address: %s", err)
 	}

builtin/providers/google/resource_compute_autoscaler.go

@@ -23,16 +23,17 @@ func resourceComputeAutoscaler() *schema.Resource {
 				Required: true,
 			},
 
-			"description": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-			},
-
 			"target": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 			},
 
+			"zone": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
 			"autoscaling_policy": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -105,9 +106,14 @@ func resourceComputeAutoscaler() *schema.Resource {
 				},
 			},
 
-			"zone": &schema.Schema{
+			"description": &schema.Schema{
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
+			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
 				ForceNew: true,
 			},
 
@@ -120,7 +126,6 @@ func resourceComputeAutoscaler() *schema.Resource {
 }
 
 func buildAutoscaler(d *schema.ResourceData) (*compute.Autoscaler, error) {
-
 	// Build the parameter
 	scaler := &compute.Autoscaler{
 		Name:   d.Get("name").(string),
@@ -200,10 +205,15 @@ func buildAutoscaler(d *schema.ResourceData) (*compute.Autoscaler, error) {
 func resourceComputeAutoscalerCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Get the zone
 	log.Printf("[DEBUG] Loading zone: %s", d.Get("zone").(string))
 	zone, err := config.clientCompute.Zones.Get(
-		config.Project, d.Get("zone").(string)).Do()
+		project, d.Get("zone").(string)).Do()
 	if err != nil {
 		return fmt.Errorf(
 			"Error loading zone '%s': %s", d.Get("zone").(string), err)
@@ -215,7 +225,7 @@ func resourceComputeAutoscalerCreate(d *schema.ResourceData, meta interface{}) e
 	}
 
 	op, err := config.clientCompute.Autoscalers.Insert(
-		config.Project, zone.Name, scaler).Do()
+		project, zone.Name, scaler).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating Autoscaler: %s", err)
 	}
@@ -234,9 +244,14 @@ func resourceComputeAutoscalerCreate(d *schema.ResourceData, meta interface{}) e
 func resourceComputeAutoscalerRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("zone").(string)
 	scaler, err := config.clientCompute.Autoscalers.Get(
-		config.Project, zone, d.Id()).Do()
+		project, zone, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			// The resource doesn't exist anymore
@@ -257,6 +272,11 @@ func resourceComputeAutoscalerRead(d *schema.ResourceData, meta interface{}) err
 func resourceComputeAutoscalerUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("zone").(string)
 
 	scaler, err := buildAutoscaler(d)
@@ -265,7 +285,7 @@ func resourceComputeAutoscalerUpdate(d *schema.ResourceData, meta interface{}) e
 	}
 
 	op, err := config.clientCompute.Autoscalers.Patch(
-		config.Project, zone, d.Id(), scaler).Do()
+		project, zone, d.Id(), scaler).Do()
 	if err != nil {
 		return fmt.Errorf("Error updating Autoscaler: %s", err)
 	}
@@ -284,9 +304,14 @@ func resourceComputeAutoscalerUpdate(d *schema.ResourceData, meta interface{}) e
 func resourceComputeAutoscalerDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("zone").(string)
 	op, err := config.clientCompute.Autoscalers.Delete(
-		config.Project, zone, d.Id()).Do()
+		project, zone, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting autoscaler: %s", err)
 	}

builtin/providers/google/resource_compute_backend_service.go

@@ -20,10 +20,36 @@ func resourceComputeBackendService() *schema.Resource {
 		Delete: resourceComputeBackendServiceDelete,
 
 		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
+					value := v.(string)
+					re := `^(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?)$`
+					if !regexp.MustCompile(re).MatchString(value) {
+						errors = append(errors, fmt.Errorf(
+							"%q (%q) doesn't match regexp %q", k, value, re))
+					}
+					return
+				},
+			},
+
+			"health_checks": &schema.Schema{
+				Type:     schema.TypeSet,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+				Required: true,
+				Set:      schema.HashString,
+			},
+
 			"backend": &schema.Schema{
 				Type: schema.TypeSet,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
+						"group": &schema.Schema{
+							Type:     schema.TypeString,
+							Optional: true,
+						},
 						"balancing_mode": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
@@ -38,10 +64,6 @@ func resourceComputeBackendService() *schema.Resource {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
-						"group": &schema.Schema{
-							Type:     schema.TypeString,
-							Optional: true,
-						},
 						"max_rate": &schema.Schema{
 							Type:     schema.TypeInt,
 							Optional: true,
@@ -66,32 +88,9 @@ func resourceComputeBackendService() *schema.Resource {
 				Optional: true,
 			},
 
-			"region": &schema.Schema{
+			"fingerprint": &schema.Schema{
 				Type:     schema.TypeString,
-				ForceNew: true,
+				Computed: true,
-				Optional: true,
-			},
-
-			"health_checks": &schema.Schema{
-				Type:     schema.TypeSet,
-				Elem:     &schema.Schema{Type: schema.TypeString},
-				Required: true,
-				Set:      schema.HashString,
-			},
-
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
-					value := v.(string)
-					re := `^(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?)$`
-					if !regexp.MustCompile(re).MatchString(value) {
-						errors = append(errors, fmt.Errorf(
-							"%q (%q) doesn't match regexp %q", k, value, re))
-					}
-					return
-				},
 			},
 
 			"port_name": &schema.Schema{
@@ -100,27 +99,34 @@ func resourceComputeBackendService() *schema.Resource {
 				Computed: true,
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"protocol": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
 
-			"timeout_sec": &schema.Schema{
+			"region": &schema.Schema{
-				Type:     schema.TypeInt,
-				Optional: true,
-				Computed: true,
-			},
-
-			"fingerprint": &schema.Schema{
 				Type:     schema.TypeString,
-				Computed: true,
+				Optional: true,
+				ForceNew: true,
 			},
 
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"timeout_sec": &schema.Schema{
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -159,9 +165,14 @@ func resourceComputeBackendServiceCreate(d *schema.ResourceData, meta interface{
 		service.TimeoutSec = int64(v.(int))
 	}
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	log.Printf("[DEBUG] Creating new Backend Service: %#v", service)
 	op, err := config.clientCompute.BackendServices.Insert(
-		config.Project, &service).Do()
+		project, &service).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating backend service: %s", err)
 	}
@@ -181,8 +192,13 @@ func resourceComputeBackendServiceCreate(d *schema.ResourceData, meta interface{
 func resourceComputeBackendServiceRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	service, err := config.clientCompute.BackendServices.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			// The resource doesn't exist anymore
@@ -211,6 +227,11 @@ func resourceComputeBackendServiceRead(d *schema.ResourceData, meta interface{})
 func resourceComputeBackendServiceUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	hc := d.Get("health_checks").(*schema.Set).List()
 	healthChecks := make([]string, 0, len(hc))
 	for _, v := range hc {
@@ -241,7 +262,7 @@ func resourceComputeBackendServiceUpdate(d *schema.ResourceData, meta interface{
 
 	log.Printf("[DEBUG] Updating existing Backend Service %q: %#v", d.Id(), service)
 	op, err := config.clientCompute.BackendServices.Update(
-		config.Project, d.Id(), &service).Do()
+		project, d.Id(), &service).Do()
 	if err != nil {
 		return fmt.Errorf("Error updating backend service: %s", err)
 	}
@@ -259,9 +280,14 @@ func resourceComputeBackendServiceUpdate(d *schema.ResourceData, meta interface{
 func resourceComputeBackendServiceDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	log.Printf("[DEBUG] Deleting backend service %s", d.Id())
 	op, err := config.clientCompute.BackendServices.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting backend service: %s", err)
 	}

builtin/providers/google/resource_compute_disk.go

@@ -34,28 +34,34 @@ func resourceComputeDisk() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"size": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
 				ForceNew: true,
 			},
 
+			"self_link": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"snapshot": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"type": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
-
-			"snapshot": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-
-			"self_link": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -63,10 +69,15 @@ func resourceComputeDisk() *schema.Resource {
 func resourceComputeDiskCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Get the zone
 	log.Printf("[DEBUG] Loading zone: %s", d.Get("zone").(string))
 	zone, err := config.clientCompute.Zones.Get(
-		config.Project, d.Get("zone").(string)).Do()
+		project, d.Get("zone").(string)).Do()
 	if err != nil {
 		return fmt.Errorf(
 			"Error loading zone '%s': %s", d.Get("zone").(string), err)
@@ -107,7 +118,7 @@ func resourceComputeDiskCreate(d *schema.ResourceData, meta interface{}) error {
 		snapshotName := v.(string)
 		log.Printf("[DEBUG] Loading snapshot: %s", snapshotName)
 		snapshotData, err := config.clientCompute.Snapshots.Get(
-			config.Project, snapshotName).Do()
+			project, snapshotName).Do()
 
 		if err != nil {
 			return fmt.Errorf(
@@ -119,7 +130,7 @@ func resourceComputeDiskCreate(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	op, err := config.clientCompute.Disks.Insert(
-		config.Project, d.Get("zone").(string), disk).Do()
+		project, d.Get("zone").(string), disk).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating disk: %s", err)
 	}
@@ -137,8 +148,13 @@ func resourceComputeDiskCreate(d *schema.ResourceData, meta interface{}) error {
 func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	disk, err := config.clientCompute.Disks.Get(
-		config.Project, d.Get("zone").(string), d.Id()).Do()
+		project, d.Get("zone").(string), d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Disk %q because it's gone", d.Get("name").(string))
@@ -159,9 +175,14 @@ func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error {
 func resourceComputeDiskDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the disk
 	op, err := config.clientCompute.Disks.Delete(
-		config.Project, d.Get("zone").(string), d.Id()).Do()
+		project, d.Get("zone").(string), d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting disk: %s", err)
 	}

builtin/providers/google/resource_compute_firewall.go

@@ -26,11 +26,6 @@ func resourceComputeFirewall() *schema.Resource {
 				ForceNew: true,
 			},
 
-			"description": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-			},
-
 			"network": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
@@ -58,6 +53,22 @@ func resourceComputeFirewall() *schema.Resource {
 				Set: resourceComputeFirewallAllowHash,
 			},
 
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"self_link": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"source_ranges": &schema.Schema{
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -78,11 +89,6 @@ func resourceComputeFirewall() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Set:      schema.HashString,
 			},
-
-			"self_link": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -113,13 +119,18 @@ func resourceComputeFirewallAllowHash(v interface{}) int {
 func resourceComputeFirewallCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	firewall, err := resourceFirewall(d, meta)
 	if err != nil {
 		return err
 	}
 
 	op, err := config.clientCompute.Firewalls.Insert(
-		config.Project, firewall).Do()
+		project, firewall).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating firewall: %s", err)
 	}
@@ -138,8 +149,13 @@ func resourceComputeFirewallCreate(d *schema.ResourceData, meta interface{}) err
 func resourceComputeFirewallRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	firewall, err := config.clientCompute.Firewalls.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			// The resource doesn't exist anymore
@@ -160,6 +176,11 @@ func resourceComputeFirewallRead(d *schema.ResourceData, meta interface{}) error
 func resourceComputeFirewallUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	d.Partial(true)
 
 	firewall, err := resourceFirewall(d, meta)
@@ -168,7 +189,7 @@ func resourceComputeFirewallUpdate(d *schema.ResourceData, meta interface{}) err
 	}
 
 	op, err := config.clientCompute.Firewalls.Update(
-		config.Project, d.Id(), firewall).Do()
+		project, d.Id(), firewall).Do()
 	if err != nil {
 		return fmt.Errorf("Error updating firewall: %s", err)
 	}
@@ -186,9 +207,14 @@ func resourceComputeFirewallUpdate(d *schema.ResourceData, meta interface{}) err
 func resourceComputeFirewallDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the firewall
 	op, err := config.clientCompute.Firewalls.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting firewall: %s", err)
 	}
@@ -207,9 +233,11 @@ func resourceFirewall(
 	meta interface{}) (*compute.Firewall, error) {
 	config := meta.(*Config)
 
+	project, _ := getProject(d, config)
+
 	// Look up the network to attach the firewall to
 	network, err := config.clientCompute.Networks.Get(
-		config.Project, d.Get("network").(string)).Do()
+		project, d.Get("network").(string)).Do()
 	if err != nil {
 		return nil, fmt.Errorf("Error reading network: %s", err)
 	}

builtin/providers/google/resource_compute_forwarding_rule.go

@@ -17,6 +17,24 @@ func resourceComputeForwardingRule() *schema.Resource {
 		Update: resourceComputeForwardingRuleUpdate,
 
 		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"target": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: false,
+			},
+
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"ip_address": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -31,19 +49,13 @@ func resourceComputeForwardingRule() *schema.Resource {
 				Computed: true,
 			},
 
-			"description": &schema.Schema{
+			"port_range": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
 
-			"name": &schema.Schema{
+			"project": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"port_range": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
@@ -59,12 +71,6 @@ func resourceComputeForwardingRule() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-
-			"target": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
-			},
 		},
 	}
 }
@@ -72,7 +78,15 @@ func resourceComputeForwardingRule() *schema.Resource {
 func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	region := getOptionalRegion(d, config)
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	frule := &compute.ForwardingRule{
 		IPAddress:   d.Get("ip_address").(string),
@@ -85,7 +99,7 @@ func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{
 
 	log.Printf("[DEBUG] ForwardingRule insert request: %#v", frule)
 	op, err := config.clientCompute.ForwardingRules.Insert(
-		config.Project, region, frule).Do()
+		project, region, frule).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating ForwardingRule: %s", err)
 	}
@@ -104,7 +118,15 @@ func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{
 func resourceComputeForwardingRuleUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	region := getOptionalRegion(d, config)
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	d.Partial(true)
 
@@ -112,7 +134,7 @@ func resourceComputeForwardingRuleUpdate(d *schema.ResourceData, meta interface{
 		target_name := d.Get("target").(string)
 		target_ref := &compute.TargetReference{Target: target_name}
 		op, err := config.clientCompute.ForwardingRules.SetTarget(
-			config.Project, region, d.Id(), target_ref).Do()
+			project, region, d.Id(), target_ref).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating target: %s", err)
 		}
@@ -133,10 +155,18 @@ func resourceComputeForwardingRuleUpdate(d *schema.ResourceData, meta interface{
 func resourceComputeForwardingRuleRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	region := getOptionalRegion(d, config)
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	frule, err := config.clientCompute.ForwardingRules.Get(
-		config.Project, region, d.Id()).Do()
+		project, region, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Forwarding Rule %q because it's gone", d.Get("name").(string))
@@ -159,12 +189,20 @@ func resourceComputeForwardingRuleRead(d *schema.ResourceData, meta interface{})
 func resourceComputeForwardingRuleDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	region := getOptionalRegion(d, config)
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	// Delete the ForwardingRule
 	log.Printf("[DEBUG] ForwardingRule delete request")
 	op, err := config.clientCompute.ForwardingRules.Delete(
-		config.Project, region, d.Id()).Do()
+		project, region, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting ForwardingRule: %s", err)
 	}

builtin/providers/google/resource_compute_global_address.go

@@ -27,6 +27,12 @@ func resourceComputeGlobalAddress() *schema.Resource {
 				Computed: true,
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -38,10 +44,15 @@ func resourceComputeGlobalAddress() *schema.Resource {
 func resourceComputeGlobalAddressCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the address parameter
 	addr := &compute.Address{Name: d.Get("name").(string)}
 	op, err := config.clientCompute.GlobalAddresses.Insert(
-		config.Project, addr).Do()
+		project, addr).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating address: %s", err)
 	}
@@ -60,8 +71,13 @@ func resourceComputeGlobalAddressCreate(d *schema.ResourceData, meta interface{}
 func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	addr, err := config.clientCompute.GlobalAddresses.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Global Address %q because it's gone", d.Get("name").(string))
@@ -83,10 +99,15 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{})
 func resourceComputeGlobalAddressDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the address
 	log.Printf("[DEBUG] address delete request")
 	op, err := config.clientCompute.GlobalAddresses.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting address: %s", err)
 	}

builtin/providers/google/resource_compute_global_forwarding_rule.go

@@ -17,6 +17,23 @@ func resourceComputeGlobalForwardingRule() *schema.Resource {
 		Delete: resourceComputeGlobalForwardingRuleDelete,
 
 		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"target": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"ip_address": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -31,19 +48,13 @@ func resourceComputeGlobalForwardingRule() *schema.Resource {
 				Computed: true,
 			},
 
-			"description": &schema.Schema{
+			"port_range": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
 
-			"name": &schema.Schema{
+			"project": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"port_range": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
@@ -53,17 +64,13 @@ func resourceComputeGlobalForwardingRule() *schema.Resource {
 				Type:       schema.TypeString,
 				Optional:   true,
 				ForceNew:   true,
+				Deprecated: "Please remove this attribute (it was never used)",
 			},
 
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-
-			"target": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-			},
 		},
 	}
 }
@@ -71,6 +78,11 @@ func resourceComputeGlobalForwardingRule() *schema.Resource {
 func resourceComputeGlobalForwardingRuleCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	frule := &compute.ForwardingRule{
 		IPAddress:   d.Get("ip_address").(string),
 		IPProtocol:  d.Get("ip_protocol").(string),
@@ -81,7 +93,7 @@ func resourceComputeGlobalForwardingRuleCreate(d *schema.ResourceData, meta inte
 	}
 
 	op, err := config.clientCompute.GlobalForwardingRules.Insert(
-		config.Project, frule).Do()
+		project, frule).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating Global Forwarding Rule: %s", err)
 	}
@@ -100,13 +112,18 @@ func resourceComputeGlobalForwardingRuleCreate(d *schema.ResourceData, meta inte
 func resourceComputeGlobalForwardingRuleUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	d.Partial(true)
 
 	if d.HasChange("target") {
 		target_name := d.Get("target").(string)
 		target_ref := &compute.TargetReference{Target: target_name}
 		op, err := config.clientCompute.GlobalForwardingRules.SetTarget(
-			config.Project, d.Id(), target_ref).Do()
+			project, d.Id(), target_ref).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating target: %s", err)
 		}
@@ -127,8 +144,13 @@ func resourceComputeGlobalForwardingRuleUpdate(d *schema.ResourceData, meta inte
 func resourceComputeGlobalForwardingRuleRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	frule, err := config.clientCompute.GlobalForwardingRules.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Global Forwarding Rule %q because it's gone", d.Get("name").(string))
@@ -151,10 +173,15 @@ func resourceComputeGlobalForwardingRuleRead(d *schema.ResourceData, meta interf
 func resourceComputeGlobalForwardingRuleDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the GlobalForwardingRule
 	log.Printf("[DEBUG] GlobalForwardingRule delete request")
 	op, err := config.clientCompute.GlobalForwardingRules.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting GlobalForwardingRule: %s", err)
 	}

builtin/providers/google/resource_compute_http_health_check.go

@@ -17,6 +17,12 @@ func resourceComputeHttpHealthCheck() *schema.Resource {
 		Update: resourceComputeHttpHealthCheckUpdate,
 
 		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
 			"check_interval_sec": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -39,18 +45,18 @@ func resourceComputeHttpHealthCheck() *schema.Resource {
 				Optional: true,
 			},
 
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"port": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
 				Default:  80,
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"request_path": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -80,6 +86,11 @@ func resourceComputeHttpHealthCheck() *schema.Resource {
 func resourceComputeHttpHealthCheckCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the parameter
 	hchk := &compute.HttpHealthCheck{
 		Name: d.Get("name").(string),
@@ -112,7 +123,7 @@ func resourceComputeHttpHealthCheckCreate(d *schema.ResourceData, meta interface
 
 	log.Printf("[DEBUG] HttpHealthCheck insert request: %#v", hchk)
 	op, err := config.clientCompute.HttpHealthChecks.Insert(
-		config.Project, hchk).Do()
+		project, hchk).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating HttpHealthCheck: %s", err)
 	}
@@ -131,6 +142,11 @@ func resourceComputeHttpHealthCheckCreate(d *schema.ResourceData, meta interface
 func resourceComputeHttpHealthCheckUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the parameter
 	hchk := &compute.HttpHealthCheck{
 		Name: d.Get("name").(string),
@@ -163,7 +179,7 @@ func resourceComputeHttpHealthCheckUpdate(d *schema.ResourceData, meta interface
 
 	log.Printf("[DEBUG] HttpHealthCheck patch request: %#v", hchk)
 	op, err := config.clientCompute.HttpHealthChecks.Patch(
-		config.Project, hchk.Name, hchk).Do()
+		project, hchk.Name, hchk).Do()
 	if err != nil {
 		return fmt.Errorf("Error patching HttpHealthCheck: %s", err)
 	}
@@ -182,8 +198,13 @@ func resourceComputeHttpHealthCheckUpdate(d *schema.ResourceData, meta interface
 func resourceComputeHttpHealthCheckRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	hchk, err := config.clientCompute.HttpHealthChecks.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			// The resource doesn't exist anymore
@@ -211,9 +232,14 @@ func resourceComputeHttpHealthCheckRead(d *schema.ResourceData, meta interface{}
 func resourceComputeHttpHealthCheckDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the HttpHealthCheck
 	op, err := config.clientCompute.HttpHealthChecks.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting HttpHealthCheck: %s", err)
 	}

builtin/providers/google/resource_compute_https_health_check.go

@@ -17,6 +17,12 @@ func resourceComputeHttpsHealthCheck() *schema.Resource {
 		Update: resourceComputeHttpsHealthCheckUpdate,
 
 		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
 			"check_interval_sec": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -39,18 +45,18 @@ func resourceComputeHttpsHealthCheck() *schema.Resource {
 				Optional: true,
 			},
 
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"port": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
 				Default:  443,
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"request_path": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -80,6 +86,11 @@ func resourceComputeHttpsHealthCheck() *schema.Resource {
 func resourceComputeHttpsHealthCheckCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the parameter
 	hchk := &compute.HttpsHealthCheck{
 		Name: d.Get("name").(string),
@@ -112,7 +123,7 @@ func resourceComputeHttpsHealthCheckCreate(d *schema.ResourceData, meta interfac
 
 	log.Printf("[DEBUG] HttpsHealthCheck insert request: %#v", hchk)
 	op, err := config.clientCompute.HttpsHealthChecks.Insert(
-		config.Project, hchk).Do()
+		project, hchk).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating HttpsHealthCheck: %s", err)
 	}
@@ -131,6 +142,11 @@ func resourceComputeHttpsHealthCheckCreate(d *schema.ResourceData, meta interfac
 func resourceComputeHttpsHealthCheckUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the parameter
 	hchk := &compute.HttpsHealthCheck{
 		Name: d.Get("name").(string),
@@ -163,7 +179,7 @@ func resourceComputeHttpsHealthCheckUpdate(d *schema.ResourceData, meta interfac
 
 	log.Printf("[DEBUG] HttpsHealthCheck patch request: %#v", hchk)
 	op, err := config.clientCompute.HttpsHealthChecks.Patch(
-		config.Project, hchk.Name, hchk).Do()
+		project, hchk.Name, hchk).Do()
 	if err != nil {
 		return fmt.Errorf("Error patching HttpsHealthCheck: %s", err)
 	}
@@ -182,8 +198,13 @@ func resourceComputeHttpsHealthCheckUpdate(d *schema.ResourceData, meta interfac
 func resourceComputeHttpsHealthCheckRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	hchk, err := config.clientCompute.HttpsHealthChecks.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing HTTPS Health Check %q because it's gone", d.Get("name").(string))
@@ -211,9 +232,14 @@ func resourceComputeHttpsHealthCheckRead(d *schema.ResourceData, meta interface{
 func resourceComputeHttpsHealthCheckDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the HttpsHealthCheck
 	op, err := config.clientCompute.HttpsHealthChecks.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting HttpsHealthCheck: %s", err)
 	}

builtin/providers/google/resource_compute_instance.go

@@ -26,30 +26,6 @@ func resourceComputeInstance() *schema.Resource {
 		MigrateState:  resourceComputeInstanceMigrateState,
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"description": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-
-			"machine_type": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"zone": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"disk": &schema.Schema{
 				Type:     schema.TypeList,
 				Required: true,
@@ -103,6 +79,55 @@ func resourceComputeInstance() *schema.Resource {
 				},
 			},
 
+			"machine_type": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"zone": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"can_ip_forward": &schema.Schema{
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+				ForceNew: true,
+			},
+
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"metadata": &schema.Schema{
+				Type:         schema.TypeMap,
+				Optional:     true,
+				Elem:         schema.TypeString,
+				ValidateFunc: validateInstanceMetadata,
+			},
+
+			"metadata_startup_script": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"metadata_fingerprint": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"network_interface": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -189,24 +214,38 @@ func resourceComputeInstance() *schema.Resource {
 				},
 			},
 
-			"can_ip_forward": &schema.Schema{
+			"project": &schema.Schema{
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  false,
-				ForceNew: true,
-			},
-
-			"metadata_startup_script": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
 
-			"metadata": &schema.Schema{
+			"self_link": &schema.Schema{
-				Type:         schema.TypeMap,
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"scheduling": &schema.Schema{
+				Type:     schema.TypeList,
 				Optional: true,
-				Elem:         schema.TypeString,
+				Elem: &schema.Resource{
-				ValidateFunc: validateInstanceMetadata,
+					Schema: map[string]*schema.Schema{
+						"on_host_maintenance": &schema.Schema{
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+
+						"automatic_restart": &schema.Schema{
+							Type:     schema.TypeBool,
+							Optional: true,
+						},
+
+						"preemptible": &schema.Schema{
+							Type:     schema.TypeBool,
+							Optional: true,
+						},
+					},
+				},
 			},
 
 			"service_account": &schema.Schema{
@@ -237,29 +276,6 @@ func resourceComputeInstance() *schema.Resource {
 				},
 			},
 
-			"scheduling": &schema.Schema{
-				Type:     schema.TypeList,
-				Optional: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"on_host_maintenance": &schema.Schema{
-							Type:     schema.TypeString,
-							Optional: true,
-						},
-
-						"automatic_restart": &schema.Schema{
-							Type:     schema.TypeBool,
-							Optional: true,
-						},
-
-						"preemptible": &schema.Schema{
-							Type:     schema.TypeBool,
-							Optional: true,
-						},
-					},
-				},
-			},
-
 			"tags": &schema.Schema{
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -267,27 +283,22 @@ func resourceComputeInstance() *schema.Resource {
 				Set:      schema.HashString,
 			},
 
-			"metadata_fingerprint": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-
 			"tags_fingerprint": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-
-			"self_link": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
 
 func getInstance(config *Config, d *schema.ResourceData) (*compute.Instance, error) {
+	project, err := getProject(d, config)
+	if err != nil {
+		return nil, err
+	}
+
 	instance, err := config.clientCompute.Instances.Get(
-		config.Project, d.Get("zone").(string), d.Id()).Do()
+		project, d.Get("zone").(string), d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Instance %q because it's gone", d.Get("name").(string))
@@ -307,10 +318,15 @@ func getInstance(config *Config, d *schema.ResourceData) (*compute.Instance, err
 func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Get the zone
 	log.Printf("[DEBUG] Loading zone: %s", d.Get("zone").(string))
 	zone, err := config.clientCompute.Zones.Get(
-		config.Project, d.Get("zone").(string)).Do()
+		project, d.Get("zone").(string)).Do()
 	if err != nil {
 		return fmt.Errorf(
 			"Error loading zone '%s': %s", d.Get("zone").(string), err)
@@ -319,7 +335,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
 	// Get the machine type
 	log.Printf("[DEBUG] Loading machine type: %s", d.Get("machine_type").(string))
 	machineType, err := config.clientCompute.MachineTypes.Get(
-		config.Project, zone.Name, d.Get("machine_type").(string)).Do()
+		project, zone.Name, d.Get("machine_type").(string)).Do()
 	if err != nil {
 		return fmt.Errorf(
 			"Error loading machine type: %s",
@@ -345,7 +361,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
 		if v, ok := d.GetOk(prefix + ".disk"); ok {
 			diskName := v.(string)
 			diskData, err := config.clientCompute.Disks.Get(
-				config.Project, zone.Name, diskName).Do()
+				project, zone.Name, diskName).Do()
 			if err != nil {
 				return fmt.Errorf(
 					"Error loading disk '%s': %s",
@@ -423,7 +439,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
 			// Load up the name of this network
 			networkName := d.Get(prefix + ".source").(string)
 			network, err := config.clientCompute.Networks.Get(
-				config.Project, networkName).Do()
+				project, networkName).Do()
 			if err != nil {
 				return fmt.Errorf(
 					"Error loading network '%s': %s",
@@ -458,7 +474,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
 				return fmt.Errorf("Cannot specify both network and subnetwork values.")
 			} else if networkName != "" {
 				network, err := config.clientCompute.Networks.Get(
-					config.Project, networkName).Do()
+					project, networkName).Do()
 				if err != nil {
 					return fmt.Errorf(
 						"Error referencing network '%s': %s",
@@ -468,7 +484,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
 			} else {
 				region := getRegionFromZone(d.Get("zone").(string))
 				subnetwork, err := config.clientCompute.Subnetworks.Get(
-					config.Project, region, subnetworkName).Do()
+					project, region, subnetworkName).Do()
 				if err != nil {
 					return fmt.Errorf(
 						"Error referencing subnetwork '%s' in region '%s': %s",
@@ -552,7 +568,7 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
 
 	log.Printf("[INFO] Requesting instance creation")
 	op, err := config.clientCompute.Instances.Insert(
-		config.Project, zone.Name, &instance).Do()
+		project, zone.Name, &instance).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating instance: %s", err)
 	}
@@ -724,6 +740,11 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
 func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("zone").(string)
 
 	instance, err := getInstance(config, d)
@@ -760,7 +781,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 				return fmt.Errorf("Error updating metadata: %s", err)
 			}
 			op, err := config.clientCompute.Instances.SetMetadata(
-				config.Project, zone, d.Id(), md).Do()
+				project, zone, d.Id(), md).Do()
 			if err != nil {
 				return fmt.Errorf("Error updating metadata: %s", err)
 			}
@@ -780,7 +801,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 	if d.HasChange("tags") {
 		tags := resourceInstanceTags(d)
 		op, err := config.clientCompute.Instances.SetTags(
-			config.Project, zone, d.Id(), tags).Do()
+			project, zone, d.Id(), tags).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating tags: %s", err)
 		}
@@ -809,7 +830,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 			scheduling.OnHostMaintenance = val.(string)
 		}
 
-		op, err := config.clientCompute.Instances.SetScheduling(config.Project,
+		op, err := config.clientCompute.Instances.SetScheduling(project,
 			zone, d.Id(), scheduling).Do()
 
 		if err != nil {
@@ -854,7 +875,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 				// Delete any accessConfig that currently exists in instNetworkInterface
 				for _, ac := range instNetworkInterface.AccessConfigs {
 					op, err := config.clientCompute.Instances.DeleteAccessConfig(
-						config.Project, zone, d.Id(), ac.Name, networkName).Do()
+						project, zone, d.Id(), ac.Name, networkName).Do()
 					if err != nil {
 						return fmt.Errorf("Error deleting old access_config: %s", err)
 					}
@@ -873,7 +894,7 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 						NatIP: d.Get(acPrefix + ".nat_ip").(string),
 					}
 					op, err := config.clientCompute.Instances.AddAccessConfig(
-						config.Project, zone, d.Id(), networkName, ac).Do()
+						project, zone, d.Id(), networkName, ac).Do()
 					if err != nil {
 						return fmt.Errorf("Error adding new access_config: %s", err)
 					}
@@ -895,9 +916,14 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 func resourceComputeInstanceDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("zone").(string)
 	log.Printf("[INFO] Requesting instance deletion: %s", d.Id())
-	op, err := config.clientCompute.Instances.Delete(config.Project, zone, d.Id()).Do()
+	op, err := config.clientCompute.Instances.Delete(project, zone, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting instance: %s", err)
 	}

builtin/providers/google/resource_compute_instance_group.go

@@ -25,12 +25,24 @@ func resourceComputeInstanceGroup() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"zone": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
 			"description": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
 
+			"instances": &schema.Schema{
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+
 			"named_port": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -49,13 +61,18 @@ func resourceComputeInstanceGroup() *schema.Resource {
 				},
 			},
 
-			"instances": &schema.Schema{
+			"network": &schema.Schema{
-				Type:     schema.TypeList,
+				Type:     schema.TypeString,
-				Optional: true,
+				Computed: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 
-			"network": &schema.Schema{
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
@@ -64,17 +81,6 @@ func resourceComputeInstanceGroup() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
-
-			"zone": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"self_link": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -100,6 +106,11 @@ func validInstanceURLs(instanceUrls []string) bool {
 func resourceComputeInstanceGroupCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the parameter
 	instanceGroup := &compute.InstanceGroup{
 		Name: d.Get("name").(string),
@@ -116,7 +127,7 @@ func resourceComputeInstanceGroupCreate(d *schema.ResourceData, meta interface{}
 
 	log.Printf("[DEBUG] InstanceGroup insert request: %#v", instanceGroup)
 	op, err := config.clientCompute.InstanceGroups.Insert(
-		config.Project, d.Get("zone").(string), instanceGroup).Do()
+		project, d.Get("zone").(string), instanceGroup).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating InstanceGroup: %s", err)
 	}
@@ -142,7 +153,7 @@ func resourceComputeInstanceGroupCreate(d *schema.ResourceData, meta interface{}
 
 		log.Printf("[DEBUG] InstanceGroup add instances request: %#v", addInstanceReq)
 		op, err := config.clientCompute.InstanceGroups.AddInstances(
-			config.Project, d.Get("zone").(string), d.Id(), addInstanceReq).Do()
+			project, d.Get("zone").(string), d.Id(), addInstanceReq).Do()
 		if err != nil {
 			return fmt.Errorf("Error adding instances to InstanceGroup: %s", err)
 		}
@@ -160,9 +171,14 @@ func resourceComputeInstanceGroupCreate(d *schema.ResourceData, meta interface{}
 func resourceComputeInstanceGroupRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// retreive instance group
 	instanceGroup, err := config.clientCompute.InstanceGroups.Get(
-		config.Project, d.Get("zone").(string), d.Id()).Do()
+		project, d.Get("zone").(string), d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			// The resource doesn't exist anymore
@@ -177,7 +193,7 @@ func resourceComputeInstanceGroupRead(d *schema.ResourceData, meta interface{})
 	// retreive instance group members
 	var memberUrls []string
 	members, err := config.clientCompute.InstanceGroups.ListInstances(
-		config.Project, d.Get("zone").(string), d.Id(), &compute.InstanceGroupsListInstancesRequest{
+		project, d.Get("zone").(string), d.Id(), &compute.InstanceGroupsListInstancesRequest{
 			InstanceState: "ALL",
 		}).Do()
 	if err != nil {
@@ -206,8 +222,13 @@ func resourceComputeInstanceGroupRead(d *schema.ResourceData, meta interface{})
 func resourceComputeInstanceGroupUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// refresh the state incase referenced instances have been removed earlier in the run
-	err := resourceComputeInstanceGroupRead(d, meta)
+	err = resourceComputeInstanceGroupRead(d, meta)
 	if err != nil {
 		return fmt.Errorf("Error reading InstanceGroup: %s", err)
 	}
@@ -237,7 +258,7 @@ func resourceComputeInstanceGroupUpdate(d *schema.ResourceData, meta interface{}
 
 			log.Printf("[DEBUG] InstanceGroup remove instances request: %#v", removeReq)
 			removeOp, err := config.clientCompute.InstanceGroups.RemoveInstances(
-				config.Project, d.Get("zone").(string), d.Id(), removeReq).Do()
+				project, d.Get("zone").(string), d.Id(), removeReq).Do()
 			if err != nil {
 				return fmt.Errorf("Error removing instances from InstanceGroup: %s", err)
 			}
@@ -257,7 +278,7 @@ func resourceComputeInstanceGroupUpdate(d *schema.ResourceData, meta interface{}
 
 			log.Printf("[DEBUG] InstanceGroup adding instances request: %#v", addReq)
 			addOp, err := config.clientCompute.InstanceGroups.AddInstances(
-				config.Project, d.Get("zone").(string), d.Id(), addReq).Do()
+				project, d.Get("zone").(string), d.Id(), addReq).Do()
 			if err != nil {
 				return fmt.Errorf("Error adding instances from InstanceGroup: %s", err)
 			}
@@ -281,7 +302,7 @@ func resourceComputeInstanceGroupUpdate(d *schema.ResourceData, meta interface{}
 
 		log.Printf("[DEBUG] InstanceGroup updating named ports request: %#v", namedPortsReq)
 		op, err := config.clientCompute.InstanceGroups.SetNamedPorts(
-			config.Project, d.Get("zone").(string), d.Id(), namedPortsReq).Do()
+			project, d.Get("zone").(string), d.Id(), namedPortsReq).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating named ports for InstanceGroup: %s", err)
 		}
@@ -301,8 +322,13 @@ func resourceComputeInstanceGroupUpdate(d *schema.ResourceData, meta interface{}
 func resourceComputeInstanceGroupDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("zone").(string)
-	op, err := config.clientCompute.InstanceGroups.Delete(config.Project, zone, d.Id()).Do()
+	op, err := config.clientCompute.InstanceGroups.Delete(project, zone, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting InstanceGroup: %s", err)
 	}

builtin/providers/google/resource_compute_instance_group_manager.go

@@ -19,24 +19,35 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
 		Delete: resourceComputeInstanceGroupManagerDelete,
 
 		Schema: map[string]*schema.Schema{
+			"base_instance_name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"instance_template": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+
 			"name": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
+			"zone": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
 			"description": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
 
-			"base_instance_name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"fingerprint": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -47,17 +58,11 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
 				Computed: true,
 			},
 
-			"instance_template": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-			},
-
 			"named_port": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-
 						"name": &schema.Schema{
 							Type:     schema.TypeString,
 							Required: true,
@@ -71,6 +76,17 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
 				},
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"self_link": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"update_strategy": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -89,17 +105,6 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
 				Computed: true,
 				Optional: true,
 			},
-
-			"zone": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"self_link": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -119,6 +124,11 @@ func getNamedPorts(nps []interface{}) []*compute.NamedPort {
 func resourceComputeInstanceGroupManagerCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Get group size, default to 1 if not given
 	var target_size int64 = 1
 	if v, ok := d.GetOk("target_size"); ok {
@@ -157,7 +167,7 @@ func resourceComputeInstanceGroupManagerCreate(d *schema.ResourceData, meta inte
 
 	log.Printf("[DEBUG] InstanceGroupManager insert request: %#v", manager)
 	op, err := config.clientCompute.InstanceGroupManagers.Insert(
-		config.Project, d.Get("zone").(string), manager).Do()
+		project, d.Get("zone").(string), manager).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating InstanceGroupManager: %s", err)
 	}
@@ -177,8 +187,13 @@ func resourceComputeInstanceGroupManagerCreate(d *schema.ResourceData, meta inte
 func resourceComputeInstanceGroupManagerRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	manager, err := config.clientCompute.InstanceGroupManagers.Get(
-		config.Project, d.Get("zone").(string), d.Id()).Do()
+		project, d.Get("zone").(string), d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Instance Group Manager %q because it's gone", d.Get("name").(string))
@@ -203,6 +218,11 @@ func resourceComputeInstanceGroupManagerRead(d *schema.ResourceData, meta interf
 func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	d.Partial(true)
 
 	// If target_pools changes then update
@@ -221,7 +241,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 		}
 
 		op, err := config.clientCompute.InstanceGroupManagers.SetTargetPools(
-			config.Project, d.Get("zone").(string), d.Id(), setTargetPools).Do()
+			project, d.Get("zone").(string), d.Id(), setTargetPools).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating InstanceGroupManager: %s", err)
 		}
@@ -243,7 +263,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 		}
 
 		op, err := config.clientCompute.InstanceGroupManagers.SetInstanceTemplate(
-			config.Project, d.Get("zone").(string), d.Id(), setInstanceTemplate).Do()
+			project, d.Get("zone").(string), d.Id(), setInstanceTemplate).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating InstanceGroupManager: %s", err)
 		}
@@ -256,7 +276,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 
 		if d.Get("update_strategy").(string) == "RESTART" {
 			managedInstances, err := config.clientCompute.InstanceGroupManagers.ListManagedInstances(
-				config.Project, d.Get("zone").(string), d.Id()).Do()
+				project, d.Get("zone").(string), d.Id()).Do()
 
 			managedInstanceCount := len(managedInstances.ManagedInstances)
 			instances := make([]string, managedInstanceCount)
@@ -269,7 +289,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 			}
 
 			op, err = config.clientCompute.InstanceGroupManagers.RecreateInstances(
-				config.Project, d.Get("zone").(string), d.Id(), recreateInstances).Do()
+				project, d.Get("zone").(string), d.Id(), recreateInstances).Do()
 
 			if err != nil {
 				return fmt.Errorf("Error restarting instance group managers instances: %s", err)
@@ -297,7 +317,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 
 		// Make the request:
 		op, err := config.clientCompute.InstanceGroups.SetNamedPorts(
-			config.Project, d.Get("zone").(string), d.Id(), setNamedPorts).Do()
+			project, d.Get("zone").(string), d.Id(), setNamedPorts).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating InstanceGroupManager: %s", err)
 		}
@@ -318,7 +338,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 			target_size := int64(v.(int))
 
 			op, err := config.clientCompute.InstanceGroupManagers.Resize(
-				config.Project, d.Get("zone").(string), d.Id(), target_size).Do()
+				project, d.Get("zone").(string), d.Id(), target_size).Do()
 			if err != nil {
 				return fmt.Errorf("Error updating InstanceGroupManager: %s", err)
 			}
@@ -341,8 +361,13 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("zone").(string)
-	op, err := config.clientCompute.InstanceGroupManagers.Delete(config.Project, zone, d.Id()).Do()
+	op, err := config.clientCompute.InstanceGroupManagers.Delete(project, zone, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting instance group manager: %s", err)
 	}
@@ -358,7 +383,7 @@ func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta inte
 		}
 
 		instanceGroup, err := config.clientCompute.InstanceGroups.Get(
-			config.Project, d.Get("zone").(string), d.Id()).Do()
+			project, d.Get("zone").(string), d.Id()).Do()
 
 		if err != nil {
 			return fmt.Errorf("Error getting instance group size: %s", err)

builtin/providers/google/resource_compute_instance_template.go

@@ -16,37 +16,6 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 		Delete: resourceComputeInstanceTemplateDelete,
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"description": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-
-			"can_ip_forward": &schema.Schema{
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  false,
-				ForceNew: true,
-			},
-
-			"instance_description": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-
-			"machine_type": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"disk": &schema.Schema{
 				Type:     schema.TypeList,
 				Required: true,
@@ -123,12 +92,56 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 				},
 			},
 
+			"machine_type": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"automatic_restart": &schema.Schema{
+				Type:       schema.TypeBool,
+				Optional:   true,
+				Default:    true,
+				ForceNew:   true,
+				Deprecated: "Please use `scheduling.automatic_restart` instead",
+			},
+
+			"can_ip_forward": &schema.Schema{
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+				ForceNew: true,
+			},
+
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"instance_description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"metadata": &schema.Schema{
 				Type:     schema.TypeMap,
 				Optional: true,
 				ForceNew: true,
 			},
 
+			"metadata_fingerprint": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"network_interface": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -164,14 +177,6 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 				},
 			},
 
-			"automatic_restart": &schema.Schema{
-				Type:       schema.TypeBool,
-				Optional:   true,
-				Default:    true,
-				ForceNew:   true,
-				Deprecated: "Please use `scheduling.automatic_restart` instead",
-			},
-
 			"on_host_maintenance": &schema.Schema{
 				Type:       schema.TypeString,
 				Optional:   true,
@@ -179,6 +184,12 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 				Deprecated: "Please use `scheduling.on_host_maintenance` instead",
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"region": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -213,6 +224,11 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 				},
 			},
 
+			"self_link": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"service_account": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -248,20 +264,10 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 				Set:      schema.HashString,
 			},
 
-			"metadata_fingerprint": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-
 			"tags_fingerprint": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-
-			"self_link": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -337,10 +343,15 @@ func buildDisks(d *schema.ResourceData, meta interface{}) ([]*compute.AttachedDi
 	return disks, nil
 }
 
-func buildNetworks(d *schema.ResourceData, meta interface{}) (error, []*compute.NetworkInterface) {
+func buildNetworks(d *schema.ResourceData, meta interface{}) ([]*compute.NetworkInterface, error) {
 	// Build up the list of networks
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return nil, err
+	}
+
 	networksCount := d.Get("network_interface.#").(int)
 	networkInterfaces := make([]*compute.NetworkInterface, 0, networksCount)
 	for i := 0; i < networksCount; i++ {
@@ -355,34 +366,33 @@ func buildNetworks(d *schema.ResourceData, meta interface{}) (error, []*compute.
 		}
 
 		if networkName == "" && subnetworkName == "" {
-			return fmt.Errorf("network or subnetwork must be provided"), nil
+			return nil, fmt.Errorf("network or subnetwork must be provided")
 		}
 		if networkName != "" && subnetworkName != "" {
-			return fmt.Errorf("network or subnetwork must not both be provided"), nil
+			return nil, fmt.Errorf("network or subnetwork must not both be provided")
 		}
 
 		var networkLink, subnetworkLink string
 		if networkName != "" {
 			network, err := config.clientCompute.Networks.Get(
-				config.Project, networkName).Do()
+				project, networkName).Do()
 			if err != nil {
-				return fmt.Errorf(
+				return nil, fmt.Errorf("Error referencing network '%s': %s",
-					"Error referencing network '%s': %s",
+					networkName, err)
-					networkName, err), nil
 			}
 			networkLink = network.SelfLink
 		} else {
 			// lookup subnetwork link using region and subnetwork name
-			region := d.Get("region").(string)
+			region, err := getRegion(d, config)
-			if region == "" {
+			if err != nil {
-				region = config.Region
+				return nil, err
 			}
 			subnetwork, err := config.clientCompute.Subnetworks.Get(
-				config.Project, region, subnetworkName).Do()
+				project, region, subnetworkName).Do()
 			if err != nil {
-				return fmt.Errorf(
+				return nil, fmt.Errorf(
 					"Error referencing subnetwork '%s' in region '%s': %s",
-					subnetworkName, region, err), nil
+					subnetworkName, region, err)
 			}
 			subnetworkLink = subnetwork.SelfLink
 		}
@@ -404,12 +414,17 @@ func buildNetworks(d *schema.ResourceData, meta interface{}) (error, []*compute.
 
 		networkInterfaces = append(networkInterfaces, &iface)
 	}
-	return nil, networkInterfaces
+	return networkInterfaces, nil
 }
 
 func resourceComputeInstanceTemplateCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	instanceProperties := &compute.InstanceProperties{}
 
 	instanceProperties.CanIpForward = d.Get("can_ip_forward").(bool)
@@ -425,7 +440,7 @@ func resourceComputeInstanceTemplateCreate(d *schema.ResourceData, meta interfac
 		return err
 	}
 	instanceProperties.Metadata = metadata
-	err, networks := buildNetworks(d, meta)
+	networks, err := buildNetworks(d, meta)
 	if err != nil {
 		return err
 	}
@@ -504,7 +519,7 @@ func resourceComputeInstanceTemplateCreate(d *schema.ResourceData, meta interfac
 	}
 
 	op, err := config.clientCompute.InstanceTemplates.Insert(
-		config.Project, &instanceTemplate).Do()
+		project, &instanceTemplate).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating instance: %s", err)
 	}
@@ -523,8 +538,13 @@ func resourceComputeInstanceTemplateCreate(d *schema.ResourceData, meta interfac
 func resourceComputeInstanceTemplateRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	instanceTemplate, err := config.clientCompute.InstanceTemplates.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Instance Template %q because it's gone", d.Get("name").(string))
@@ -554,8 +574,13 @@ func resourceComputeInstanceTemplateRead(d *schema.ResourceData, meta interface{
 func resourceComputeInstanceTemplateDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	op, err := config.clientCompute.InstanceTemplates.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting instance template: %s", err)
 	}

builtin/providers/google/resource_compute_network.go

@@ -22,18 +22,6 @@ func resourceComputeNetwork() *schema.Resource {
 				ForceNew: true,
 			},
 
-			"ipv4_range": &schema.Schema{
-				Type:       schema.TypeString,
-				Optional:   true,
-				ForceNew:   true,
-				Deprecated: "Please use google_compute_subnetwork resources instead.",
-			},
-
-			"gateway_ipv4": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-
 			"auto_create_subnetworks": &schema.Schema{
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -52,6 +40,24 @@ func resourceComputeNetwork() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"gateway_ipv4": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"ipv4_range": &schema.Schema{
+				Type:       schema.TypeString,
+				Optional:   true,
+				ForceNew:   true,
+				Deprecated: "Please use google_compute_subnetwork resources instead.",
+			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -63,6 +69,11 @@ func resourceComputeNetwork() *schema.Resource {
 func resourceComputeNetworkCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	//
 	// Possible modes:
 	// - 1 Legacy mode - Create a network in the legacy mode. ipv4_range is set. auto_create_subnetworks must not be
@@ -91,7 +102,7 @@ func resourceComputeNetworkCreate(d *schema.ResourceData, meta interface{}) erro
 
 	log.Printf("[DEBUG] Network insert request: %#v", network)
 	op, err := config.clientCompute.Networks.Insert(
-		config.Project, network).Do()
+		project, network).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating network: %s", err)
 	}
@@ -110,8 +121,13 @@ func resourceComputeNetworkCreate(d *schema.ResourceData, meta interface{}) erro
 func resourceComputeNetworkRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	network, err := config.clientCompute.Networks.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Network %q because it's gone", d.Get("name").(string))
@@ -133,9 +149,14 @@ func resourceComputeNetworkRead(d *schema.ResourceData, meta interface{}) error
 func resourceComputeNetworkDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the network
 	op, err := config.clientCompute.Networks.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting network: %s", err)
 	}

builtin/providers/google/resource_compute_project_metadata.go

@@ -24,6 +24,12 @@ func resourceComputeProjectMetadata() *schema.Resource {
 				Type:     schema.TypeMap,
 				Required: true,
 			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -31,12 +37,17 @@ func resourceComputeProjectMetadata() *schema.Resource {
 func resourceComputeProjectMetadataCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	projectID, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	createMD := func() error {
 		// Load project service
-		log.Printf("[DEBUG] Loading project service: %s", config.Project)
+		log.Printf("[DEBUG] Loading project service: %s", projectID)
-		project, err := config.clientCompute.Projects.Get(config.Project).Do()
+		project, err := config.clientCompute.Projects.Get(projectID).Do()
 		if err != nil {
-			return fmt.Errorf("Error loading project '%s': %s", config.Project, err)
+			return fmt.Errorf("Error loading project '%s': %s", projectID, err)
 		}
 
 		md := project.CommonInstanceMetadata
@@ -45,7 +56,7 @@ func resourceComputeProjectMetadataCreate(d *schema.ResourceData, meta interface
 		// Ensure that we aren't overwriting entries that already exist
 		for _, kv := range md.Items {
 			if _, ok := newMDMap[kv.Key]; ok {
-				return fmt.Errorf("Error, key '%s' already exists in project '%s'", kv.Key, config.Project)
+				return fmt.Errorf("Error, key '%s' already exists in project '%s'", kv.Key, projectID)
 			}
 		}
 
@@ -58,7 +69,7 @@ func resourceComputeProjectMetadataCreate(d *schema.ResourceData, meta interface
 			})
 		}
 
-		op, err := config.clientCompute.Projects.SetCommonInstanceMetadata(config.Project, md).Do()
+		op, err := config.clientCompute.Projects.SetCommonInstanceMetadata(projectID, md).Do()
 
 		if err != nil {
 			return fmt.Errorf("SetCommonInstanceMetadata failed: %s", err)
@@ -69,7 +80,7 @@ func resourceComputeProjectMetadataCreate(d *schema.ResourceData, meta interface
 		return computeOperationWaitGlobal(config, op, "SetCommonMetadata")
 	}
 
-	err := MetadataRetryWrapper(createMD)
+	err = MetadataRetryWrapper(createMD)
 	if err != nil {
 		return err
 	}
@@ -80,9 +91,14 @@ func resourceComputeProjectMetadataCreate(d *schema.ResourceData, meta interface
 func resourceComputeProjectMetadataRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	projectID, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Load project service
-	log.Printf("[DEBUG] Loading project service: %s", config.Project)
+	log.Printf("[DEBUG] Loading project service: %s", projectID)
-	project, err := config.clientCompute.Projects.Get(config.Project).Do()
+	project, err := config.clientCompute.Projects.Get(projectID).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Project Metadata because it's gone")
@@ -92,7 +108,7 @@ func resourceComputeProjectMetadataRead(d *schema.ResourceData, meta interface{}
 			return nil
 		}
 
-		return fmt.Errorf("Error loading project '%s': %s", config.Project, err)
+		return fmt.Errorf("Error loading project '%s': %s", projectID, err)
 	}
 
 	md := project.CommonInstanceMetadata
@@ -109,22 +125,27 @@ func resourceComputeProjectMetadataRead(d *schema.ResourceData, meta interface{}
 func resourceComputeProjectMetadataUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	projectID, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	if d.HasChange("metadata") {
 		o, n := d.GetChange("metadata")
 
 		updateMD := func() error {
 			// Load project service
-			log.Printf("[DEBUG] Loading project service: %s", config.Project)
+			log.Printf("[DEBUG] Loading project service: %s", projectID)
-			project, err := config.clientCompute.Projects.Get(config.Project).Do()
+			project, err := config.clientCompute.Projects.Get(projectID).Do()
 			if err != nil {
-				return fmt.Errorf("Error loading project '%s': %s", config.Project, err)
+				return fmt.Errorf("Error loading project '%s': %s", projectID, err)
 			}
 
 			md := project.CommonInstanceMetadata
 
 			MetadataUpdate(o.(map[string]interface{}), n.(map[string]interface{}), md)
 
-			op, err := config.clientCompute.Projects.SetCommonInstanceMetadata(config.Project, md).Do()
+			op, err := config.clientCompute.Projects.SetCommonInstanceMetadata(projectID, md).Do()
 
 			if err != nil {
 				return fmt.Errorf("SetCommonInstanceMetadata failed: %s", err)
@@ -152,11 +173,16 @@ func resourceComputeProjectMetadataUpdate(d *schema.ResourceData, meta interface
 func resourceComputeProjectMetadataDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	// Load project service
+	projectID, err := getProject(d, config)
-	log.Printf("[DEBUG] Loading project service: %s", config.Project)
-	project, err := config.clientCompute.Projects.Get(config.Project).Do()
 	if err != nil {
-		return fmt.Errorf("Error loading project '%s': %s", config.Project, err)
+		return err
+	}
+
+	// Load project service
+	log.Printf("[DEBUG] Loading project service: %s", projectID)
+	project, err := config.clientCompute.Projects.Get(projectID).Do()
+	if err != nil {
+		return fmt.Errorf("Error loading project '%s': %s", projectID, err)
 	}
 
 	md := project.CommonInstanceMetadata
@@ -164,7 +190,7 @@ func resourceComputeProjectMetadataDelete(d *schema.ResourceData, meta interface
 	// Remove all items
 	md.Items = nil
 
-	op, err := config.clientCompute.Projects.SetCommonInstanceMetadata(config.Project, md).Do()
+	op, err := config.clientCompute.Projects.SetCommonInstanceMetadata(projectID, md).Do()
 
 	log.Printf("[DEBUG] SetCommonMetadata: %d (%s)", op.Id, op.SelfLink)
 

builtin/providers/google/resource_compute_route.go

@@ -16,13 +16,13 @@ func resourceComputeRoute() *schema.Resource {
 		Delete: resourceComputeRouteDelete,
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
+			"dest_range": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"dest_range": &schema.Schema{
+			"name": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
@@ -34,7 +34,13 @@ func resourceComputeRoute() *schema.Resource {
 				ForceNew: true,
 			},
 
-			"next_hop_ip": &schema.Schema{
+			"priority": &schema.Schema{
+				Type:     schema.TypeInt,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"next_hop_gateway": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
@@ -52,7 +58,7 @@ func resourceComputeRoute() *schema.Resource {
 				ForceNew: true,
 			},
 
-			"next_hop_gateway": &schema.Schema{
+			"next_hop_ip": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
@@ -69,12 +75,17 @@ func resourceComputeRoute() *schema.Resource {
 				ForceNew: true,
 			},
 
-			"priority": &schema.Schema{
+			"project": &schema.Schema{
-				Type:     schema.TypeInt,
+				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
 				ForceNew: true,
 			},
 
+			"self_link": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": &schema.Schema{
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -82,11 +93,6 @@ func resourceComputeRoute() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Set:      schema.HashString,
 			},
-
-			"self_link": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -94,9 +100,14 @@ func resourceComputeRoute() *schema.Resource {
 func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Look up the network to attach the route to
 	network, err := config.clientCompute.Networks.Get(
-		config.Project, d.Get("network").(string)).Do()
+		project, d.Get("network").(string)).Do()
 	if err != nil {
 		return fmt.Errorf("Error reading network: %s", err)
 	}
@@ -115,7 +126,7 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error
 	}
 	if v, ok := d.GetOk("next_hop_instance"); ok {
 		nextInstance, err := config.clientCompute.Instances.Get(
-			config.Project,
+			project,
 			d.Get("next_hop_instance_zone").(string),
 			v.(string)).Do()
 		if err != nil {
@@ -148,7 +159,7 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error
 	}
 	log.Printf("[DEBUG] Route insert request: %#v", route)
 	op, err := config.clientCompute.Routes.Insert(
-		config.Project, route).Do()
+		project, route).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating route: %s", err)
 	}
@@ -167,8 +178,13 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error
 func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	route, err := config.clientCompute.Routes.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Route %q because it's gone", d.Get("name").(string))
@@ -190,9 +206,14 @@ func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error {
 func resourceComputeRouteDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the route
 	op, err := config.clientCompute.Routes.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting route: %s", err)
 	}

builtin/providers/google/resource_compute_ssl_certificate.go

@@ -17,19 +17,13 @@ func resourceComputeSslCertificate() *schema.Resource {
 		Delete: resourceComputeSslCertificateDelete,
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
+			"certificate": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"description": &schema.Schema{
+			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-
-			"certificate": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
@@ -41,12 +35,24 @@ func resourceComputeSslCertificate() *schema.Resource {
 				ForceNew: true,
 			},
 
-			"self_link": &schema.Schema{
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"id": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
 
-			"id": &schema.Schema{
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
@@ -57,6 +63,11 @@ func resourceComputeSslCertificate() *schema.Resource {
 func resourceComputeSslCertificateCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the certificate parameter
 	cert := &compute.SslCertificate{
 		Name:        d.Get("name").(string),
@@ -69,7 +80,7 @@ func resourceComputeSslCertificateCreate(d *schema.ResourceData, meta interface{
 	}
 
 	op, err := config.clientCompute.SslCertificates.Insert(
-		config.Project, cert).Do()
+		project, cert).Do()
 
 	if err != nil {
 		return fmt.Errorf("Error creating ssl certificate: %s", err)
@@ -88,8 +99,13 @@ func resourceComputeSslCertificateCreate(d *schema.ResourceData, meta interface{
 func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	cert, err := config.clientCompute.SslCertificates.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing SSL Certificate %q because it's gone", d.Get("name").(string))
@@ -111,8 +127,13 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{})
 func resourceComputeSslCertificateDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	op, err := config.clientCompute.SslCertificates.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting ssl certificate: %s", err)
 	}

builtin/providers/google/resource_compute_subnetwork.go

@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"log"
 
+	"strings"
+
 	"github.com/hashicorp/terraform/helper/schema"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
-	"strings"
 )
 
 func resourceComputeSubnetwork() *schema.Resource {
@@ -17,30 +18,24 @@ func resourceComputeSubnetwork() *schema.Resource {
 		Delete: resourceComputeSubnetworkDelete,
 
 		Schema: map[string]*schema.Schema{
+			"ip_cidr_range": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
 			"name": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"region": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"network": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"ip_cidr_range": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"description": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -52,6 +47,18 @@ func resourceComputeSubnetwork() *schema.Resource {
 				Computed: true,
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"region": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -74,6 +81,16 @@ func splitSubnetID(id string) (region string, name string) {
 func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the subnetwork parameters
 	subnetwork := &compute.Subnetwork{
 		Name:        d.Get("name").(string),
@@ -81,11 +98,10 @@ func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) e
 		IpCidrRange: d.Get("ip_cidr_range").(string),
 		Network:     d.Get("network").(string),
 	}
-	region := d.Get("region").(string)
 
 	log.Printf("[DEBUG] Subnetwork insert request: %#v", subnetwork)
 	op, err := config.clientCompute.Subnetworks.Insert(
-		config.Project, region, subnetwork).Do()
+		project, region, subnetwork).Do()
 
 	if err != nil {
 		return fmt.Errorf("Error creating subnetwork: %s", err)
@@ -109,11 +125,21 @@ func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) e
 
 func resourceComputeSubnetworkRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
+
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
-	region := d.Get("region").(string)
 
 	subnetwork, err := config.clientCompute.Subnetworks.Get(
-		config.Project, region, name).Do()
+		project, region, name).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Subnetwork %q because it's gone", name)
@@ -134,11 +160,20 @@ func resourceComputeSubnetworkRead(d *schema.ResourceData, meta interface{}) err
 
 func resourceComputeSubnetworkDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	region := d.Get("region").(string)
+
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	// Delete the subnetwork
 	op, err := config.clientCompute.Subnetworks.Delete(
-		config.Project, region, d.Get("name").(string)).Do()
+		project, region, d.Get("name").(string)).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting subnetwork: %s", err)
 	}

builtin/providers/google/resource_compute_target_http_proxy.go

@@ -24,26 +24,32 @@ func resourceComputeTargetHttpProxy() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"url_map": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+
 			"description": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
 
+			"id": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-
-			"id": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-
-			"url_map": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-			},
 		},
 	}
 }
@@ -51,6 +57,11 @@ func resourceComputeTargetHttpProxy() *schema.Resource {
 func resourceComputeTargetHttpProxyCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	proxy := &compute.TargetHttpProxy{
 		Name:   d.Get("name").(string),
 		UrlMap: d.Get("url_map").(string),
@@ -62,7 +73,7 @@ func resourceComputeTargetHttpProxyCreate(d *schema.ResourceData, meta interface
 
 	log.Printf("[DEBUG] TargetHttpProxy insert request: %#v", proxy)
 	op, err := config.clientCompute.TargetHttpProxies.Insert(
-		config.Project, proxy).Do()
+		project, proxy).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating TargetHttpProxy: %s", err)
 	}
@@ -80,13 +91,18 @@ func resourceComputeTargetHttpProxyCreate(d *schema.ResourceData, meta interface
 func resourceComputeTargetHttpProxyUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	d.Partial(true)
 
 	if d.HasChange("url_map") {
 		url_map := d.Get("url_map").(string)
 		url_map_ref := &compute.UrlMapReference{UrlMap: url_map}
 		op, err := config.clientCompute.TargetHttpProxies.SetUrlMap(
-			config.Project, d.Id(), url_map_ref).Do()
+			project, d.Id(), url_map_ref).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating target: %s", err)
 		}
@@ -107,8 +123,13 @@ func resourceComputeTargetHttpProxyUpdate(d *schema.ResourceData, meta interface
 func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	proxy, err := config.clientCompute.TargetHttpProxies.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Target HTTP Proxy %q because it's gone", d.Get("name").(string))
@@ -130,10 +151,15 @@ func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{}
 func resourceComputeTargetHttpProxyDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the TargetHttpProxy
 	log.Printf("[DEBUG] TargetHttpProxy delete request")
 	op, err := config.clientCompute.TargetHttpProxies.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting TargetHttpProxy: %s", err)
 	}

builtin/providers/google/resource_compute_target_https_proxy.go

@@ -24,6 +24,17 @@ func resourceComputeTargetHttpsProxy() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"ssl_certificates": &schema.Schema{
+				Type:     schema.TypeList,
+				Required: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+
+			"url_map": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+
 			"description": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -40,15 +51,10 @@ func resourceComputeTargetHttpsProxy() *schema.Resource {
 				Computed: true,
 			},
 
-			"url_map": &schema.Schema{
+			"project": &schema.Schema{
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
-			},
+				ForceNew: true,
-
-			"ssl_certificates": &schema.Schema{
-				Type:     schema.TypeList,
-				Required: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 		},
 	}
@@ -57,6 +63,11 @@ func resourceComputeTargetHttpsProxy() *schema.Resource {
 func resourceComputeTargetHttpsProxyCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	_sslCertificates := d.Get("ssl_certificates").([]interface{})
 	sslCertificates := make([]string, len(_sslCertificates))
 
@@ -76,7 +87,7 @@ func resourceComputeTargetHttpsProxyCreate(d *schema.ResourceData, meta interfac
 
 	log.Printf("[DEBUG] TargetHttpsProxy insert request: %#v", proxy)
 	op, err := config.clientCompute.TargetHttpsProxies.Insert(
-		config.Project, proxy).Do()
+		project, proxy).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating TargetHttpsProxy: %s", err)
 	}
@@ -94,13 +105,18 @@ func resourceComputeTargetHttpsProxyCreate(d *schema.ResourceData, meta interfac
 func resourceComputeTargetHttpsProxyUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	d.Partial(true)
 
 	if d.HasChange("url_map") {
 		url_map := d.Get("url_map").(string)
 		url_map_ref := &compute.UrlMapReference{UrlMap: url_map}
 		op, err := config.clientCompute.TargetHttpsProxies.SetUrlMap(
-			config.Project, d.Id(), url_map_ref).Do()
+			project, d.Id(), url_map_ref).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating Target HTTPS proxy URL map: %s", err)
 		}
@@ -115,7 +131,7 @@ func resourceComputeTargetHttpsProxyUpdate(d *schema.ResourceData, meta interfac
 
 	if d.HasChange("ssl_certificates") {
 		proxy, err := config.clientCompute.TargetHttpsProxies.Get(
-			config.Project, d.Id()).Do()
+			project, d.Id()).Do()
 
 		_old, _new := d.GetChange("ssl_certificates")
 		_oldCerts := _old.([]interface{})
@@ -161,7 +177,7 @@ func resourceComputeTargetHttpsProxyUpdate(d *schema.ResourceData, meta interfac
 			SslCertificates: sslCertificates,
 		}
 		op, err := config.clientCompute.TargetHttpsProxies.SetSslCertificates(
-			config.Project, d.Id(), cert_ref).Do()
+			project, d.Id(), cert_ref).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating Target Https Proxy SSL Certificates: %s", err)
 		}
@@ -182,8 +198,13 @@ func resourceComputeTargetHttpsProxyUpdate(d *schema.ResourceData, meta interfac
 func resourceComputeTargetHttpsProxyRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	proxy, err := config.clientCompute.TargetHttpsProxies.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Target HTTPS Proxy %q because it's gone", d.Get("name").(string))
@@ -223,10 +244,15 @@ func resourceComputeTargetHttpsProxyRead(d *schema.ResourceData, meta interface{
 func resourceComputeTargetHttpsProxyDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Delete the TargetHttpsProxy
 	log.Printf("[DEBUG] TargetHttpsProxy delete request")
 	op, err := config.clientCompute.TargetHttpsProxies.Delete(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting TargetHttpsProxy: %s", err)
 	}

builtin/providers/google/resource_compute_target_pool.go

@@ -18,6 +18,12 @@ func resourceComputeTargetPool() *schema.Resource {
 		Update: resourceComputeTargetPoolUpdate,
 
 		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
 			"backup_pool": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -50,9 +56,15 @@ func resourceComputeTargetPool() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 
-			"name": &schema.Schema{
+			"project": &schema.Schema{
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"region": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
 				ForceNew: true,
 			},
 
@@ -66,12 +78,6 @@ func resourceComputeTargetPool() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 			},
-
-			"region": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
 		},
 	}
 }
@@ -85,11 +91,11 @@ func convertStringArr(ifaceArr []interface{}) []string {
 }
 
 // Healthchecks need to exist before being referred to from the target pool.
-func convertHealthChecks(config *Config, names []string) ([]string, error) {
+func convertHealthChecks(config *Config, project string, names []string) ([]string, error) {
 	urls := make([]string, len(names))
 	for i, name := range names {
 		// Look up the healthcheck
-		res, err := config.clientCompute.HttpHealthChecks.Get(config.Project, name).Do()
+		res, err := config.clientCompute.HttpHealthChecks.Get(project, name).Do()
 		if err != nil {
 			return nil, fmt.Errorf("Error reading HealthCheck: %s", err)
 		}
@@ -100,7 +106,7 @@ func convertHealthChecks(config *Config, names []string) ([]string, error) {
 
 // Instances do not need to exist yet, so we simply generate URLs.
 // Instances can be full URLS or zone/name
-func convertInstances(config *Config, names []string) ([]string, error) {
+func convertInstances(config *Config, project string, names []string) ([]string, error) {
 	urls := make([]string, len(names))
 	for i, name := range names {
 		if strings.HasPrefix(name, "https://www.googleapis.com/compute/v1/") {
@@ -112,7 +118,7 @@ func convertInstances(config *Config, names []string) ([]string, error) {
 			} else {
 				urls[i] = fmt.Sprintf(
 					"https://www.googleapis.com/compute/v1/projects/%s/zones/%s/instances/%s",
-					config.Project, splitName[0], splitName[1])
+					project, splitName[0], splitName[1])
 			}
 		}
 	}
@@ -121,16 +127,25 @@ func convertInstances(config *Config, names []string) ([]string, error) {
 
 func resourceComputeTargetPoolCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	region := getOptionalRegion(d, config)
+
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	hchkUrls, err := convertHealthChecks(
-		config, convertStringArr(d.Get("health_checks").([]interface{})))
+		config, project, convertStringArr(d.Get("health_checks").([]interface{})))
 	if err != nil {
 		return err
 	}
 
 	instanceUrls, err := convertInstances(
-		config, convertStringArr(d.Get("instances").([]interface{})))
+		config, project, convertStringArr(d.Get("instances").([]interface{})))
 	if err != nil {
 		return err
 	}
@@ -149,7 +164,7 @@ func resourceComputeTargetPoolCreate(d *schema.ResourceData, meta interface{}) e
 	}
 	log.Printf("[DEBUG] TargetPool insert request: %#v", tpool)
 	op, err := config.clientCompute.TargetPools.Insert(
-		config.Project, region, tpool).Do()
+		project, region, tpool).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating TargetPool: %s", err)
 	}
@@ -196,7 +211,16 @@ func calcAddRemove(from []string, to []string) ([]string, []string) {
 
 func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	region := getOptionalRegion(d, config)
+
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	d.Partial(true)
 
@@ -205,11 +229,11 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
 		from_, to_ := d.GetChange("health_checks")
 		from := convertStringArr(from_.([]interface{}))
 		to := convertStringArr(to_.([]interface{}))
-		fromUrls, err := convertHealthChecks(config, from)
+		fromUrls, err := convertHealthChecks(config, project, from)
 		if err != nil {
 			return err
 		}
-		toUrls, err := convertHealthChecks(config, to)
+		toUrls, err := convertHealthChecks(config, project, to)
 		if err != nil {
 			return err
 		}
@@ -222,7 +246,7 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
 			removeReq.HealthChecks[i] = &compute.HealthCheckReference{HealthCheck: v}
 		}
 		op, err := config.clientCompute.TargetPools.RemoveHealthCheck(
-			config.Project, region, d.Id(), removeReq).Do()
+			project, region, d.Id(), removeReq).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating health_check: %s", err)
 		}
@@ -238,7 +262,7 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
 			addReq.HealthChecks[i] = &compute.HealthCheckReference{HealthCheck: v}
 		}
 		op, err = config.clientCompute.TargetPools.AddHealthCheck(
-			config.Project, region, d.Id(), addReq).Do()
+			project, region, d.Id(), addReq).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating health_check: %s", err)
 		}
@@ -255,11 +279,11 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
 		from_, to_ := d.GetChange("instances")
 		from := convertStringArr(from_.([]interface{}))
 		to := convertStringArr(to_.([]interface{}))
-		fromUrls, err := convertInstances(config, from)
+		fromUrls, err := convertInstances(config, project, from)
 		if err != nil {
 			return err
 		}
-		toUrls, err := convertInstances(config, to)
+		toUrls, err := convertInstances(config, project, to)
 		if err != nil {
 			return err
 		}
@@ -272,7 +296,7 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
 			addReq.Instances[i] = &compute.InstanceReference{Instance: v}
 		}
 		op, err := config.clientCompute.TargetPools.AddInstance(
-			config.Project, region, d.Id(), addReq).Do()
+			project, region, d.Id(), addReq).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating instances: %s", err)
 		}
@@ -288,7 +312,7 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
 			removeReq.Instances[i] = &compute.InstanceReference{Instance: v}
 		}
 		op, err = config.clientCompute.TargetPools.RemoveInstance(
-			config.Project, region, d.Id(), removeReq).Do()
+			project, region, d.Id(), removeReq).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating instances: %s", err)
 		}
@@ -305,7 +329,7 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
 			Target: bpool_name,
 		}
 		op, err := config.clientCompute.TargetPools.SetBackup(
-			config.Project, region, d.Id(), tref).Do()
+			project, region, d.Id(), tref).Do()
 		if err != nil {
 			return fmt.Errorf("Error updating backup_pool: %s", err)
 		}
@@ -324,10 +348,19 @@ func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) e
 
 func resourceComputeTargetPoolRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	region := getOptionalRegion(d, config)
+
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	tpool, err := config.clientCompute.TargetPools.Get(
-		config.Project, region, d.Id()).Do()
+		project, region, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Target Pool %q because it's gone", d.Get("name").(string))
@@ -347,11 +380,20 @@ func resourceComputeTargetPoolRead(d *schema.ResourceData, meta interface{}) err
 
 func resourceComputeTargetPoolDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	region := getOptionalRegion(d, config)
+
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
 
 	// Delete the TargetPool
 	op, err := config.clientCompute.TargetPools.Delete(
-		config.Project, region, d.Id()).Do()
+		project, region, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting TargetPool: %s", err)
 	}

builtin/providers/google/resource_compute_url_map.go

@@ -18,22 +18,17 @@ func resourceComputeUrlMap() *schema.Resource {
 		Delete: resourceComputeUrlMapDelete,
 
 		Schema: map[string]*schema.Schema{
+			"default_service": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+
 			"name": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"id": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-
-			"default_service": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-			},
-
 			"description": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -68,6 +63,11 @@ func resourceComputeUrlMap() *schema.Resource {
 				},
 			},
 
+			"id": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"path_matcher": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -110,6 +110,12 @@ func resourceComputeUrlMap() *schema.Resource {
 				},
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -235,6 +241,11 @@ func createUrlMapTest(v interface{}) *compute.UrlMapTest {
 func resourceComputeUrlMapCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
 	defaultService := d.Get("default_service").(string)
 
@@ -271,7 +282,7 @@ func resourceComputeUrlMapCreate(d *schema.ResourceData, meta interface{}) error
 		urlMap.Tests[i] = createUrlMapTest(v)
 	}
 
-	op, err := config.clientCompute.UrlMaps.Insert(config.Project, urlMap).Do()
+	op, err := config.clientCompute.UrlMaps.Insert(project, urlMap).Do()
 
 	if err != nil {
 		return fmt.Errorf("Error, failed to insert Url Map %s: %s", name, err)
@@ -289,9 +300,14 @@ func resourceComputeUrlMapCreate(d *schema.ResourceData, meta interface{}) error
 func resourceComputeUrlMapRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
 
-	urlMap, err := config.clientCompute.UrlMaps.Get(config.Project, name).Do()
+	urlMap, err := config.clientCompute.UrlMaps.Get(project, name).Do()
 
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
@@ -425,8 +441,13 @@ func resourceComputeUrlMapRead(d *schema.ResourceData, meta interface{}) error {
 func resourceComputeUrlMapUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
-	urlMap, err := config.clientCompute.UrlMaps.Get(config.Project, name).Do()
+	urlMap, err := config.clientCompute.UrlMaps.Get(project, name).Do()
 	if err != nil {
 		return fmt.Errorf("Error, failed to get Url Map %s: %s", name, err)
 	}
@@ -624,7 +645,7 @@ func resourceComputeUrlMapUpdate(d *schema.ResourceData, meta interface{}) error
 		urlMap.Tests = newTests
 	}
 
-	op, err := config.clientCompute.UrlMaps.Update(config.Project, urlMap.Name, urlMap).Do()
+	op, err := config.clientCompute.UrlMaps.Update(project, urlMap.Name, urlMap).Do()
 
 	if err != nil {
 		return fmt.Errorf("Error, failed to update Url Map %s: %s", name, err)
@@ -641,9 +662,15 @@ func resourceComputeUrlMapUpdate(d *schema.ResourceData, meta interface{}) error
 
 func resourceComputeUrlMapDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
 
-	op, err := config.clientCompute.UrlMaps.Delete(config.Project, name).Do()
+	op, err := config.clientCompute.UrlMaps.Delete(project, name).Do()
 
 	if err != nil {
 		return fmt.Errorf("Error, failed to delete Url Map %s: %s", name, err)

builtin/providers/google/resource_compute_vpn_gateway.go

@@ -24,21 +24,31 @@ func resourceComputeVpnGateway() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"description": &schema.Schema{
+
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
 			"network": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
+
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"region": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
+
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -50,10 +60,18 @@ func resourceComputeVpnGateway() *schema.Resource {
 func resourceComputeVpnGatewayCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
 	network := d.Get("network").(string)
-	region := getOptionalRegion(d, config)
-	project := config.Project
 
 	vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute)
 
@@ -82,9 +100,17 @@ func resourceComputeVpnGatewayCreate(d *schema.ResourceData, meta interface{}) e
 func resourceComputeVpnGatewayRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
-	region := getOptionalRegion(d, config)
-	project := config.Project
 
 	vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute)
 	vpnGateway, err := vpnGatewaysService.Get(project, region, name).Do()
@@ -110,9 +136,17 @@ func resourceComputeVpnGatewayRead(d *schema.ResourceData, meta interface{}) err
 func resourceComputeVpnGatewayDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
-	region := getOptionalRegion(d, config)
-	project := config.Project
 
 	vpnGatewaysService := compute.NewTargetVpnGatewaysService(config.clientCompute)
 

builtin/providers/google/resource_compute_vpn_tunnel.go

@@ -26,38 +26,44 @@ func resourceComputeVpnTunnel() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"description": &schema.Schema{
+
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-			"region": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
 			"peer_ip": &schema.Schema{
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
 				ValidateFunc: validatePeerAddr,
 			},
+
 			"shared_secret": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
+
 			"target_vpn_gateway": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
+
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"detailed_status": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"ike_version": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
 				Default:  2,
 				ForceNew: true,
 			},
+
 			"local_traffic_selector": &schema.Schema{
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -65,10 +71,19 @@ func resourceComputeVpnTunnel() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Set:      schema.HashString,
 			},
-			"detailed_status": &schema.Schema{
+
+			"project": &schema.Schema{
 				Type:     schema.TypeString,
-				Computed: true,
+				Optional: true,
+				ForceNew: true,
 			},
+
+			"region": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -80,13 +95,21 @@ func resourceComputeVpnTunnel() *schema.Resource {
 func resourceComputeVpnTunnelCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
-	region := getOptionalRegion(d, config)
 	peerIp := d.Get("peer_ip").(string)
 	sharedSecret := d.Get("shared_secret").(string)
 	targetVpnGateway := d.Get("target_vpn_gateway").(string)
 	ikeVersion := d.Get("ike_version").(int)
-	project := config.Project
 
 	if ikeVersion < 1 || ikeVersion > 2 {
 		return fmt.Errorf("Only IKE version 1 or 2 supported, not %d", ikeVersion)
@@ -132,9 +155,17 @@ func resourceComputeVpnTunnelCreate(d *schema.ResourceData, meta interface{}) er
 func resourceComputeVpnTunnelRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
-	region := getOptionalRegion(d, config)
-	project := config.Project
 
 	vpnTunnelsService := compute.NewVpnTunnelsService(config.clientCompute)
 
@@ -162,9 +193,17 @@ func resourceComputeVpnTunnelRead(d *schema.ResourceData, meta interface{}) erro
 func resourceComputeVpnTunnelDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	region, err := getRegion(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
-	region := getOptionalRegion(d, config)
-	project := config.Project
 
 	vpnTunnelsService := compute.NewVpnTunnelsService(config.clientCompute)
 

builtin/providers/google/resource_container_cluster.go

@@ -21,60 +21,12 @@ func resourceContainerCluster() *schema.Resource {
 		Delete: resourceContainerClusterDelete,
 
 		Schema: map[string]*schema.Schema{
-			"zone": &schema.Schema{
+			"initial_node_count": &schema.Schema{
-				Type:     schema.TypeString,
+				Type:     schema.TypeInt,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"node_version": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
-
-			"cluster_ipv4_cidr": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
-				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
-					value := v.(string)
-					_, ipnet, err := net.ParseCIDR(value)
-
-					if err != nil || ipnet == nil || value != ipnet.String() {
-						errors = append(errors, fmt.Errorf(
-							"%q must contain a valid CIDR", k))
-					}
-					return
-				},
-			},
-
-			"description": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-
-			"endpoint": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
-
-			"logging_service": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
-			},
-
-			"monitoring_service": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
-			},
-
 			"master_auth": &schema.Schema{
 				Type:     schema.TypeList,
 				Required: true,
@@ -93,13 +45,11 @@ func resourceContainerCluster() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
-
 						"password": &schema.Schema{
 							Type:     schema.TypeString,
 							Required: true,
 							ForceNew: true,
 						},
-
 						"username": &schema.Schema{
 							Type:     schema.TypeString,
 							Required: true,
@@ -136,6 +86,60 @@ func resourceContainerCluster() *schema.Resource {
 				},
 			},
 
+			"zone": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"cluster_ipv4_cidr": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
+					value := v.(string)
+					_, ipnet, err := net.ParseCIDR(value)
+
+					if err != nil || ipnet == nil || value != ipnet.String() {
+						errors = append(errors, fmt.Errorf(
+							"%q must contain a valid CIDR", k))
+					}
+					return
+				},
+			},
+
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"endpoint": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"instance_group_urls": &schema.Schema{
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+
+			"logging_service": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+
+			"monitoring_service": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+
 			"network": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -184,16 +188,16 @@ func resourceContainerCluster() *schema.Resource {
 				},
 			},
 
-			"initial_node_count": &schema.Schema{
+			"node_version": &schema.Schema{
-				Type:     schema.TypeInt,
+				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
-				ForceNew: true,
+				Computed: true,
 			},
 
-			"instance_group_urls": &schema.Schema{
+			"project": &schema.Schema{
-				Type:     schema.TypeList,
+				Type:     schema.TypeString,
-				Computed: true,
+				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				ForceNew: true,
 			},
 		},
 	}
@@ -202,6 +206,11 @@ func resourceContainerCluster() *schema.Resource {
 func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zoneName := d.Get("zone").(string)
 	clusterName := d.Get("name").(string)
 
@@ -273,7 +282,7 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er
 	}
 
 	op, err := config.clientContainer.Projects.Zones.Clusters.Create(
-		config.Project, zoneName, req).Do()
+		project, zoneName, req).Do()
 	if err != nil {
 		return err
 	}
@@ -286,7 +295,7 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er
 		MinTimeout: 3 * time.Second,
 		Refresh: func() (interface{}, string, error) {
 			resp, err := config.clientContainer.Projects.Zones.Operations.Get(
-				config.Project, zoneName, op.Name).Do()
+				project, zoneName, op.Name).Do()
 			log.Printf("[DEBUG] Progress of creating GKE cluster %s: %s",
 				clusterName, resp.Status)
 			return resp, resp.Status, err
@@ -308,10 +317,15 @@ func resourceContainerClusterCreate(d *schema.ResourceData, meta interface{}) er
 func resourceContainerClusterRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zoneName := d.Get("zone").(string)
 
 	cluster, err := config.clientContainer.Projects.Zones.Clusters.Get(
-		config.Project, zoneName, d.Get("name").(string)).Do()
+		project, zoneName, d.Get("name").(string)).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing Container Cluster %q because it's gone", d.Get("name").(string))
@@ -355,6 +369,11 @@ func resourceContainerClusterRead(d *schema.ResourceData, meta interface{}) erro
 func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zoneName := d.Get("zone").(string)
 	clusterName := d.Get("name").(string)
 	desiredNodeVersion := d.Get("node_version").(string)
@@ -365,7 +384,7 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
 		},
 	}
 	op, err := config.clientContainer.Projects.Zones.Clusters.Update(
-		config.Project, zoneName, clusterName, req).Do()
+		project, zoneName, clusterName, req).Do()
 	if err != nil {
 		return err
 	}
@@ -379,7 +398,7 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
 		Refresh: func() (interface{}, string, error) {
 			log.Printf("[DEBUG] Checking if GKE cluster %s is updated", clusterName)
 			resp, err := config.clientContainer.Projects.Zones.Operations.Get(
-				config.Project, zoneName, op.Name).Do()
+				project, zoneName, op.Name).Do()
 			log.Printf("[DEBUG] Progress of updating GKE cluster %s: %s",
 				clusterName, resp.Status)
 			return resp, resp.Status, err
@@ -400,12 +419,17 @@ func resourceContainerClusterUpdate(d *schema.ResourceData, meta interface{}) er
 func resourceContainerClusterDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zoneName := d.Get("zone").(string)
 	clusterName := d.Get("name").(string)
 
 	log.Printf("[DEBUG] Deleting GKE cluster %s", d.Get("name").(string))
 	op, err := config.clientContainer.Projects.Zones.Clusters.Delete(
-		config.Project, zoneName, clusterName).Do()
+		project, zoneName, clusterName).Do()
 	if err != nil {
 		return err
 	}
@@ -419,7 +443,7 @@ func resourceContainerClusterDelete(d *schema.ResourceData, meta interface{}) er
 		Refresh: func() (interface{}, string, error) {
 			log.Printf("[DEBUG] Checking if GKE cluster %s is deleted", clusterName)
 			resp, err := config.clientContainer.Projects.Zones.Operations.Get(
-				config.Project, zoneName, op.Name).Do()
+				project, zoneName, op.Name).Do()
 			log.Printf("[DEBUG] Progress of deleting GKE cluster %s: %s",
 				clusterName, resp.Status)
 			return resp, resp.Status, err

builtin/providers/google/resource_dns_managed_zone.go

@@ -16,13 +16,13 @@ func resourceDnsManagedZone() *schema.Resource {
 		Delete: resourceDnsManagedZoneDelete,
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
+			"dns_name": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"dns_name": &schema.Schema{
+			"name": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
@@ -44,6 +44,12 @@ func resourceDnsManagedZone() *schema.Resource {
 			},
 
 			// Google Cloud DNS ManagedZone resources do not have a SelfLink attribute.
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -51,6 +57,11 @@ func resourceDnsManagedZone() *schema.Resource {
 func resourceDnsManagedZoneCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Build the parameter
 	zone := &dns.ManagedZone{
 		Name:    d.Get("name").(string),
@@ -65,7 +76,7 @@ func resourceDnsManagedZoneCreate(d *schema.ResourceData, meta interface{}) erro
 	}
 
 	log.Printf("[DEBUG] DNS ManagedZone create request: %#v", zone)
-	zone, err := config.clientDns.ManagedZones.Create(config.Project, zone).Do()
+	zone, err = config.clientDns.ManagedZones.Create(project, zone).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating DNS ManagedZone: %s", err)
 	}
@@ -78,8 +89,13 @@ func resourceDnsManagedZoneCreate(d *schema.ResourceData, meta interface{}) erro
 func resourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone, err := config.clientDns.ManagedZones.Get(
-		config.Project, d.Id()).Do()
+		project, d.Id()).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing DNS Managed Zone %q because it's gone", d.Get("name").(string))
@@ -100,7 +116,12 @@ func resourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) error
 func resourceDnsManagedZoneDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	err := config.clientDns.ManagedZones.Delete(config.Project, d.Id()).Do()
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
+	err = config.clientDns.ManagedZones.Delete(project, d.Id()).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting DNS ManagedZone: %s", err)
 	}

builtin/providers/google/resource_dns_record_set.go

@@ -17,30 +17,18 @@ func resourceDnsRecordSet() *schema.Resource {
 		Delete: resourceDnsRecordSetDelete,
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"managed_zone": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"type": &schema.Schema{
+			"name": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
 
-			"ttl": &schema.Schema{
-				Type:     schema.TypeInt,
-				Required: true,
-				ForceNew: true,
-			},
-
 			"rrdatas": &schema.Schema{
 				Type:     schema.TypeList,
 				Required: true,
@@ -49,6 +37,24 @@ func resourceDnsRecordSet() *schema.Resource {
 					Type: schema.TypeString,
 				},
 			},
+
+			"ttl": &schema.Schema{
+				Type:     schema.TypeInt,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"type": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -56,6 +62,11 @@ func resourceDnsRecordSet() *schema.Resource {
 func resourceDnsRecordSetCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("managed_zone").(string)
 
 	rrdatasCount := d.Get("rrdatas.#").(int)
@@ -78,7 +89,7 @@ func resourceDnsRecordSetCreate(d *schema.ResourceData, meta interface{}) error
 	}
 
 	log.Printf("[DEBUG] DNS Record create request: %#v", chg)
-	chg, err := config.clientDns.Changes.Create(config.Project, zone, chg).Do()
+	chg, err = config.clientDns.Changes.Create(project, zone, chg).Do()
 	if err != nil {
 		return fmt.Errorf("Error creating DNS RecordSet: %s", err)
 	}
@@ -88,7 +99,7 @@ func resourceDnsRecordSetCreate(d *schema.ResourceData, meta interface{}) error
 	w := &DnsChangeWaiter{
 		Service:     config.clientDns,
 		Change:      chg,
-		Project:     config.Project,
+		Project:     project,
 		ManagedZone: zone,
 	}
 	state := w.Conf()
@@ -106,6 +117,11 @@ func resourceDnsRecordSetCreate(d *schema.ResourceData, meta interface{}) error
 func resourceDnsRecordSetRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("managed_zone").(string)
 
 	// name and type are effectively the 'key'
@@ -113,7 +129,7 @@ func resourceDnsRecordSetRead(d *schema.ResourceData, meta interface{}) error {
 	dnsType := d.Get("type").(string)
 
 	resp, err := config.clientDns.ResourceRecordSets.List(
-		config.Project, zone).Name(name).Type(dnsType).Do()
+		project, zone).Name(name).Type(dnsType).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
 			log.Printf("[WARN] Removing DNS Record Set %q because it's gone", d.Get("name").(string))
@@ -144,6 +160,11 @@ func resourceDnsRecordSetRead(d *schema.ResourceData, meta interface{}) error {
 func resourceDnsRecordSetDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	zone := d.Get("managed_zone").(string)
 
 	rrdatasCount := d.Get("rrdatas.#").(int)
@@ -165,7 +186,7 @@ func resourceDnsRecordSetDelete(d *schema.ResourceData, meta interface{}) error
 		chg.Deletions[0].Rrdatas[i] = d.Get(rrdata).(string)
 	}
 	log.Printf("[DEBUG] DNS Record delete request: %#v", chg)
-	chg, err := config.clientDns.Changes.Create(config.Project, zone, chg).Do()
+	chg, err = config.clientDns.Changes.Create(project, zone, chg).Do()
 	if err != nil {
 		return fmt.Errorf("Error deleting DNS RecordSet: %s", err)
 	}
@@ -173,7 +194,7 @@ func resourceDnsRecordSetDelete(d *schema.ResourceData, meta interface{}) error
 	w := &DnsChangeWaiter{
 		Service:     config.clientDns,
 		Change:      chg,
-		Project:     config.Project,
+		Project:     project,
 		ManagedZone: zone,
 	}
 	state := w.Conf()

builtin/providers/google/resource_pubsub_subscription.go

@@ -20,12 +20,24 @@ func resourcePubsubSubscription() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"topic": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
 			"ack_deadline_seconds": &schema.Schema{
 				Type:     schema.TypeInt,
 				Optional: true,
 				ForceNew: true,
 			},
 
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"push_config": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -47,12 +59,6 @@ func resourcePubsubSubscription() *schema.Resource {
 					},
 				},
 			},
-
-			"topic": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
 		},
 	}
 }
@@ -68,8 +74,13 @@ func cleanAdditionalArgs(args map[string]interface{}) map[string]string {
 func resourcePubsubSubscriptionCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	name := fmt.Sprintf("projects/%s/subscriptions/%s", config.Project, d.Get("name").(string))
+	project, err := getProject(d, config)
-	computed_topic_name := fmt.Sprintf("projects/%s/topics/%s", config.Project, d.Get("topic").(string))
+	if err != nil {
+		return err
+	}
+
+	name := fmt.Sprintf("projects/%s/subscriptions/%s", project, d.Get("name").(string))
+	computed_topic_name := fmt.Sprintf("projects/%s/topics/%s", project, d.Get("topic").(string))
 
 	//  process optional parameters
 	var ackDeadlineSeconds int64

builtin/providers/google/resource_pubsub_topic.go

@@ -19,6 +19,12 @@ func resourcePubsubTopic() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -26,7 +32,12 @@ func resourcePubsubTopic() *schema.Resource {
 func resourcePubsubTopicCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	name := fmt.Sprintf("projects/%s/topics/%s", config.Project, d.Get("name").(string))
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
+	name := fmt.Sprintf("projects/%s/topics/%s", project, d.Get("name").(string))
 	topic := &pubsub.Topic{}
 
 	call := config.clientPubsub.Projects.Topics.Create(name, topic)

builtin/providers/google/resource_sql_database.go

@@ -22,11 +22,19 @@ func resourceSqlDatabase() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+
 			"instance": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"self_link": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -38,9 +46,13 @@ func resourceSqlDatabase() *schema.Resource {
 func resourceSqlDatabaseCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	database_name := d.Get("name").(string)
 	instance_name := d.Get("instance").(string)
-	project := config.Project
 
 	db := &sqladmin.Database{
 		Name:     database_name,
@@ -69,9 +81,13 @@ func resourceSqlDatabaseCreate(d *schema.ResourceData, meta interface{}) error {
 func resourceSqlDatabaseRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	database_name := d.Get("name").(string)
 	instance_name := d.Get("instance").(string)
-	project := config.Project
 
 	db, err := config.clientSqlAdmin.Databases.Get(project, instance_name,
 		database_name).Do()
@@ -99,9 +115,13 @@ func resourceSqlDatabaseRead(d *schema.ResourceData, meta interface{}) error {
 func resourceSqlDatabaseDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	database_name := d.Get("name").(string)
 	instance_name := d.Get("instance").(string)
-	project := config.Project
 
 	op, err := config.clientSqlAdmin.Databases.Delete(project, instance_name,
 		database_name).Do()

builtin/providers/google/resource_sql_database_instance.go

@@ -19,32 +19,12 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 		Delete: resourceSqlDatabaseInstanceDelete,
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
-			},
-			"master_instance_name": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-			},
-			"database_version": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				Default:  "MYSQL_5_5",
-				ForceNew: true,
-			},
 			"region": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
-			"self_link": &schema.Schema{
+
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"settings": &schema.Schema{
 				Type:     schema.TypeList,
 				Required: true,
@@ -170,6 +150,14 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 					},
 				},
 			},
+
+			"database_version": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  "MYSQL_5_5",
+				ForceNew: true,
+			},
+
 			"ip_address": &schema.Schema{
 				Type:     schema.TypeList,
 				Computed: true,
@@ -187,6 +175,26 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 					},
 				},
 			},
+
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+
+			"master_instance_name": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"replica_configuration": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -245,6 +253,11 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 					},
 				},
 			},
+
+			"self_link": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -252,6 +265,11 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	region := d.Get("region").(string)
 	databaseVersion := d.Get("database_version").(string)
 
@@ -468,7 +486,7 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
 		instance.MasterInstanceName = v.(string)
 	}
 
-	op, err := config.clientSqlAdmin.Instances.Insert(config.Project, instance).Do()
+	op, err := config.clientSqlAdmin.Instances.Insert(project, instance).Do()
 	if err != nil {
 		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 409 {
 			return fmt.Errorf("Error, the name %s is unavailable because it was used recently", instance.Name)
@@ -488,7 +506,12 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
 func resourceSqlDatabaseInstanceRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	instance, err := config.clientSqlAdmin.Instances.Get(config.Project,
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
+	instance, err := config.clientSqlAdmin.Instances.Get(project,
 		d.Get("name").(string)).Do()
 
 	if err != nil {
@@ -742,9 +765,15 @@ func resourceSqlDatabaseInstanceRead(d *schema.ResourceData, meta interface{}) e
 
 func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	d.Partial(true)
 
-	instance, err := config.clientSqlAdmin.Instances.Get(config.Project,
+	instance, err := config.clientSqlAdmin.Instances.Get(project,
 		d.Get("name").(string)).Do()
 
 	if err != nil {
@@ -963,7 +992,7 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
 
 	d.Partial(false)
 
-	op, err := config.clientSqlAdmin.Instances.Update(config.Project, instance.Name, instance).Do()
+	op, err := config.clientSqlAdmin.Instances.Update(project, instance.Name, instance).Do()
 	if err != nil {
 		return fmt.Errorf("Error, failed to update instance %s: %s", instance.Name, err)
 	}
@@ -979,7 +1008,12 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
 func resourceSqlDatabaseInstanceDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
-	op, err := config.clientSqlAdmin.Instances.Delete(config.Project, d.Get("name").(string)).Do()
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
+	op, err := config.clientSqlAdmin.Instances.Delete(project, d.Get("name").(string)).Do()
 
 	if err != nil {
 		return fmt.Errorf("Error, failed to delete instance %s: %s", d.Get("name").(string), err)

builtin/providers/google/resource_sql_user.go

@@ -18,17 +18,6 @@ func resourceSqlUser() *schema.Resource {
 		Delete: resourceSqlUserDelete,
 
 		Schema: map[string]*schema.Schema{
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-			},
-
-			"password": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-			},
-
 			"host": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
@@ -40,6 +29,23 @@ func resourceSqlUser() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			"password": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -47,11 +53,15 @@ func resourceSqlUser() *schema.Resource {
 func resourceSqlUserCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
 	instance := d.Get("instance").(string)
 	password := d.Get("password").(string)
 	host := d.Get("host").(string)
-	project := config.Project
 
 	user := &sqladmin.User{
 		Name:     name,
@@ -81,9 +91,13 @@ func resourceSqlUserCreate(d *schema.ResourceData, meta interface{}) error {
 func resourceSqlUserRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
 	instance := d.Get("instance").(string)
-	project := config.Project
 
 	users, err := config.clientSqlAdmin.Users.List(project, instance).Do()
 
@@ -122,11 +136,15 @@ func resourceSqlUserUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
 	if d.HasChange("password") {
+		project, err := getProject(d, config)
+		if err != nil {
+			return err
+		}
+
 		name := d.Get("name").(string)
 		instance := d.Get("instance").(string)
 		host := d.Get("host").(string)
 		password := d.Get("password").(string)
-		project := config.Project
 
 		user := &sqladmin.User{
 			Name:     name,
@@ -159,10 +177,14 @@ func resourceSqlUserUpdate(d *schema.ResourceData, meta interface{}) error {
 func resourceSqlUserDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	name := d.Get("name").(string)
 	instance := d.Get("instance").(string)
 	host := d.Get("host").(string)
-	project := config.Project
 
 	op, err := config.clientSqlAdmin.Users.Delete(project, instance, host, name).Do()
 

builtin/providers/google/resource_storage_bucket.go

@@ -24,23 +24,38 @@ func resourceStorageBucket() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"predefined_acl": &schema.Schema{
+
-				Type:       schema.TypeString,
+			"force_destroy": &schema.Schema{
-				Deprecated: "Please use resource \"storage_bucket_acl.predefined_acl\" instead.",
+				Type:     schema.TypeBool,
 				Optional: true,
-				ForceNew:   true,
+				Default:  false,
 			},
+
 			"location": &schema.Schema{
 				Type:     schema.TypeString,
 				Default:  "US",
 				Optional: true,
 				ForceNew: true,
 			},
-			"force_destroy": &schema.Schema{
+
-				Type:     schema.TypeBool,
+			"predefined_acl": &schema.Schema{
+				Type:       schema.TypeString,
+				Deprecated: "Please use resource \"storage_bucket_acl.predefined_acl\" instead.",
 				Optional:   true,
-				Default:  false,
+				ForceNew:   true,
 			},
+
+			"project": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
+			"self_link": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"website": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
@@ -57,10 +72,6 @@ func resourceStorageBucket() *schema.Resource {
 					},
 				},
 			},
-			"self_link": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -68,6 +79,11 @@ func resourceStorageBucket() *schema.Resource {
 func resourceStorageBucketCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	// Get the bucket and acl
 	bucket := d.Get("name").(string)
 	location := d.Get("location").(string)
@@ -95,7 +111,7 @@ func resourceStorageBucketCreate(d *schema.ResourceData, meta interface{}) error
 		}
 	}
 
-	call := config.clientStorage.Buckets.Insert(config.Project, sb)
+	call := config.clientStorage.Buckets.Insert(project, sb)
 	if v, ok := d.GetOk("predefined_acl"); ok {
 		call = call.PredefinedAcl(v.(string))
 	}

builtin/providers/google/resource_storage_bucket_acl.go

@@ -24,20 +24,23 @@ func resourceStorageBucketAcl() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+
+			"default_acl": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+
 			"predefined_acl": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
+
 			"role_entity": &schema.Schema{
 				Type:     schema.TypeList,
 				Optional: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
-			"default_acl": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-			},
 		},
 	}
 }

builtin/providers/google/resource_storage_bucket_object.go

@@ -32,13 +32,6 @@ func resourceStorageBucketObject() *schema.Resource {
 				ForceNew: true,
 			},
 
-			"source": &schema.Schema{
-				Type:          schema.TypeString,
-				Optional:      true,
-				ForceNew:      true,
-				ConflictsWith: []string{"content"},
-			},
-
 			"content": &schema.Schema{
 				Type:          schema.TypeString,
 				Optional:      true,
@@ -46,6 +39,16 @@ func resourceStorageBucketObject() *schema.Resource {
 				ConflictsWith: []string{"source"},
 			},
 
+			"crc32c": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"md5hash": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"predefined_acl": &schema.Schema{
 				Type:       schema.TypeString,
 				Deprecated: "Please use resource \"storage_object_acl.predefined_acl\" instead.",
@@ -53,14 +56,11 @@ func resourceStorageBucketObject() *schema.Resource {
 				ForceNew:   true,
 			},
 
-			"md5hash": &schema.Schema{
+			"source": &schema.Schema{
 				Type:          schema.TypeString,
-				Computed: true,
+				Optional:      true,
-			},
+				ForceNew:      true,
-
+				ConflictsWith: []string{"content"},
-			"crc32c": &schema.Schema{
-				Type:     schema.TypeString,
-				Computed: true,
 			},
 		},
 	}

builtin/providers/google/resource_storage_object_acl.go

@@ -23,21 +23,24 @@ func resourceStorageObjectAcl() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+
 			"object": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
-			"role_entity": &schema.Schema{
+
-				Type:     schema.TypeList,
-				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
-			},
 			"predefined_acl": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
 			},
+
+			"role_entity": &schema.Schema{
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 		},
 	}
 }

website/source/docs/providers/google/index.html.markdown

@@ -16,17 +16,17 @@ Use the navigation to the left to read about the available resources.
 
 ## Example Usage
 
-```
+```js
-# Configure the Google Cloud provider
+// Configure the Google Cloud provider
 provider "google" {
   credentials = "${file("account.json")}"
   project     = "my-gce-project"
   region      = "us-central1"
 }
 
-# Create a new instance
+// Create a new instance
 resource "google_compute_instance" "default" {
-  ...
+  // ...
 }
 ```
 
@@ -42,12 +42,15 @@ The following keys can be used to configure the provider.
   can also be specified with the `GOOGLE_CREDENTIALS` or `GOOGLE_CLOUD_KEYFILE_JSON`
   shell environment variable, containing the contents of the credentials file.
 
-* `project` - (Required) The ID of the project to apply any resources to.  This
-  can also be specified with the `GOOGLE_PROJECT` shell environment variable.
-
 * `region` - (Required) The region to operate under. This can also be specified
   with the `GOOGLE_REGION` shell environment variable.
 
+* `project` - (Optional) The ID of the project to apply resources in. This
+  can also be specified with the `GOOGLE_PROJECT` shell environment variable.
+  If unspecified, users will need to specify the `project` attribute for
+  all resources. If specified, resources which do not depend on a project will
+  ignore this value.
+
 The following keys are supported for backwards compatibility, and may be
 removed in a future version:
 

website/source/docs/providers/google/r/compute_address.html.markdown

@@ -15,7 +15,7 @@ Creates a static IP address resource for Google Compute Engine.  For more inform
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_address" "default" {
   name = "test-address"
 }
@@ -27,14 +27,18 @@ The following arguments are supported:
 
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
+
+- - -
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 * `region` - (Optional) The Region in which the created address should reside.
     If it is not provided, the provider region is used.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `name` - The name of the resource.
-* `address` - The IP address that was allocated.
 * `self_link` - The URI of the created resource.
-* `region` - The Region in which the created address does reside.

website/source/docs/providers/google/r/compute_autoscaler.html.markdown

@@ -20,11 +20,12 @@ documentation](https://cloud.google.com/compute/docs/autoscaler/) and
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_instance_template" "foobar" {
   name           = "foobar"
   machine_type   = "n1-standard-1"
   can_ip_forward = false
+
   tags = ["foo", "bar"]
 
   disk {
@@ -50,21 +51,24 @@ resource "google_compute_target_pool" "foobar" {
 
 resource "google_compute_instance_group_manager" "foobar" {
   name = "foobar"
+  zone = "us-central1-f"
+
   instance_template  = "${google_compute_instance_template.foobar.self_link}"
   target_pools       = ["${google_compute_target_pool.foobar.self_link}"]
   base_instance_name = "foobar"
-    zone = "us-central1-f"
 }
 
 resource "google_compute_autoscaler" "foobar" {
   name   = "foobar"
   zone   = "us-central1-f"
   target = "${google_compute_instance_group_manager.foobar.self_link}"
+
   autoscaling_policy = {
     max_replicas    = 5
     min_replicas    = 1
     cooldown_period = 60
-        cpu_utilization = {
+
+    cpu_utilization {
       target = 0.5
     }
   }
@@ -75,16 +79,23 @@ resource "google_compute_autoscaler" "foobar" {
 
 The following arguments are supported:
 
-* `description` - (Optional) An optional textual description of the instance
+* `name` - (Required) The name of the autoscaler.
-group manager.
 
 * `target` - (Required) The full URL to the instance group manager whose size we
   control.
 
+* `zone` - (Required) The zone of the target.
+
 * `autoscaling_policy.` - (Required) The parameters of the autoscaling
   algorithm. Structure is documented below.
 
-* `zone` - (Required) The zone of the target.
+- - -
+
+* `description` - (Optional) An optional textual description of the instance
+    group manager.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 The `autoscaling_policy` block contains:
 
@@ -130,6 +141,7 @@ The `load_balancing_utilization` block contains:
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
 * `self_link` - The URL of the created resource.

website/source/docs/providers/google/r/compute_backend_service.html.markdown

@@ -12,14 +12,13 @@ A Backend Service defines a group of virtual machines that will serve traffic fo
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_backend_service" "foobar" {
   name        = "blablah"
   description = "Hello World 1234"
   port_name   = "http"
   protocol    = "HTTP"
   timeout_sec = 10
-    region = "us-central1"
 
   backend {
     group = "${google_compute_instance_group_manager.foo.instance_group}"
@@ -64,31 +63,64 @@ resource "google_compute_http_health_check" "default" {
 The following arguments are supported:
 
 * `name` - (Required) The name of the backend service.
+
 * `health_checks` - (Required) Specifies a list of HTTP health check objects
     for checking the health of the backend service.
+
+- - -
+
+* `backend` - (Optional) The list of backends that serve this BackendService.
+    See *Backend* below.
+
 * `description` - (Optional) The textual description for the backend service.
-* `backend` - (Optional) The list of backends that serve this BackendService. See *Backend* below.
+
-* `region` - (Optional) The region the service sits in. If not specified, the project region is used.
+* `port_name` - (Optional) The name of a service that has been added to an
-* `port_name` - (Optional) The name of a service that has been added to
+    instance group in this backend. See [related docs](https://cloud.google.com/compute/docs/instance-groups/#specifying_service_endpoints) for details. Defaults to http.
-	an instance group in this backend. See [related docs](https://cloud.google.com/compute/docs/instance-groups/#specifying_service_endpoints)
+
-    for details. Defaults to http.
+* `project` - (Optional) The project in which the resource belongs. If it
-* `protocol` - (Optional) The protocol for incoming requests. Defaults to `HTTP`.
+    is not provided, the provider project is used.
+
+* `protocol` - (Optional) The protocol for incoming requests. Defaults to
+    `HTTP`.
+
+* `region` - (Optional) The Region in which the created address should reside.
+    If it is not provided, the provider region is used.
+
 * `timeout_sec` - (Optional) The number of secs to wait for a backend to respond
     to a request before considering the request failed. Defaults to `30`.
 
+
 **Backend** supports the following attributes:
 
-* `group` - (Required) The name or URI of a Compute Engine instance group (`google_compute_instance_group_manager.xyz.instance_group`) that can receive traffic.
+* `group` - (Required) The name or URI of a Compute Engine instance group
-* `balancing_mode` - (Optional) Defines the strategy for balancing load. Defaults to `UTILIZATION`
+    (`google_compute_instance_group_manager.xyz.instance_group`) that can
-* `capacity_scaler` - (Optional) A float in the range [0, 1.0] that scales the maximum parameters for the group (e.g., max rate). A value of 0.0 will cause no requests to be sent to the group (i.e., it adds the group in a drained state). The default is 1.0.
+    receive traffic.
+
+* `balancing_mode` - (Optional) Defines the strategy for balancing load.
+    Defaults to `UTILIZATION`
+
+* `capacity_scaler` - (Optional) A float in the range [0, 1.0] that scales the
+    maximum parameters for the group (e.g., max rate). A value of 0.0 will cause
+    no requests to be sent to the group (i.e., it adds the group in a drained
+    state). The default is 1.0.
+
 * `description` - (Optional) Textual description for the backend.
-* `max_rate` - (Optional) Maximum requests per second (RPS) that the group can handle.
+
-* `max_rate_per_instance` - (Optional) The maximum per-instance requests per second (RPS).
+* `max_rate` - (Optional) Maximum requests per second (RPS) that the group can
-* `max_utilization` - (Optional) The target CPU utilization for the group as a float in the range [0.0, 1.0]. This flag can only be provided when the balancing mode is `UTILIZATION`. Defaults to `0.8`.
+    handle.
+
+* `max_rate_per_instance` - (Optional) The maximum per-instance requests per
+    second (RPS).
+
+* `max_utilization` - (Optional) The target CPU utilization for the group as a
+    float in the range [0.0, 1.0]. This flag can only be provided when the
+    balancing mode is `UTILIZATION`. Defaults to `0.8`.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `fingerprint` - The fingerprint of the backend service.
 
-* `name` - The name of the resource.
 * `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_disk.html.markdown

@@ -12,7 +12,7 @@ Creates a new persistent disk within GCE, based on another disk.
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_disk" "default" {
   name  = "test-disk"
   type  = "pd-ssd"
@@ -30,22 +30,25 @@ The following arguments are supported:
 
 * `zone` - (Required) The zone where this disk will be available.
 
-* `image` - (Optional) The image from which to initialize this disk.  Either the full URL, a
+- - -
-  contraction of the form "project/name", or just a name (in which case the current project is
-used).
 
-* `snapshot` - (Optional) Name of snapshot from which to initialize this disk;
+* `image` - (Optional) The image from which to initialize this disk. Either the
+    full URL, a contraction of the form "project/name", or just a name (in which
+    case the current project is used).
 
-* `size` - (Optional) The size of the image in gigabytes. If not specified,
+* `project` - (Optional) The project in which the resource belongs. If it
-    it will inherit the size of its base image.
+    is not provided, the provider project is used.
+
+* `size` - (Optional) The size of the image in gigabytes. If not specified, it
+    will inherit the size of its base image.
+
+* `snapshot` - (Optional) Name of snapshot from which to initialize this disk.
 
 * `type` - (Optional) The GCE disk type.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `name` - The name of the resource.
+* `self_link` - The URI of the created resource.
-* `zone` - The zone where the resource is located.
-* `image` - The name of the image the disk is based off of.
-* `size` - The size of the disk in gigabytes.

website/source/docs/providers/google/r/compute_firewall.html.markdown

@@ -12,7 +12,7 @@ Manages a firewall resource within GCE.
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_firewall" "default" {
   name    = "test"
   network = "${google_compute_network.other.name}"
@@ -37,19 +37,24 @@ The following arguments are supported:
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
 
-* `description` - (Optional) Textual description field.
-
 * `network` - (Required) The name of the network to attach this firewall to.
 
 * `allow` - (Required) Can be specified multiple times for each allow
     rule. Each allow block supports fields documented below.
 
+- - -
+
+* `description` - (Optional) Textual description field.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 * `source_ranges` - (Optional) A list of source CIDR ranges that this
    firewall applies to.
 
-* `source_tags` - (Optional) A list of source tags that this firewall applies to.
+* `source_tags` - (Optional) A list of source tags for this firewall.
 
-* `target_tags` - (Optional) A list of target tags that this firewall applies to.
+* `target_tags` - (Optional) A list of target tags for this firewall.
 
 The `allow` block supports:
 
@@ -60,9 +65,7 @@ The `allow` block supports:
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `name` - The name of the resource.
+* `self_link` - The URI of the created resource.
-* `network` - The network that this resource is attached to.
-* `source_ranges` - The CIDR block ranges this firewall applies to.
-* `source_tags` - The tags that this firewall applies to.

website/source/docs/providers/google/r/compute_forwarding_rule.html.markdown

@@ -15,7 +15,7 @@ documentation](https://cloud.google.com/compute/docs/load-balancing/network/forw
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_forwarding_rule" "default" {
   name       = "test"
   target     = "${google_compute_target_pool.default.self_link}"
@@ -27,27 +27,33 @@ resource "google_compute_forwarding_rule" "default" {
 
 The following arguments are supported:
 
-* `description` - (Optional) Textual description field.
-
-* `ip_address` - (Optional) The static IP. (if not set, an ephemeral IP is
-used).
-
-* `ip_protocol` - (Optional) The IP protocol to route, one of "TCP" "UDP" "AH" "ESP" or "SCTP". (default "TCP").
-
 * `name` - (Required) A unique name for the resource, required by GCE. Changing
     this forces a new resource to be created.
 
-* `port_range` - (Optional) A range e.g. "1024-2048" or a single port "1024"
+* `target` - (Required) URL of target pool.
-(defaults to all ports!).
 
-* `target` - URL of target pool.
+- - -
+
+* `description` - (Optional) Textual description field.
+
+* `ip_address` - (Optional) The static IP. (if not set, an ephemeral IP is
+    used).
+
+* `ip_protocol` - (Optional) The IP protocol to route, one of "TCP" "UDP" "AH"
+    "ESP" or "SCTP". (default "TCP").
+
+* `port_range` - (Optional) A range e.g. "1024-2048" or a single port "1024"
+    (defaults to all ports!).
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
+* `region` - (Optional) The Region in which the created address should reside.
+    If it is not provided, the provider region is used.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
-
+exported:
-* `self_link` - The URL of the created resource.
-
-* `ip_address` - The IP address that was chosen (or specified).
-
 
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_global_address.html.markdown

@@ -15,7 +15,7 @@ Creates a static IP address resource global to a Google Compute Engine project.
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_global_address" "default" {
   name = "test-address"
 }
@@ -28,10 +28,16 @@ The following arguments are supported:
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
 
+- - -
+
+* `project` - (Optional) The project in which the resource belongs. If it
+is not provided, the provider project is used.
+
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `address` - The assigned address.
 
-* `name` - The name of the resource.
-* `address` - The IP address that was allocated.
 * `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_global_forwarding_rule.html.markdown

@@ -1,7 +1,7 @@
 ---
 layout: "google"
 page_title: "Google: google_compute_global_forwarding_rule"
-sidebar_current: "docs-google-compute-global-forwarding_rule"
+sidebar_current: "docs-google-compute-global-forwarding-rule"
 description: |-
   Manages a Target Pool within GCE.
 ---
@@ -15,7 +15,7 @@ documentation](https://cloud.google.com/compute/docs/load-balancing/network/forw
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_global_forwarding_rule" "default" {
   name       = "test"
   target     = "${google_compute_target_http_proxy.default.self_link}"
@@ -39,8 +39,8 @@ resource "google_compute_url_map" "default" {
   }
 
   path_matcher {
-        default_service = "${google_compute_backend_service.default.self_link}"
     name            = "allpaths"
+    default_service = "${google_compute_backend_service.default.self_link}"
     path_rule {
       paths   = ["/*"]
       service = "${google_compute_backend_service.default.self_link}"
@@ -53,7 +53,6 @@ resource "google_compute_backend_service" "default" {
   port_name   = "http"
   protocol    = "HTTP"
   timeout_sec = 10
-    region = "us-central1"
 
   health_checks = ["${google_compute_http_health_check.default.self_link}"]
 }
@@ -70,24 +69,30 @@ resource "google_compute_http_health_check" "default" {
 
 The following arguments are supported:
 
-* `description` - (Optional) Textual description field.
-
-* `ip_address` - (Optional) The static IP. (if not set, an ephemeral IP is used).
-
-* `ip_protocol` - (Optional) The IP protocol to route, one of "TCP" "UDP" "AH" "ESP" or "SCTP". (default "TCP").
-
 * `name` - (Required) A unique name for the resource, required by GCE. Changing
   this forces a new resource to be created.
 
+* `target` - (Required) URL of target HTTP or HTTPS proxy.
+
+- - -
+
+* `description` - (Optional) Textual description field.
+
+* `ip_address` - (Optional) The static IP. (if not set, an ephemeral IP is
+    used).
+
+* `ip_protocol` - (Optional) The IP protocol to route, one of "TCP" "UDP" "AH"
+    "ESP" or "SCTP". (default "TCP").
+
 * `port_range` - (Optional) A range e.g. "1024-2048" or a single port "1024"
     (defaults to all ports!).
 
-* `target` - URL of target HTTP or HTTPS proxy.
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `self_link` - The URL of the created resource.
+* `self_link` - The URI of the created resource.
-
-* `ip_address` - The IP address that was chosen (or specified).

website/source/docs/providers/google/r/compute_http_health_check.html.markdown

@@ -17,12 +17,13 @@ and
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_http_health_check" "default" {
   name         = "test"
   request_path = "/health_check"
-    check_interval_sec = 1
+
   timeout_sec        = 1
+  check_interval_sec = 1
 }
 ```
 
@@ -30,7 +31,13 @@ resource "google_compute_http_health_check" "default" {
 
 The following arguments are supported:
 
-* `check_interval_sec` - (Optional) How often to poll each instance (default 5).
+* `name` - (Required) A unique name for the resource, required by GCE.
+    Changing this forces a new resource to be created.
+
+- - -
+
+* `check_interval_sec` - (Optional) The number of seconds between each poll of
+    the instance instance (default 5).
 
 * `description` - (Optional) Textual description field.
 
@@ -38,20 +45,22 @@ The following arguments are supported:
 
 * `host` - (Optional) HTTP host header field (default instance's public ip).
 
-* `name` - (Required) A unique name for the resource, required by GCE.
-    Changing this forces a new resource to be created.
-
 * `port` - (Optional) TCP port to connect to (default 80).
 
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 * `request_path` - (Optional) URL path to query (default /).
 
-* `timeout_sec` - (Optional) How long before declaring failure (default 5).
+* `timeout_sec` - (Optional) The number of seconds to wait before declaring
+    failure (default 5).
 
 * `unhealthy_threshold` - (Optional) Consecutive failures required (default 2).
 
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `self_link` - The URL of the created resource.
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_https_health_check.html.markdown

@@ -17,12 +17,13 @@ and
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_https_health_check" "default" {
   name         = "test"
   request_path = "/health_check"
-    check_interval_sec = 1
+
   timeout_sec        = 1
+  check_interval_sec = 1
 }
 ```
 
@@ -30,6 +31,11 @@ resource "google_compute_https_health_check" "default" {
 
 The following arguments are supported:
 
+* `name` - (Required) A unique name for the resource, required by GCE. Changing
+    this forces a new resource to be created.
+
+- - -
+
 * `check_interval_sec` - (Optional) How often to poll each instance (default 5).
 
 * `description` - (Optional) Textual description field.
@@ -38,11 +44,11 @@ The following arguments are supported:
 
 * `host` - (Optional) HTTPS host header field (default instance's public ip).
 
-* `name` - (Required) A unique name for the resource, required by GCE.
-    Changing this forces a new resource to be created.
-
 * `port` - (Optional) TCP port to connect to (default 443).
 
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 * `request_path` - (Optional) URL path to query (default /).
 
 * `timeout_sec` - (Optional) How long before declaring failure (default 5).

website/source/docs/providers/google/r/compute_instance.html.markdown

@@ -16,11 +16,12 @@ and
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_instance" "default" {
   name         = "test"
   machine_type = "n1-standard-1"
   zone         = "us-central1-a"
+
   tags = ["foo", "bar"]
 
   disk {
@@ -56,39 +57,48 @@ resource "google_compute_instance" "default" {
 
 The following arguments are supported:
 
+* `disk` - (Required) Disks to attach to the instance. This can be specified
+    multiple times for multiple disks. Structure is documented below.
+
+* `machine_type` - (Required) The machine type to create.To create a custom
+    machine type, value should be set as specified
+    [here](https://cloud.google.com/compute/docs/reference/latest/instances#machineType)
+
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
 
-* `description` - (Optional) A brief description of this resource.
-
-* `machine_type` - (Required) The machine type to create.To create a custom machine type, value should be
-    set as specified [here](https://cloud.google.com/compute/docs/reference/latest/instances#machineType)
-
 * `zone` - (Required) The zone that the machine should be created in.
 
-* `disk` - (Required) Disks to attach to the instance. This can be specified
+- - -
-    multiple times for multiple disks. Structure is documented below.
 
 * `can_ip_forward` - (Optional) Whether to allow sending and receiving of
     packets with non-matching source or destination IPs.
     This defaults to false.
 
+* `description` - (Optional) A brief description of this resource.
+
 * `metadata` - (Optional) Metadata key/value pairs to make available from
     within the instance.
 
 * `metadata_startup_script` - (Optional) An alternative to using the
     startup-script metadata key, except this one forces the instance to be
     recreated (thus re-running the script) if it is changed. This replaces the
-  startup-script metadata key on the created instance and thus the two mechanisms
+    startup-script metadata key on the created instance and thus the two
-  are not allowed to be used simultaneously.
+    mechanisms are not allowed to be used simultaneously.
 
-* `network_interface` - (Required) Networks to attach to the instance. This can be
+* `network_interface` - (Required) Networks to attach to the instance. This can
-    specified multiple times for multiple networks, but GCE is currently limited
+    be specified multiple times for multiple networks, but GCE is currently
-    to just 1. Structure is documented below.
+    limited to just 1. Structure is documented below.
 
-* `network` - (DEPRECATED, Required) Networks to attach to the instance. This can be
+* `network` - (DEPRECATED, Required) Networks to attach to the instance. This
-    specified multiple times for multiple networks. Structure is documented
+    can be specified multiple times for multiple networks. Structure is
-    below.
+    documented below.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
+* `scheduling` - (Optional) The scheduling strategy to use. More details about
+    this configuration option are detailed below.
 
 * `service_account` - (Optional) Service account to attach to the instance.
 
@@ -101,8 +111,8 @@ the type is "local-ssd", in which case scratch must be true).
     `google_compute_disk`) to attach.
 
 * `image` - The image from which to initialize this
-    disk.  Either the full URL, a contraction of the form "project/name", or just
+    disk. Either the full URL, a contraction of the form "project/name", or
-    a name (in which case the current project is used).
+    just a name (in which case the current project is used).
 
 * `auto_delete` - (Optional) Whether or not the disk should be auto-deleted.
     This defaults to true. Leave true for local SSDs.
@@ -121,23 +131,25 @@ the type is "local-ssd", in which case scratch must be true).
 
 The `network_interface` block supports:
 
-* `network` - (Optional) The name of the network to attach this interface to. Either
+* `network` - (Optional) The name of the network to attach this interface to.
-    `network` or `subnetwork` must be provided.
+    Either `network` or `subnetwork` must be provided.
 
-*  `subnetwork` - (Optional) the name of the subnetwork to attach this interface to. The subnetwork
+*  `subnetwork` - (Optional) the name of the subnetwork to attach this interface
-     must exist in the same region this instance will be created in. Either `network`
+    to. The subnetwork must exist in the same region this instance will be
-     or `subnetwork` must be provided.
+    created in. Either `network` or `subnetwork` must be provided.
 
-* `access_config` - (Optional) Access configurations, i.e. IPs via which this instance can be
+* `access_config` - (Optional) Access configurations, i.e. IPs via which this
-  accessed via the Internet.  Omit to ensure that the instance is not accessible from the Internet
+    instance can be accessed via the Internet. Omit to ensure that the instance
-(this means that ssh provisioners will not work unless you are running Terraform can send traffic to
+    is not accessible from the Internet (this means that ssh provisioners will
-the instance's network (e.g. via tunnel or because it is running on another cloud instance on that
+    not work unless you are running Terraform can send traffic tothe instance's
-network).  This block can be repeated multiple times.  Structure documented below.
+    network (e.g. via tunnel or because it is running on another cloud instance
+    on that network). This block can be repeated multiple times. Structure
+    documented below.
 
 The `access_config` block supports:
 
-* `nat_ip` - (Optional) The IP address that will be 1:1 mapped to the instance's network ip.  If not
+* `nat_ip` - (Optional) The IP address that will be 1:1 mapped to the instance's
-  given, one will be generated.
+    network ip. If not given, one will be generated.
 
 * `assigned_nat_ip` - (Optional) The IP address that is assigned to the
     instance. If `nat_ip` is filled, it will appear here. If `nat_ip` is left
@@ -159,8 +171,8 @@ The `scheduling` block supports:
 
 * `preemptible` - (Optional) Is the instance preemptible.
 
-* `on_host_maintenance` - (Optional) Describes maintenance behavior for
+* `on_host_maintenance` - (Optional) Describes maintenance behavior for the
-    the instance. Can be MIGRATE or TERMINATE, for more info, read
+    instance. Can be MIGRATE or TERMINATE, for more info, read
     [here](https://cloud.google.com/compute/docs/instances/setting-instance-scheduling-options)
 
 * `automatic_restart` - (Optional) Specifies if the instance should be
@@ -168,8 +180,11 @@ The `scheduling` block supports:
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `name` - The name of the resource.
+* `metadata_fingerprint` - The unique fingerprint of the metadata.
-* `machine_type` - The type of machine.
+
-* `zone` - The zone the machine lives in.
+* `self_link` - The URI of the created resource.
+
+* `tags_fingerprint` - The unique fingerprint of the tags.

website/source/docs/providers/google/r/compute_instance_group.html.markdown

@@ -16,7 +16,7 @@ and [API](https://cloud.google.com/compute/docs/reference/latest/instanceGroups)
 ## Example Usage
 
 ### Empty instance group
-```
+```js
 resource "google_compute_instance_group" "test" {
   name        = "terraform-test"
   description = "Terraform test instance group"
@@ -25,22 +25,26 @@ resource "google_compute_instance_group" "test" {
 ```
 
 ### With instances and named ports
-```
+```js
 resource "google_compute_instance_group" "webservers" {
   name        = "terraform-webservers"
   description = "Terraform test instance group"
+
   instances = [
     "${google_compute_instance.test.self_link}",
     "${google_compute_instance.test2.self_link}"
   ]
+
   named_port {
     name = "http"
     port = "8080"
   }
+
   named_port {
     name = "https"
     port = "8443"
   }
+
   zone = "us-central1-a"
 }
 ```
@@ -50,32 +54,40 @@ resource "google_compute_instance_group" "webservers" {
 The following arguments are supported:
 
 * `name` - (Required) The name of the instance group. Must be 1-63
-characters long and comply with [RFC1035](https://www.ietf.org/rfc/rfc1035.txt).
+    characters long and comply with
-Supported characters include lowercase letters, numbers, and hyphens.
+    [RFC1035](https://www.ietf.org/rfc/rfc1035.txt). Supported characters
+    include lowercase letters, numbers, and hyphens.
+
+* `zone` - (Required) The zone that this instance group should be created in.
+
+- - -
 
 * `description` - (Optional) An optional textual description of the instance
     group.
 
-* `instances` - (Optional) List of instances in the group. They should be given as
+* `instances` - (Optional) List of instances in the group. They should be given
-  self_link URLs. When adding instances they must all be in the same network and
+    as self_link URLs. When adding instances they must all be in the same
-  zone as the instance group.
+    network and zone as the instance group.
 
-* `named_port` - (Optional) Named ports are key:value pairs that represent a
+* `named_port` - (Optional) The named port configuration. See the section below
-  service name and the port number that the service runs on. The key:value pairs
+    for details on configuration.
-  are simple metadata that the Load Balancing service can use. This can specified
-  multiple times
 
-* `zone` - (Required) The zone that this instance group should be created in.
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 The `named_port` block supports:
 
-* `name` - The name which the port will be mapped to.
+* `name` - (Required) The name which the port will be mapped to.
-* `port` - The port number to map the name to.
+
+* `port` - (Required) The port number to map the name to.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
 * `network` - The network the instance group is in.
+
+* `self_link` - The URI of the created resource.
+
 * `size` - The number of instances in the group.
-* `self_link` - The URL of the created resource.

website/source/docs/providers/google/r/compute_instance_group_manager.html.markdown

@@ -15,22 +15,23 @@ and [API](https://cloud.google.com/compute/docs/instance-groups/manager/v1beta2/
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_instance_group_manager" "foobar" {
-	description = "Terraform test instance group manager"
   name        = "terraform-test"
-	instance_template = "${google_compute_instance_template.foobar.self_link}"
+  description = "Terraform test instance group manager"
-	update_strategy= "NONE"
+
-	target_pools = ["${google_compute_target_pool.foobar.self_link}"]
   base_instance_name = "foobar"
+  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  update_strategy    = "NONE"
   zone               = "us-central1-a"
+
+  target_pools = ["${google_compute_target_pool.foobar.self_link}"]
   target_size  = 2
 
   named_port {
     name = "customHTTP"
     port = 8888
   }
-
 }
 ```
 
@@ -39,35 +40,47 @@ resource "google_compute_instance_group_manager" "foobar" {
 The following arguments are supported:
 
 * `base_instance_name` - (Required) The base instance name to use for
-instances in this group. The value must be a valid [RFC1035](https://www.ietf.org/rfc/rfc1035.txt) name.
+    instances in this group. The value must be a valid
-Supported characters are lowercase letters, numbers, and hyphens (-). Instances
+    [RFC1035](https://www.ietf.org/rfc/rfc1035.txt) name. Supported characters
-are named by appending a hyphen and a random four-character string to the base
+    are lowercase letters, numbers, and hyphens (-). Instances are named by
-instance name.
+    appending a hyphen and a random four-character string to the base instance
-
+    name.
-* `description` - (Optional) An optional textual description of the instance
-group manager.
 
 * `instance_template` - (Required) The full URL to an instance template from
-which all new instances will be created.
+    which all new instances will be created.
-
-* `update_strategy` - (Optional, Default `"RESTART"`) If the `instance_template` resource is
-modified, a value of `"NONE"` will prevent any of the managed instances from
-being restarted by Terraform. A value of `"RESTART"` will restart all of the
-instances at once. In the future, as the GCE API matures we will support
-`"ROLLING_UPDATE"` as well.
 
 * `name` - (Required) The name of the instance group manager. Must be 1-63
-characters long and comply with [RFC1035](https://www.ietf.org/rfc/rfc1035.txt).
+    characters long and comply with
-Supported characters include lowercase letters, numbers, and hyphens.
+    [RFC1035](https://www.ietf.org/rfc/rfc1035.txt). Supported characters
+    include lowercase letters, numbers, and hyphens.
 
-* `target_size` - (Optional) If not given at creation time, this defaults to 1.  Do not specify this
+* `zone` - (Required) The zone that instances in this group should be created
-  if you are managing the group with an autoscaler, as this will cause fighting.
+    in.
+
+- - -
+
+* `description` - (Optional) An optional textual description of the instance
+    group manager.
+
+* `named_port` - (Optional) The named port configuration. See the section below
+    for details on configuration.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
+* `update_strategy` - (Optional, Default `"RESTART"`) If the `instance_template`
+    resource is modified, a value of `"NONE"` will prevent any of the managed
+    instances from being restarted by Terraform. A value of `"RESTART"` will
+    restart all of the instances at once. In the future, as the GCE API matures
+    we will support `"ROLLING_UPDATE"` as well.
+
+* `target_size` - (Optional) If not given at creation time, this defaults to 1.
+    Do not specify this if you are managing the group with an autoscaler, as
+    this will cause fighting.
 
 * `target_pools` - (Optional) The full URL of all target pools to which new
-instances in the group are added. Updating the target pools attribute does not
+    instances in the group are added. Updating the target pools attribute does
-affect existing instances.
+    not affect existing instances.
-
-* `zone` - (Required) The zone that instances in this group should be created in.
 
 The `named_port` block supports: (Include a `named_port` block for each named-port required).
 
@@ -77,7 +90,10 @@ The `named_port` block supports: (Include a `named_port` block for each named-po
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `fingerprint` - The fingerprint of the instance group manager.
 
 * `instance_group` - The full URL of the instance group created by the manager.
 

website/source/docs/providers/google/r/compute_instance_template.html.markdown

@@ -17,25 +17,27 @@ and
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_instance_template" "foobar" {
   name        = "terraform-test"
   description = "template description"
+
+  tags = ["foo", "bar"]
+
   instance_description = "description assigned to instances"
   machine_type         = "n1-standard-1"
   can_ip_forward       = false
   automatic_restart    = true
   on_host_maintenance  = "MIGRATE"
-	tags = ["foo", "bar"]
 
-	# Create a new boot disk from an image
+  // Create a new boot disk from an image
   disk {
     source_image = "debian-7-wheezy-v20160301"
     auto_delete = true
     boot = true
   }
 
-	# Use an existing disk resource
+  // Use an existing disk resource
   disk {
     source      = "foo_existing_disk"
     auto_delete = false
@@ -62,51 +64,48 @@ Note that changing any field for this resource forces a new resource to be creat
 
 The following arguments are supported:
 
+* `disk` - (Required) Disks to attach to instances created from this template.
+    This can be specified multiple times for multiple disks. Structure is
+    documented below.
+
+* `machine_type` - (Required) The machine type to create.
+
 * `name` - (Required) A unique name for the resource, required by GCE.
 
-* `description` - (Optional) A brief description of this resource.
+- - -
 
 * `can_ip_forward` - (Optional) Whether to allow sending and receiving of
-	packets with non-matching source or destination IPs.
+    packets with non-matching source or destination IPs. This defaults to false.
-	This defaults to false.
+
+* `description` - (Optional) A brief description of this resource.
 
 * `instance_description` - (Optional) A brief description to use for instances
     created from this template.
 
-* `machine_type` - (Required) The machine type to create.
-
-* `disk` - (Required) Disks to attach to instances created from this
-	template. This can be specified multiple times for multiple disks.
-	Structure is documented below.
-
 * `metadata` - (Optional) Metadata key/value pairs to make available from
     within instances created from this template.
 
-* `network_interface` - (Required) Networks to attach to instances created from this template.
+* `network_interface` - (Required) Networks to attach to instances created from
- 	This can be specified multiple times for multiple networks. Structure is
+    this template. This can be specified multiple times for multiple networks.
-	documented below.
+    Structure is documented below.
 
-* `region` - (Optional) An instance template is a global resource that is not bound to a zone
+* `project` - (Optional) The project in which the resource belongs. If it
-    or a region. However, you can still specify some regional resources in an instance template,
+    is not provided, the provider project is used.
-    which restricts the template to the region where that resource resides. For example, a
-    custom `subnetwork` resource is tied to a specific region.
-    Defaults to the region of the Provider if no value is given.
 
-* `automatic_restart` - (Optional, Deprecated - see `scheduling`)
+* `region` - (Optional) An instance template is a global resource that is not
-	Specifies whether the instance should be
+    bound to a zone or a region. However, you can still specify some regional
-	automatically restarted if it is terminated by Compute Engine (not
+    resources in an instance template, which restricts the template to the
-	terminated by a user).
+    region where that resource resides. For example, a custom `subnetwork`
-	This defaults to true.
+    resource is tied to a specific region. Defaults to the region of the
+    Provider if no value is given.
 
-* `on_host_maintenance` - (Optional, Deprecated - see `scheduling`)
+* `scheduling` - (Optional) The scheduling strategy to use. More details about
-	Defines the maintenance behavior for this instance.
+    this configuration option are detailed below.
 
 * `service_account` - (Optional) Service account to attach to the instance.
 
 * `tags` - (Optional) Tags to attach to the instance.
 
-
-
 The `disk` block supports:
 
 * `auto_delete` - (Optional) Whether or not the disk should be auto-deleted.
@@ -114,10 +113,9 @@ The `disk` block supports:
 
 * `boot` - (Optional) Indicates that this is a boot disk.
 
-* `device_name` - (Optional) A unique device name that is reflected into
+* `device_name` - (Optional) A unique device name that is reflected into the
-	the /dev/  tree of a Linux operating system running within the instance.
+    /dev/  tree of a Linux operating system running within the instance. If not
-	If not specified, the server chooses a default device name to apply to
+    specified, the server chooses a default device name to apply to this disk.
-	this disk.
 
 * `disk_name` - (Optional) Name of the disk. When not provided, this defaults
     to the name of the instance.
@@ -138,32 +136,33 @@ The `disk` block supports:
 * `disk_type` - (Optional) The GCE disk type. Can be either `"pd-ssd"`,
     `"local-ssd"`, or `"pd-standard"`.
 
-* `disk_size_gb` - (Optional) The size of the image in gigabytes. If not specified,
+* `disk_size_gb` - (Optional) The size of the image in gigabytes. If not
-	it will inherit the size of its base image.
+    specified, it will inherit the size of its base image.
 
 * `type` - (Optional) The type of GCE disk, can be either `"SCRATCH"` or
     `"PERSISTENT"`.
 
 The `network_interface` block supports:
 
-* `network` - (Optional) The name of the network to attach this interface to. Use `network`
+* `network` - (Optional) The name of the network to attach this interface to.
-   attribute for Legacy or Auto subnetted networks and `subnetwork` for custom subnetted
+    Use `network` attribute for Legacy or Auto subnetted networks and
-   networks.
+    `subnetwork` for custom subnetted networks.
 
-* `subnetwork` - (Optional) the name of the subnetwork to attach this interface to. The subnetwork
+* `subnetwork` - (Optional) the name of the subnetwork to attach this interface
-   must exist in the same `region` this instance will be created in. Either `network`
+    to. The subnetwork must exist in the same `region` this instance will be
-   or `subnetwork` must be provided.
+    created in. Either `network` or `subnetwork` must be provided.
 
-* `access_config` - (Optional) Access configurations, i.e. IPs via which this instance can be
+* `access_config` - (Optional) Access configurations, i.e. IPs via which this
-  accessed via the Internet.  Omit to ensure that the instance is not accessible from the Internet
+    instance can be accessed via the Internet. Omit to ensure that the instance
-(this means that ssh provisioners will not work unless you are running Terraform can send traffic to
+    is not accessible from the Internet (this means that ssh provisioners will
-the instance's network (e.g. via tunnel or because it is running on another cloud instance on that
+    not work unless you are running Terraform can send traffic to the instance's
-network).  This block can be repeated multiple times.  Structure documented below.
+    network (e.g. via tunnel or because it is running on another cloud instance
+    on that network). This block can be repeated multiple times. Structure documented below.
 
 The `access_config` block supports:
 
-* `nat_ip` - (Optional) The IP address that will be 1:1 mapped to the instance's network ip.  If not
+* `nat_ip` - (Optional) The IP address that will be 1:1 mapped to the instance's
-  given, one will be generated.
+    network ip. If not given, one will be generated.
 
 The `service_account` block supports:
 
@@ -174,16 +173,21 @@ The `scheduling` block supports:
 
 * `automatic_restart` - (Optional) Specifies whether the instance should be
     automatically restarted if it is terminated by Compute Engine (not
-	terminated by a user).
+    terminated by a user). This defaults to true.
-	This defaults to true.
 
-* `on_host_maintenance` - (Optional) Defines the maintenance behavior for this instance.
+* `on_host_maintenance` - (Optional) Defines the maintenance behavior for this
+    instance.
 
-* `preemptible` - (Optional) Allows instance to be preempted. Read
+* `preemptible` - (Optional) Allows instance to be preempted. Read more on this
-	more on this [here](https://cloud.google.com/compute/docs/instances/preemptible).
+    [here](https://cloud.google.com/compute/docs/instances/preemptible).
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `self_link` - The URL of the created resource.
+* `metadata_fingerprint` - The unique fingerprint of the metadata.
+
+* `self_link` - The URI of the created resource.
+
+* `tags_fingerprint` - The unique fingerprint of the tags.

website/source/docs/providers/google/r/compute_network.html.markdown

@@ -12,7 +12,7 @@ Manages a network within GCE.
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_network" "default" {
   name       = "test"
   ipv4_range = "10.0.0.0/16"
@@ -26,23 +26,31 @@ The following arguments are supported:
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
 
-* `ipv4_range` - (Optional) The IPv4 address range that machines in this
+- - -
-     network are assigned to, represented as a CIDR block. If not
-     set, an auto or custom subnetted network will be created, depending
-     on the value of `auto_create_subnetworks` attribute. This attribute
-     may not be used if `auto_create_subnets` is specified.
 
-* `auto_create_subnetworks` - (Optional) If set to true, this network
+* `auto_create_subnetworks` - (Optional) If set to true, this network will be
-     will be created in auto subnet mode, and Google will create a
+    created in auto subnet mode, and Google will create a subnet for each region
-     subnet for each region automatically.
+    automatically. If set to false, and `ipv4_range` is not set, a custom
-     If set to false, and `ipv4_range` is not set, a custom subnetted
+    subnetted network will be created that can support
-     network will be created that can support `google_compute_subnetwork`
+    `google_compute_subnetwork` resources. This attribute may not be used if
-     resources. This attribute may not be used if `ipv4_range` is specified.
+    `ipv4_range` is specified.
+
+* `description` - (Optional) A brief description of this resource.
+
+* `ipv4_range` - (Optional) The IPv4 address range that machines in this network
+    are assigned to, represented as a CIDR block. If not set, an auto or custom
+    subnetted network will be created, depending on the value of  
+    `auto_create_subnetworks` attribute. This attribute may not be used if
+    `auto_create_subnets` is specified. This attribute is deprecated.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `name` - The name of the resource.
-* `ipv4_range` - The CIDR block of this network.
 * `gateway_ipv4` - The IPv4 address of the gateway.
+
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_project_metadata.html.markdown

@@ -12,7 +12,7 @@ Manages metadata common to all instances for a project in GCE.
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_project_metadata" "default" {
   metadata {
     foo  = "bar"
@@ -26,11 +26,14 @@ resource "google_compute_project_metadata" "default" {
 
 The following arguments are supported:
 
-* `metadata` - (Required) A series of key value pairs. Changing this resource updates
+* `metadata` - (Required) A series of key value pairs. Changing this resource
-    the GCE state.
+    updates the GCE state.
+
+- - -
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 ## Attributes Reference
 
-The following attributes are exported:
+Only the arguments listed above are exposed as attributes.
-
-* `metadata` - Common instance metadata.

website/source/docs/providers/google/r/compute_route.html.markdown

@@ -12,7 +12,7 @@ Manages a network route within GCE.
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_network" "foobar" {
   name       = "test"
   ipv4_range = "10.0.0.0/16"
@@ -31,44 +31,43 @@ resource "google_compute_route" "foobar" {
 
 The following arguments are supported:
 
-* `name` - (Required) A unique name for the resource, required by GCE.
-    Changing this forces a new resource to be created.
-
 * `dest_range` - (Required) The destination IPv4 address range that this
     route applies to.
 
+* `name` - (Required) A unique name for the resource, required by GCE.
+    Changing this forces a new resource to be created.
+
 * `network` - (Required) The name of the network to attach this route to.
 
-* `next_hop_ip` - (Optional) The IP address of the next hop if this route
+* `priority` - (Required) The priority of this route, used to break ties.
-    is matched.
 
-* `next_hop_instance` - (Optional) The name of the VM instance to route to
+- - -
-    if this route is matched.
-
-* `next_hop_instance_zone` - (Required when `next_hop_instance` is specified) The zone of the instance specified
-    in `next_hop_instance`.
 
 * `next_hop_gateway` - (Optional) The name of the internet gateway to route
     to if this route is matched.
 
-* `next_hop_vpn_gateway` - (Optional) The name of the VPN to route to if this
+* `next_hop_instance` - (Optional) The name of the VM instance to route to
+    if this route is matched.
+
+* `next_hop_instance_zone` - (Required when `next_hop_instance` is specified)
+    The zone of the instance specified in `next_hop_instance`.
+
+* `next_hop_ip` - (Optional) The IP address of the next hop if this route
+    is matched.
+
+* `next_hop_vpn_tunnel` - (Optional) The name of the VPN to route to if this
     route is matched.
 
-* `priority` - (Required) The priority of this route, used to break ties.
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 * `tags` - (Optional) The tags that this route applies to.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `name` - The name of the resource.
-* `dest_range` - The destination CIDR block of this route.
-* `network` - The name of the network of this route.
-* `next_hop_ip` - The IP address of the next hop, if available.
-* `next_hop_instance` - The name of the instance of the next hop, if available.
-* `next_hop_instance_zone` - The zone of the next hop instance, if available.
-* `next_hop_gateway` - The name of the next hop gateway, if available.
 * `next_hop_network` - The name of the next hop network, if available.
-* `priority` - The priority of this route.
+
-* `tags` - The tags this route applies to.
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_ssl_certificate.html.markdown

@@ -16,7 +16,7 @@ For more information see
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_ssl_certificate" "default" {
   name        = "my-certificate"
   description = "a description"
@@ -29,19 +29,29 @@ resource "google_compute_ssl_certificate" "default" {
 
 The following arguments are supported:
 
+* `certificate` - (Required) A local certificate file in PEM format. The chain
+    may be at most 5 certs long, and must include at least one intermediate
+    cert. Changing this forces a new resource to be created.
+
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
-* `description` - (Optional) An optional description of this resource.
+
-    Changing this forces a new resource to be created.
 * `private_key` - (Required) Write only private key in PEM format.
     Changing this forces a new resource to be created.
-* `certificate` - (Required) A local certificate file in PEM format. The chain
+
-    may be at most 5 certs long, and must include at least one intermediate cert.
+- - -
+
+* `description` - (Optional) An optional description of this resource.
     Changing this forces a new resource to be created.
 
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `id` - A unique ID for the certificated, assigned by GCE.
 
 * `self_link` - The URI of the created resource.
-* `id` - A unique ID assigned by GCE.

website/source/docs/providers/google/r/compute_subnetwork.html.markdown

@@ -12,7 +12,7 @@ Manages a subnetwork within GCE.
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_subnetwork" "default-us-east1" {
   name          = "default-us-east1"
   ip_cidr_range = "10.0.0.0/16"
@@ -25,23 +25,30 @@ resource "google_compute_subnetwork" "default-us-east1" {
 
 The following arguments are supported:
 
+* `ip_cidr_range` - (Required) The IP address range that machines in this
+    network are assigned to, represented as a CIDR block.
+
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
 
 * `network` - (Required) A link to the parent network of this subnetwork.
     The parent network must have been created in custom subnet mode.
 
-* `ip_cidr_range` - (Required) The IP address range that machines in this
+- - -
-     network are assigned to, represented as a CIDR block.
-
-* `region` - (Required) The region this subnetwork will be created in.
 
 * `description` - (Optional) Description of this subnetwork.
 
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
+* `region` - (Optional) The region this subnetwork will be created in. If
+    unspecified, this defaults to the region configured in the provider.
+
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `name` - The name of the resource.
-* `ip_cidr_range` - The CIDR block of this network.
 * `gateway_address` - The IP address of the gateway.
+
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_target_http_proxy.html.markdown

@@ -16,7 +16,7 @@ documentation](https://cloud.google.com/compute/docs/load-balancing/http/target-
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_target_http_proxy" "default" {
   name        = "test-proxy"
   description = "a description"
@@ -26,6 +26,7 @@ resource "google_compute_target_http_proxy" "default" {
 resource "google_compute_url_map" "default" {
   name        = "url-map"
   description = "a description"
+
   default_service = "${google_compute_backend_service.default.self_link}"
 
   host_rule {
@@ -34,8 +35,9 @@ resource "google_compute_url_map" "default" {
   }
 
   path_matcher {
-        default_service = "${google_compute_backend_service.default.self_link}"
     name            = "allpaths"
+    default_service = "${google_compute_backend_service.default.self_link}"
+
     path_rule {
       paths = ["/*"]
       service = "${google_compute_backend_service.default.self_link}"
@@ -48,7 +50,6 @@ resource "google_compute_backend_service" "default" {
   port_name   = "http"
   protocol    = "HTTP"
   timeout_sec = 10
-    region = "us-central1"
 
   health_checks = ["${google_compute_http_health_check.default.self_link}"]
 }
@@ -65,16 +66,23 @@ resource "google_compute_http_health_check" "default" {
 
 The following arguments are supported:
 
-* `name` - (Required) A unique name for the resource, required by GCE.
+* `name` - (Required) A unique name for the resource, required by GCE. Changing
-    Changing this forces a new resource to be created.
+    this forces a new resource to be created.
-* `description` - (Optional) A description of this resource.
+
-    Changing this forces a new resource to be created.
+* `url_map` - (Required) The URL of a URL Map resource that defines the mapping
-* `url_map` - (Required) The URL of a URL Map resource that defines the
+    from the URL to the BackendService.
-    mapping from the URL to the BackendService.
+
+- - -
+
+* `description` - (Optional) A description of this resource. Changing this
+    forces a new resource to be created.
+
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `id` - A unique ID assigned by GCE.
 
 * `self_link` - The URI of the created resource.
-* `id` - A unique ID assigned by GCE.

website/source/docs/providers/google/r/compute_target_https_proxy.html.markdown

@@ -16,7 +16,7 @@ documentation](https://cloud.google.com/compute/docs/load-balancing/http/target-
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_target_https_proxy" "default" {
   name             = "test-proxy"
   description      = "a description"
@@ -34,6 +34,7 @@ resource "google_compute_ssl_certificate" "default" {
 resource "google_compute_url_map" "default" {
   name        = "url-map"
   description = "a description"
+
   default_service = "${google_compute_backend_service.default.self_link}"
 
   host_rule {
@@ -42,8 +43,9 @@ resource "google_compute_url_map" "default" {
   }
 
   path_matcher {
-        default_service = "${google_compute_backend_service.default.self_link}"
     name            = "allpaths"
+    default_service = "${google_compute_backend_service.default.self_link}"
+
     path_rule {
       paths = ["/*"]
       service = "${google_compute_backend_service.default.self_link}"
@@ -56,7 +58,6 @@ resource "google_compute_backend_service" "default" {
   port_name   = "http"
   protocol    = "HTTP"
   timeout_sec = 10
-    region = "us-central1"
 
   health_checks = ["${google_compute_http_health_check.default.self_link}"]
 }
@@ -73,19 +74,29 @@ resource "google_compute_http_health_check" "default" {
 
 The following arguments are supported:
 
-* `name` - (Required) A unique name for the resource, required by GCE.
+* `name` - (Required) A unique name for the resource, required by GCE. Changing
-    Changing this forces a new resource to be created.
+    this forces a new resource to be created.
-* `description` - (Optional) A description of this resource.
+
-    Changing this forces a new resource to be created.
+* `ssl_certificates` - (Required) The URLs of the SSL Certificate resources that
-* `url_map` - (Required) The URL of a URL Map resource that defines the
+    authenticate connections between users and load balancing. Currently exactly
-    mapping from the URL to the BackendService.
+    one must be specified.
-* `ssl_certificates` - (Required) The URLs of the SSL Certificate resources
+
-    that authenticate connections between users and load balancing. Currently
+* `url_map` - (Required) The URL of a URL Map resource that defines the mapping
-    exactly one must be specified.
+    from the URL to the BackendService.
+
+- - -
+
+* `description` - (Optional) A description of this resource. Changing this
+    forces a new resource to be created.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `id` - A unique ID assigned by GCE.
 
 * `self_link` - The URI of the created resource.
-* `id` - A unique ID assigned by GCE.

website/source/docs/providers/google/r/compute_target_pool.html.markdown

@@ -17,11 +17,18 @@ and [API](https://cloud.google.com/compute/docs/reference/latest/targetPools).
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_target_pool" "default" {
   name = "test"
-    instances = [ "us-central1-a/myinstance1", "us-central1-b/myinstance2" ]
+
-    health_checks = [ "${google_compute_http_health_check.default.name}" ]
+  instances = [
+    "us-central1-a/myinstance1",
+    "us-central1-b/myinstance2",
+  ]
+
+  health_checks = [
+    "${google_compute_http_health_check.default.name}",
+  ]
 }
 ```
 
@@ -29,6 +36,11 @@ resource "google_compute_target_pool" "default" {
 
 The following arguments are supported:
 
+* `name` - (Required) A unique name for the resource, required by GCE. Changing
+    this forces a new resource to be created.
+
+- - -
+
 * `backup_pool` - (Optional) URL to the backup target pool. Must also set
     failover\_ratio.
 
@@ -41,19 +53,23 @@ The following arguments are supported:
 
 * `instances` - (Optional) List of instances in the pool. They can be given as
     URLs, or in the form of "zone/name". Note that the instances need not exist
-  at the time of target pool creation, so there is no need to use the Terraform
+    at the time of target pool creation, so there is no need to use the
-  interpolators to create a dependency on the instances from the target pool.
+    Terraform interpolators to create a dependency on the instances from the
+    target pool.
 
-* `name` - (Required) A unique name for the resource, required by GCE.  Changing
+* `project` - (Optional) The project in which the resource belongs. If it
-  this forces a new resource to be created.
+    is not provided, the provider project is used.
 
-* `session_affinity` - (Optional) How to distribute load.  Options are "NONE" (no affinity).  "CLIENT\_IP" (hash of the source/dest addresses / ports), and "CLIENT\_IP\_PROTO" also includes the protocol (default "NONE").
+* `region` - (Optional) Where the target pool resides. Defaults to project
+    region.
 
-* `region` - (Optional) Where the target pool resides. Defaults to project region.
+* `session_affinity` - (Optional) How to distribute load. Options are "NONE" (no
+    affinity). "CLIENT\_IP" (hash of the source/dest addresses / ports), and
+    "CLIENT\_IP\_PROTO" also includes the protocol (default "NONE").
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
-
+exported:
-* `self_link` - The URL of the created resource.
 
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_url_map.html.markdown

@@ -1,7 +1,7 @@
 ---
 layout: "google"
 page_title: "Google: google_compute_url_map"
-sidebar_current: "docs-google-resource-url-map"
+sidebar_current: "docs-google-compute-url-map"
 description: |-
   Manages a URL Map resource in GCE.
 ---
@@ -16,10 +16,11 @@ and
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_url_map" "foobar" {
   name        = "urlmap"
   description = "a description"
+
   default_service = "${google_compute_backend_service.home.self_link}"
 
   host_rule {
@@ -28,8 +29,9 @@ resource "google_compute_url_map" "foobar" {
   }
 
   path_matcher {
-        default_service = "${google_compute_backend_service.home.self_link}"
     name            = "allpaths"
+    default_service = "${google_compute_backend_service.home.self_link}"
+
     path_rule {
       paths   = ["/home"]
       service = "${google_compute_backend_service.home.self_link}"
@@ -80,50 +82,62 @@ resource "google_compute_http_health_check" "default" {
 
 The following arguments are supported:
 
+* `default_service` - (Required) The URL of the backend service to use when none
+    of the given rules match. See the documentation for formatting the service
+    URL
+    [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#defaultService)
+
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
 
+- - -
+
 * `description` - (Optional) A brief description of this resource.
 
-* `default_service` - (Required) The URL of the backend service to use when none of the
+* `host_rule` - (Optional) A list of host rules. See below for configuration
-    given rules match. See the documentation for formatting the service URL
+    options.
-    [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#defaultService)
 
-The `host_rule` block supports: (Note that this block can be defined an arbitrary
+* `path_matcher` - (Optional) A list of paths to match. See below for
-number of times.)
+    configuration options.
 
-* `hosts` (Required) - A list of hosts to match against. See the documention
+* `project` - (Optional) The project in which the resource belongs. If it
-    for formatting each host [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#hostRules.hosts)
+    is not provided, the provider project is used.
+
+* `test` - (Optional) The test to perform. See below for configuration options.
+
+The `host_rule` block supports: (This block can be defined multiple times).
+
+* `hosts` (Required) - A list of hosts to match against. See the documentation
+    for formatting each host
+    [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#hostRules.hosts)
 
 * `description` - (Optional) An optional description of the host rule.
 
 * `path_matcher` - (Required) The name of the `path_matcher` (defined below)
     to apply this host rule to.
 
-The `path_matcher` block supports: (Note that this block can be defined an arbitrary
+The `path_matcher` block supports: (This block can be defined multiple times)
-number of times.)
 
 * `default_service` - (Required) The URL for the backend service to use if none
-    of the given paths match. See the documentation for formatting the service URL
+    of the given paths match. See the documentation for formatting the service
-    [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#pathMatcher.defaultService)
+    URL [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#pathMatcher.defaultService)
 
-* `name` - (Required) The name of the `path_matcher` resource. Used by the `host_rule`
+* `name` - (Required) The name of the `path_matcher` resource. Used by the
-    block above.
+    `host_rule` block above.
 
 * `description` - (Optional) An optional description of the host rule.
 
-The `path_matcher.path_rule` sub-block supports: (Note that this block can be defined an arbitrary
+The `path_matcher.path_rule` sub-block supports: (This block can be defined
-number of times.)
+multiple times)
 
 * `paths` - (Required) The list of paths to match against. See the
     documentation for formatting these [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#pathMatchers.pathRules.paths)
 
 * `default_service` - (Required) The URL for the backend service to use if any
-    of the given paths match. See the documentation for formatting the service URL
+    of the given paths match. See the documentation for formatting the service
-    [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#pathMatcher.defaultService)
+    URL [here](https://cloud.google.com/compute/docs/reference/latest/urlMaps#pathMatcher.defaultService)
 
-The optional `test` block supports: (Note that this block can be defined an arbitary
+The optional `test` block supports: (This block can be defined multiple times)
-number of times.)
 
 * `service` - (Required) The service that should be matched by this test.
 
@@ -135,7 +149,11 @@ number of times.)
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `fingerprint` - The unique fingerprint for this resource.
 
 * `id` - The GCE assigned ID of the resource.
-* `self_link` - A GCE assigned link to the resource.
+
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_vpn_gateway.html.markdown

@@ -14,7 +14,7 @@ Manages a VPN Gateway in the GCE network. For more info, read the
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_network" "network1" {
   name       = "network1"
   ipv4_range = "10.120.0.0/16"
@@ -62,35 +62,43 @@ resource "google_compute_vpn_tunnel" "tunnel1" {
   region        = "${var.region}"
   peer_ip       = "15.0.0.120"
   shared_secret = "a secret message"
+
   target_vpn_gateway = "${google_compute_vpn_gateway.target_gateway.self_link}"
-    depends_on = ["google_compute_forwarding_rule.fr_esp",
+
+  depends_on = [
+    "google_compute_forwarding_rule.fr_esp",
     "google_compute_forwarding_rule.fr_udp500",
-        "google_compute_forwarding_rule.fr_udp4500"]
+    "google_compute_forwarding_rule.fr_udp4500",
+  ]
 }
 
 resource "google_compute_route" "route1" {
   name       = "route1"
   network    = "${google_compute_network.network1.name}"
-    next_hop_vpn_tunnel = "${google_compute_vpn_tunnel.tunnel1.self_link}"
   dest_range = "15.0.0.0/24"
   priority   = 1000
-}
 
+  next_hop_vpn_tunnel = "${google_compute_vpn_tunnel.tunnel1.self_link}"
+}
 ```
 
 ## Argument Reference
 
 The following arguments are supported:
 
-* `name` - (Required) A unique name for the resource, required by GCE.
+* `name` - (Required) A unique name for the resource, required by GCE. Changing
-    Changing this forces a new resource to be created.
+    this forces a new resource to be created.
+
+* `network` - (Required) A link to the network this VPN gateway is accepting
+    traffic for. Changing this forces a new resource to be created.
+
+- - -
 
 * `description` - (Optional) A description of the resource.
     Changing this forces a new resource to be created.
 
-* `network` - (Required) A link to the network this VPN gateway is accepting
+* `project` - (Optional) The project in which the resource belongs. If it
-    traffic for.
+    is not provided, the provider project is used.
-    Changing this forces a new resource to be created.
 
 * `region` - (Optional) The region this gateway should sit in. If not specified,
     the project region will be used. Changing this forces a new resource to be
@@ -98,6 +106,7 @@ The following arguments are supported:
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `self_link` - A GCE server assigned link to this resource.
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/compute_vpn_tunnel.html.markdown

@@ -13,7 +13,7 @@ Manages a VPN Tunnel to the GCE network. For more info, read the
 
 ## Example Usage
 
-```
+```js
 resource "google_compute_network" "network1" {
   name       = "network1"
   ipv4_range = "10.120.0.0/16"
@@ -22,17 +22,14 @@ resource "google_compute_network" "network1" {
 resource "google_compute_vpn_gateway" "target_gateway" {
   name    = "vpn1"
   network = "${google_compute_network.network1.self_link}"
-    region = "${var.region}"
 }
 
 resource "google_compute_address" "vpn_static_ip" {
   name   = "vpn-static-ip"
-    region = "${var.region}"
 }
 
 resource "google_compute_forwarding_rule" "fr_esp" {
   name        = "fr-esp"
-    region = "${var.region}"
   ip_protocol = "ESP"
   ip_address  = "${google_compute_address.vpn_static_ip.address}"
   target      = "${google_compute_vpn_gateway.target_gateway.self_link}"
@@ -40,7 +37,6 @@ resource "google_compute_forwarding_rule" "fr_esp" {
 
 resource "google_compute_forwarding_rule" "fr_udp500" {
   name        = "fr-udp500"
-    region = "${var.region}"
   ip_protocol = "UDP"
   port_range  = "500"
   ip_address  = "${google_compute_address.vpn_static_ip.address}"
@@ -49,7 +45,6 @@ resource "google_compute_forwarding_rule" "fr_udp500" {
 
 resource "google_compute_forwarding_rule" "fr_udp4500" {
   name        = "fr-udp4500"
-    region = "${var.region}"
   ip_protocol = "UDP"
   port_range  = "4500"
   ip_address  = "${google_compute_address.vpn_static_ip.address}"
@@ -58,59 +53,69 @@ resource "google_compute_forwarding_rule" "fr_udp4500" {
 
 resource "google_compute_vpn_tunnel" "tunnel1" {
   name          = "tunnel1"
-    region = "${var.region}"
   peer_ip       = "15.0.0.120"
   shared_secret = "a secret message"
+
   target_vpn_gateway = "${google_compute_vpn_gateway.target_gateway.self_link}"
-    depends_on = ["google_compute_forwarding_rule.fr_esp",
+
+  depends_on = [
+    "google_compute_forwarding_rule.fr_esp",
     "google_compute_forwarding_rule.fr_udp500",
-        "google_compute_forwarding_rule.fr_udp4500"]
+    "google_compute_forwarding_rule.fr_udp4500",
+  ]
 }
 
 resource "google_compute_route" "route1" {
   name       = "route1"
   network    = "${google_compute_network.network1.name}"
-    next_hop_vpn_tunnel = "${google_compute_vpn_tunnel.tunnel1.self_link}"
   dest_range = "15.0.0.0/24"
   priority   = 1000
-}
 
+  next_hop_vpn_tunnel = "${google_compute_vpn_tunnel.tunnel1.self_link}"
+}
 ```
 
 ## Argument Reference
 
 The following arguments are supported:
 
-* `name` - (Required) A unique name for the resource, required by GCE.
+* `name` - (Required) A unique name for the resource, required by GCE. Changing
+    this forces a new resource to be created.
+
+* `peer_ip` - (Required) The VPN gateway sitting outside of GCE. Changing this
+    forces a new resource to be created.
+
+* `shared_secret` - (Required) A passphrase shared between the two VPN gateways.
     Changing this forces a new resource to be created.
 
-* `description` - (Optional) A description of the resource.
+* `target_vpn_gateway` - (Required) A link to the VPN gateway sitting inside
-    Changing this forces a new resource to be created.
+    GCE. Changing this forces a new resource to be created.
 
-* `peer_ip` - (Required) The VPN gateway sitting outside of GCE.
+- - -
-    Changing this forces a new resource to be created.
+
+* `description` - (Optional) A description of the resource. Changing this forces
+    a new resource to be created.
+
+* `ike_version` - (Optional) Either version 1 or 2. Default is 2. Changing this
+    forces a new resource to be created.
+
+* `local_traffic_selector` - (Optional) Specifies which CIDR ranges are
+    announced to the VPN peer. Mandatory if the VPN gateway is attached to a
+    custom subnetted network. Refer to Google documentation for more
+    information.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 * `region` - (Optional) The region this tunnel should sit in. If not specified,
     the project region will be used. Changing this forces a new resource to be
     created.
 
-* `shared_secret` - (Required) A passphrase shared between the two VPN gateways.
-    Changing this forces a new resource to be created.
-
-* `target_vpn_gateway` - (Required) A link to the VPN gateway sitting inside GCE.
-    Changing this forces a new resource to be created.
-
-* `ike_version` - (Optional) Either version 1 or 2. Default is 2.
-    Changing this forces a new resource to be created.
-
-* `local_traffic_selector` - (Optional) Specifies which CIDR ranges are announced
-    to the VPN peer. Mandatory if the VPN gateway is attached to a custom subnetted
-    network. Refer to Google documentation for more information.
-
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
-
+exported:
-* `self_link` - A GCE server assigned link to this resource.
 
 * `detailed_status` - Information about the status of the VPN tunnel.
+
+* `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/container_cluster.html.markdown

@@ -8,11 +8,13 @@ description: |-
 
 # google\_container\_cluster
 
--> **Note:** Due to limitations of the API, all arguments except `node_version` are non-updateable (changing any will cause recreation of the whole cluster).
+!> **Warning:** Due to limitations of the API, all arguments except
+`node_version` are non-updateable. Changing any will cause recreation of the
+whole cluster!
 
 ## Example usage
 
-```
+```js
 resource "google_container_cluster" "primary" {
   name = "marcellus-wallace"
   zone = "us-central1-a"
@@ -36,36 +38,65 @@ resource "google_container_cluster" "primary" {
 
 ## Argument Reference
 
-* `name` - (Required) The name of the cluster, unique within the project and zone
+* `initial_node_count` - (Required) The number of nodes to create in this
+    cluster (not including the Kubernetes master).
+
+* `master_auth` - (Required) The authentication information for accessing the
+    Kubernetes master.
+
+* `name` - (Required) The name of the cluster, unique within the project and
+    zone.
+
 * `zone` - (Required) The zone that all resources should be created in.
-* `master_auth` - (Required) The authentication information for accessing the Kubernetes master
+
-* `initial_node_count` - (Required) The number of nodes to create in this cluster (not including the Kubernetes master)
+- - -
-* `description` - (Optional) Description of the cluster
+
-* `node_version` - (Optional) The Kubernetes version on the nodes. Only valid for upgrading of existing cluster.
+* `cluster_ipv4_cidr` - (Optional) The IP address range of the container pods in
-  Defaults to latest version supported by the server.
+    this cluster. Default is an automatically assigned CIDR.
-* `cluster_ipv4_cidr` - (Optional) The IP address range of the container pods in this cluster.
+
-  Default is an automatically assigned CIDR.
+* `description` - (Optional) Description of the cluster.
-* `logging_service` - (Optional) The logging service that the cluster should write logs to.
+
-  Available options include `logging.googleapis.com` and `none`. Defaults to `logging.googleapis.com`
+* `logging_service` - (Optional) The logging service that the cluster should
-* `monitoring_service` - (Optional) The monitoring service that the cluster should write metrics to.
+    write logs to. Available options include `logging.googleapis.com` and
-  Available options include `monitoring.googleapis.com` and `none`. Defaults to `monitoring.googleapis.com`
+    `none`. Defaults to `logging.googleapis.com`
-* `network` - (Optional) The name of the Google Compute Engine network to which the cluster is connected
+
-* `node_config` -  (Optional) The machine type and image to use for all nodes in this cluster
+* `monitoring_service` - (Optional) The monitoring service that the cluster
+    should write metrics to. Available options include
+    `monitoring.googleapis.com` and `none`. Defaults to
+    `monitoring.googleapis.com`
+
+* `network` - (Optional) The name of the Google Compute Engine network to which
+    the cluster is connected
+
+* `node_config` -  (Optional) The machine type and image to use for all nodes in
+    this cluster
+
+* `node_version` - (Optional) The Kubernetes version on the nodes. Only valid
+    for upgrading of existing cluster. Defaults to latest version supported by
+    the server.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
 
 **Master Auth** supports the following arguments:
 
-* `password` - The password to use for HTTP basic authentication when accessing the Kubernetes master endpoint
+* `password` - The password to use for HTTP basic authentication when accessing
-* `username` - The username to use for HTTP basic authentication when accessing the Kubernetes master endpoint
+    the Kubernetes master endpoint
+
+* `username` - The username to use for HTTP basic authentication when accessing
+    the Kubernetes master endpoint
 
 **Node Config** supports the following arguments:
 
 * `machine_type` - (Optional) The name of a Google Compute Engine machine type.
     Defaults to `n1-standard-1`.
-* `disk_size_gb` - (Optional) Size of the disk attached to each node, specified in GB.
+
-  The smallest allowed disk size is 10GB. Defaults to 100GB.
+* `disk_size_gb` - (Optional) Size of the disk attached to each node, specified
-* `oauth_scopes` - (Optional) The set of Google API scopes to be made available on all
+    in GB. The smallest allowed disk size is 10GB. Defaults to 100GB.
-  of the node VMs under the "default" service account. The following scopes are necessary
+
-  to ensure the correct functioning of the cluster:
+* `oauth_scopes` - (Optional) The set of Google API scopes to be made available
+    on all of the node VMs under the "default" service account. The following
+    scopes are necessary to ensure the correct functioning of the cluster:
 
   * `https://www.googleapis.com/auth/compute`
   * `https://www.googleapis.com/auth/devstorage.read_only`
@@ -74,11 +105,19 @@ resource "google_container_cluster" "primary" {
 
 ## Attributes Reference
 
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `endpoint` - The IP address of this cluster's Kubernetes master
+
+* `instance_group_urls` - List of instance group URLs which have been assigned
+    to the cluster
+
 * `master_auth.client_certificate` - Base64 encoded public certificate
     used by clients to authenticate to the cluster endpoint.
+
 * `master_auth.client_key` - Base64 encoded private key used by clients
     to authenticate to the cluster endpoint
+
 * `master_auth.cluster_ca_certificate` - Base64 encoded public certificate
     that is the root of trust for the cluster
-* `endpoint` - The IP address of this cluster's Kubernetes master
-* `instance_group_urls` - List of instance group URLs which have been assigned to the cluster

website/source/docs/providers/google/r/dns_managed_zone.markdown

@@ -12,7 +12,7 @@ Manages a zone within Google Cloud DNS.
 
 ## Example Usage
 
-```
+```js
 resource "google_dns_managed_zone" "prod" {
   name        = "prod-zone"
   dns_name    = "prod.mydomain.com."
@@ -24,19 +24,23 @@ resource "google_dns_managed_zone" "prod" {
 
 The following arguments are supported:
 
+* `dns_name` - (Required) The DNS name of this zone, e.g. "terraform.io".
+
 * `name` - (Required) A unique name for the resource, required by GCE.
     Changing this forces a new resource to be created.
 
-* `dns_name` - (Required) The DNS name of this zone, e.g. "terraform.io".
+- - -
 
 * `description` - (Optional) A textual description field. Defaults to 'Managed by Terraform'.
 
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
-* `name` - The name of the resource.
-* `dns_name` - The DNS name of this zone.
 * `name_servers` - The list of nameservers that will be authoritative for this
     domain. Use NS records to redirect from your DNS provider to these names,
-thus making Google Cloud DNS authoritative for this zone.
+    thus making Google Cloud DNS authoritative for this zone.

website/source/docs/providers/google/r/dns_record_set.markdown

@@ -14,7 +14,7 @@ Manages a set of DNS records within Google Cloud DNS.
 
 This example is the common case of binding a DNS name to the ephemeral IP of a new instance:
 
-```
+```js
 resource "google_compute_instance" "frontend" {
   name         = "frontend"
   machine_type = "g1-small"
@@ -26,8 +26,7 @@ resource "google_compute_instance" "frontend" {
 
   network_interface {
     network = "default"
-        access_config {
+    access_config {}
-        }
   }
 }
 resource "google_dns_managed_zone" "prod" {
@@ -36,10 +35,12 @@ resource "google_dns_managed_zone" "prod" {
 }
 
 resource "google_dns_record_set" "frontend" {
-    managed_zone = "${google_dns_managed_zone.prod.name}"
   name = "frontend.${google_dns_managed_zone.prod.dns_name}"
   type = "A"
   ttl  = 300
+
+  managed_zone = "${google_dns_managed_zone.prod.name}"
+
   rrdatas = ["${google_compute_instance.frontend.network_interface.0.access_config.0.assigned_nat_ip}"]
 }
 ```
@@ -48,17 +49,23 @@ resource "google_dns_record_set" "frontend" {
 
 The following arguments are supported:
 
-* `managed_zone` - (Required) The name of the zone in which this record set will reside.
+* `managed_zone` - (Required) The name of the zone in which this record set will
+    reside.
 
 * `name` - (Required) The DNS name this record set will apply to.
 
-* `type` - (Required) The DNS record set type.
-
-* `ttl` - (Required) The time-to-live of this record set (seconds).
-
 * `rrdatas` - (Required) The string data for the records in this record set
     whose meaning depends on the DNS type.
 
+* `ttl` - (Required) The time-to-live of this record set (seconds).
+
+* `type` - (Required) The DNS record set type.
+
+- - -
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 ## Attributes Reference
 
-All arguments are available as attributes.
+Only the arguments listed above are exposed as attributes.

website/source/docs/providers/google/r/pubsub_subscription.html.markdown

@@ -15,11 +15,13 @@ Creates a subscription in Google's pubsub queueing system.  For more information
 
 ## Example Usage
 
-```
+```js
 resource "google_pubsub_subscription" "default" {
   name  = "default-subscription"
   topic = "default-topic"
+
   ack_deadline_seconds = 20
+
   push_config {
     endpoint = "https://example.com/push"
     attributes {
@@ -39,10 +41,18 @@ The following arguments are supported:
 * `topic` - (Required) A topic to bind this subscription to, required by pubsub.
     Changing this forces a new resource to be created.
 
+- - -
+
 * `ack_deadline_seconds` - (Optional) The maximum number of seconds a
     subscriber has to acknowledge a received message, otherwise the message is
     redelivered. Changing this forces a new resource to be created.
 
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
+* `push_config` - (Optional) Block configuration for push options. More
+    configuration options are detailed below.
+
 The optional `push_config` block supports:
 
 * `push_endpoint` - (Optional) The URL of the endpoint to which messages should
@@ -54,3 +64,7 @@ The optional `push_config` block supports:
     delivery. For more information, read [the API docs
     here](https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions#PushConfig.FIELDS.attributes).
     Changing this forces a new resource to be created.
+
+## Attributes Reference
+
+Only the arguments listed above are exposed as attributes.

website/source/docs/providers/google/r/pubsub_topic.html.markdown

@@ -15,7 +15,7 @@ Creates a topic in Google's pubsub queueing system.  For more information see
 
 ## Example Usage
 
-```
+```js
 resource "google_pubsub_topic" "default" {
   name = "default-topic"
 }
@@ -28,8 +28,11 @@ The following arguments are supported:
 * `name` - (Required) A unique name for the resource, required by pubsub.
     Changing this forces a new resource to be created.
 
+- - -
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 ## Attributes Reference
 
-The following attributes are exported:
+Only the arguments listed above are exposed as attributes.
-
-* `name` - The name of the resource.

website/source/docs/providers/google/r/sql_database.html.markdown

@@ -14,7 +14,7 @@ Creates a new Google SQL Database on a Google SQL Database Instance. For more in
 
 Example creating a SQL Database.
 
-```
+```js
 resource "google_sql_database_instance" "master" {
   name = "master-instance"
 
@@ -27,7 +27,6 @@ resource "google_sql_database" "users" {
   name     = "image-store-bucket"
   instance = "${google_sql_database_instance.master.name}"
 }
-
 ```
 
 ## Argument Reference
@@ -38,8 +37,14 @@ The following arguments are supported:
 
 * `instance` - (Required) The name of containing instance.
 
+- - -
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
 * `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/sql_database_instance.html.markdown

@@ -14,7 +14,7 @@ Creates a new Google SQL Database Instance. For more information, see the [offic
 
 Example creating a SQL Database.
 
-```
+```js
 resource "google_sql_database_instance" "master" {
   name = "master-instance"
 
@@ -28,21 +28,32 @@ resource "google_sql_database_instance" "master" {
 
 The following arguments are supported:
 
-* `name` - (Optional, Computed) The name of the instance. If the name is left
-  blank, Terraform will randomly generate one when the instance is first
-  created. This is done because after a name is used, it cannot be reused
-  for up to [two months](https://cloud.google.com/sql/docs/delete-instance).
-
 * `region` - (Required) The region the instance will sit in. Note, this does
     not line up with the Google Compute Engine (GCE) regions - your options are
     `us-central`, `asia-west1`, `europe-west1`, and `us-east1`.
 
+* `settings` - (Required) The settings to use for the database. The
+    configuration is detailed below.
+
+- - -
+
+* `database_version` - (Optional, Default: `MYSQL_5_5`) The MySQL version to
+    use. Can be either `MYSQL_5_5` or `MYSQL_5_6`.
+
+* `name` - (Optional, Computed) The name of the instance. If the name is left
+    blank, Terraform will randomly generate one when the instance is first
+    created. This is done because after a name is used, it cannot be reused for
+    up to [two months](https://cloud.google.com/sql/docs/delete-instance).
+
 * `master_instance_name` - (Optional) The name of the instance that will act as
     the master in the replication setup. Note, this requires the master to have
     `binary_log_enabled` set, as well as existing backups.
 
-* `database_version` - (Optional, Default: `MYSQL_5_5`) The MySQL version to
+* `project` - (Optional) The project in which the resource belongs. If it
-  use. Can be either `MYSQL_5_5` or `MYSQL_5_6`.
+    is not provided, the provider project is used.
+
+* `replica_configuration` - (Optional) The configuration for replication. The
+    configuration is detailed below.
 
 The required `settings` block supports:
 
@@ -53,8 +64,8 @@ The required `settings` block supports:
 * `activation_policy` - (Optional) This specifies when the instance should be
     active. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`.
 
-* `authorized_gae_applications` - (Optional) A list of Google App Engine (GAE) project names that
+* `authorized_gae_applications` - (Optional) A list of Google App Engine (GAE)
-  are allowed to access this instance.
+    project names that are allowed to access this instance.
 
 * `crash_safe_replication` - (Optional) Specific to read instances, indicates
     when crash-safe replication flags are enabled.
@@ -62,8 +73,8 @@ The required `settings` block supports:
 * `pricing_plan` - (Optional) Pricing plan for this instance, can be one of
     `PER_USE` or `PACKAGE`.
 
-* `replication_type` - (Optional) Replication type for this instance, can be one of
+* `replication_type` - (Optional) Replication type for this instance, can be one
-  `ASYNCHRONOUS` or `SYNCHRONOUS`.
+    of `ASYNCHRONOUS` or `SYNCHRONOUS`.
 
 The optional `settings.database_flags` sublist supports:
 
@@ -91,9 +102,8 @@ The optional `settings.ip_configuration` subblock supports:
 
 The optional `settings.ip_configuration.authorized_networks[]` sublist supports:
 
-* `expiration_time` - (Optional) The [RFC
+* `expiration_time` - (Optional) The [RFC 3339](https://tools.ietf.org/html/rfc3339)
-  3339](https://tools.ietf.org/html/rfc3339) formatted date time string
+  formatted date time string indicating when this whitelist expires.
-  indicating when this whitelist expires.
 
 * `name` - (Optional) A name for this whitelist entry.
 
@@ -109,8 +119,8 @@ The optional `settings.location_preference` subblock supports:
 * `zone` - (Optional) The preferred compute engine
     [zone](https://cloud.google.com/compute/docs/zones?hl=en).
 
-The optional `replica_configuration` block must have
+The optional `replica_configuration` block must have `master_instance_name` set
-`master_instance_name` set to work, cannot be updated, and supports:
+to work, cannot be updated, and supports:
 
 * `ca_certificate` - (Optional) PEM representation of the trusted CA's x509
     certificate.
@@ -118,8 +128,8 @@ The optional `replica_configuration` block must have
 * `client_certificate` - (Optional) PEM representation of the slave's x509
     certificate.
 
-* `client_key` - (Optional) PEM representation of the slave's private key.
+* `client_key` - (Optional) PEM representation of the slave's private key. The
-  The corresponding public key in encoded in the `client_certificate`.
+    corresponding public key in encoded in the `client_certificate`.
 
 * `connect_retry_interval` - (Optional, Default: 60) The number of seconds
     between connect retries.
@@ -141,18 +151,15 @@ The optional `replica_configuration` block must have
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
+
+* `ip_address.ip_address` - The IPv4 address assigned.
+
+* `ip_address.time_to_retire` - The time this IP address will be retired, in RFC
+    3339 format.
 
 * `self_link` - The URI of the created resource.
 
-The `settings` block exports:
+* `settings.version` - Used to make sure changes to the `settings` block are
-
+    atomic.
-* `version` - Used to make sure changes to the `settings` block are atomic.
-
-The `ip_address` block exports a list of IPv4 addresses assigned to this
-instance, with the following properties:
-
-* `ip_address` - The IPv4 address assigned.
-
-* `time_to_retire` - The time this IP address will be retired, in RFC 3339
-  format.

website/source/docs/providers/google/r/sql_user.html.markdown

@@ -14,7 +14,7 @@ Creates a new Google SQL User on a Google SQL User Instance. For more informatio
 
 Example creating a SQL User.
 
-```
+```js
 resource "google_sql_database_instance" "master" {
   name = "master-instance"
 
@@ -28,20 +28,28 @@ resource "google_sql_user" "users" {
   instance = "${google_sql_database_instance.master.name}"
   host     = "me.com"
 }
-
 ```
 
 ## Argument Reference
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the user.
-  Changing this forces a new resource to be created.
-
 * `host` - (Required) The host the user can connect from. Can be an IP address.
     Changing this forces a new resource to be created.
 
+* `instance` - (Required) The name of the Cloud SQL instance. Changing this
+    forces a new resource to be created.
+
+* `name` - (Required) The name of the user. Changing this forces a new resource
+    to be created.
+
 * `password` - (Required) The users password. Can be updated.
 
-* `instance` - (Required) The name of the Cloud SQL instance.
+- - -
-  Changing this forces a new resource to be created.
+
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
+## Attributes Reference
+
+Only the arguments listed above are exposed as attributes.

website/source/docs/providers/google/r/storage_bucket.html.markdown

@@ -15,16 +15,16 @@ Creates a new bucket in Google cloud storage service(GCS). Currently, it will no
 
 Example creating a private bucket in standard storage, in the EU region.
 
-```
+```js
 resource "google_storage_bucket" "image-store" {
   name     = "image-store-bucket"
   location = "EU"
+
   website {
     main_page_suffix = "index.html"
     not_found_page = "404.html"
   }
 }
-
 ```
 
 ## Argument Reference
@@ -32,18 +32,35 @@ resource "google_storage_bucket" "image-store" {
 The following arguments are supported:
 
 * `name` - (Required) The name of the bucket.
+
+- - -
+
+* `force_destroy` - (Optional, Default: false) When deleting a bucket, this
+    boolean option will delete all contained objects. If you try to delete a
+    bucket that contains objects, Terraform will fail that run.
+
+* `location` - (Optional, Default: 'US') The [GCS location](https://cloud.google.com/storage/docs/bucket-locations)
+
+
 * `predefined_acl` - (Optional, Deprecated) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply. Please switch
 to `google_storage_bucket_acl.predefined_acl`.
-* `location` - (Optional, Default: 'US') The [GCS location](https://cloud.google.com/storage/docs/bucket-locations)
+
-* `force_destroy` - (Optional, Default: false) When deleting a bucket, this boolean option will delete all contained objects. If you try to delete a bucket that contains objects, Terraform will fail that run.
+* `project` - (Optional) The project in which the resource belongs. If it
+    is not provided, the provider project is used.
+
+* `website` - (Optional) Configuration if the bucket acts as a website.
 
 The optional `website` block supports:
 
-* `main_page_suffix` - (Optional) Behaves as the bucket's directory index where missing objects are treated as potential directories.
+* `main_page_suffix` - (Optional) Behaves as the bucket's directory index where
-* `not_found_page` - (Optional) The custom object to return when a requested resource is not found.
+    missing objects are treated as potential directories.
+
+* `not_found_page` - (Optional) The custom object to return when a requested
+    resource is not found.
 
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
+exported:
 
 * `self_link` - The URI of the created resource.

website/source/docs/providers/google/r/storage_bucket_acl.html.markdown

@@ -14,7 +14,7 @@ Creates a new bucket ACL in Google cloud storage service(GCS).
 
 Example creating an ACL on a bucket with one owner, and one reader.
 
-```
+```js
 resource "google_storage_bucket" "image-store" {
   name     = "image-store-bucket"
   location = "EU"
@@ -22,15 +22,26 @@ resource "google_storage_bucket" "image-store" {
 
 resource "google_storage_bucket_acl" "image-store-acl" {
   bucket = "${google_storage_bucket.image_store.name}"
-    role_entity = ["OWNER:user-my.email@gmail.com",
-        "READER:group-mygroup"]
-}
 
+  role_entity = [
+    "OWNER:user-my.email@gmail.com",
+    "READER:group-mygroup",
+  ]
+}
 ```
 
 ## Argument Reference
 
 * `bucket` - (Required) The name of the bucket it applies to.
-* `predefined_acl` - (Optional) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply. Must be set if both `role_entity` and `default_acl` are not.
+
+- - -
+
 * `default_acl` - (Optional) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply to future buckets. Must be set both `role_entity` and `predefined_acl` are not.
+
+* `predefined_acl` - (Optional) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply. Must be set if both `role_entity` and `default_acl` are not.
+
 * `role_entity` - (Optional) List of role/entity pairs in the form `ROLE:entity`. See [GCS Bucket ACL documentation](https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls)  for more details. Must be set if both `predefined_acl` and `default_acl` are not.
+
+## Attributes Reference
+
+Only the arguments listed above are exposed as attributes.

website/source/docs/providers/google/r/storage_bucket_object.html.markdown

@@ -15,36 +15,39 @@ Creates a new object inside an exisiting bucket in Google cloud storage service
 
 Example creating a public object in an existing `image-store` bucket.
 
-```
+```js
 resource "google_storage_bucket_object" "picture" {
   name   = "butterfly01"
   source = "/images/nature/garden-tiger-moth.jpg"
   bucket = "image-store"
 }
-
 ```
 
 ## Argument Reference
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the object.
-
 * `bucket` - (Required) The name of the containing bucket.
 
-* `source` - (Optional) A path to the data you want to upload. Must be defined
+* `name` - (Required) The name of the object.
-if `content` is not.
+
+- - -
 
 * `content` - (Optional) Data as `string` to be uploaded. Must be defined if
-`source` is not.
+    `source` is not.
 
 * `predefined_acl` - (Optional, Deprecated) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) apply. Please switch
 to `google_storage_object_acl.predefined_acl`.
 
+
+* `source` - (Optional) A path to the data you want to upload. Must be defined
+    if `content` is not.
+
 ## Attributes Reference
 
-The following attributes are exported:
+In addition to the arguments listed above, the following computed attributes are
-
+exported:
-* `md5hash` - (Computed) Base 64 MD5 hash of the uploaded data.
 
 * `crc32c` - (Computed) Base 64 CRC32 hash of the uploaded data.
+
+* `md5hash` - (Computed) Base 64 MD5 hash of the uploaded data.

website/source/docs/providers/google/r/storage_object_acl.html.markdown

@@ -14,7 +14,7 @@ Creates a new object ACL in Google cloud storage service (GCS)
 
 Create an object ACL with one owner and one reader.
 
-```
+```js
 resource "google_storage_bucket" "image-store" {
   name     = "image-store-bucket"
   location = "EU"
@@ -29,15 +29,26 @@ resource "google_storage_bucket_object" "image" {
 resource "google_storage_object_acl" "image-store-acl" {
   bucket = "${google_storage_bucket.image_store.name}"
   object = "${google_storage_bucket_object.image_store.name}"
-    role_entity = ["OWNER:user-my.email@gmail.com",
-        "READER:group-mygroup"]
-}
 
+  role_entity = [
+    "OWNER:user-my.email@gmail.com",
+    "READER:group-mygroup",
+  ]
+}
 ```
 
 ## Argument Reference
 
 * `bucket` - (Required) The name of the bucket it applies to.
+
 * `object` - (Required) The name of the object it applies to.
+
+- - -
+
 * `predefined_acl` - (Optional) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply. Must be set if `role_entity` is not.
+
 * `role_entity` - (Optional) List of role/entity pairs in the form `ROLE:entity`. See [GCS Object ACL documentation](https://cloud.google.com/storage/docs/json_api/v1/objectAccessControls) for more details. Must be set if `predefined_acl` is not.
+
+## Attributes Reference
+
+Only the arguments listed above are exposed as attributes.