Store project and region in state (#784)

* Store project and region in state

* Delete unused project in runtimeconfig_variable

google/resource_bigquery_dataset.go

@@ -48,6 +48,7 @@ func resourceBigQueryDataset() *schema.Resource {
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -227,6 +228,7 @@ func resourceBigQueryDatasetRead(d *schema.ResourceData, meta interface{}) error
 		return handleNotFoundError(err, d, fmt.Sprintf("BigQuery dataset %q", datasetID))
 	}
 
+	d.Set("project", projectID)
 	d.Set("etag", res.Etag)
 	d.Set("labels", res.Labels)
 	d.Set("self_link", res.SelfLink)

google/resource_bigquery_table.go

@@ -42,6 +42,7 @@ func resourceBigQueryTable() *schema.Resource {
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -316,6 +317,7 @@ func resourceBigQueryTableRead(d *schema.ResourceData, meta interface{}) error {
 		return handleNotFoundError(err, d, fmt.Sprintf("BigQuery table %q", tableID))
 	}
 
+	d.Set("project", projectID)
 	d.Set("description", res.Description)
 	d.Set("expiration_time", res.ExpirationTime)
 	d.Set("friendly_name", res.FriendlyName)

google/resource_bigtable_instance.go

@@ -68,6 +68,7 @@ func resourceBigtableInstance() *schema.Resource {
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 		},
@@ -160,6 +161,7 @@ func resourceBigtableInstanceRead(d *schema.ResourceData, meta interface{}) erro
 		return fmt.Errorf("Error retrieving instance. Could not find %s. %s", d.Id(), err)
 	}
 
+	d.Set("project", project)
 	d.Set("name", instance.Name)
 	d.Set("display_name", instance.DisplayName)
 

google/resource_bigtable_table.go

@@ -38,6 +38,7 @@ func resourceBigtableTable() *schema.Resource {
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 		},
@@ -109,6 +110,8 @@ func resourceBigtableTableRead(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("Error retrieving table. Could not find %s in %s. %s", name, instanceName, err)
 	}
 
+	d.Set("project", project)
+
 	return nil
 }
 

google/resource_compute_address.go

@@ -77,6 +77,7 @@ func resourceComputeAddress() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -197,6 +198,7 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("address", addr.Address)
 	d.Set("self_link", ConvertSelfLinkToV1(addr.SelfLink))
 	d.Set("name", addr.Name)
+	d.Set("project", addressId.Project)
 	d.Set("region", GetResourceNameFromSelfLink(addr.Region))
 
 	return nil

google/resource_compute_autoscaler.go

@@ -120,6 +120,7 @@ func resourceComputeAutoscaler() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -316,6 +317,7 @@ func resourceComputeAutoscalerRead(d *schema.ResourceData, meta interface{}) err
 		return nil
 	}
 
+	d.Set("project", project)
 	d.Set("self_link", scaler.SelfLink)
 	d.Set("name", scaler.Name)
 	d.Set("target", scaler.Target)

google/resource_compute_backend_bucket.go

@@ -46,6 +46,7 @@ func resourceComputeBackendBucket() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -119,6 +120,7 @@ func resourceComputeBackendBucketRead(d *schema.ResourceData, meta interface{})
 	d.Set("bucket_name", bucket.BucketName)
 	d.Set("description", bucket.Description)
 	d.Set("enable_cdn", bucket.EnableCdn)
+	d.Set("project", project)
 	d.Set("self_link", bucket.SelfLink)
 
 	return nil

google/resource_compute_backend_service.go

@@ -132,6 +132,7 @@ func resourceComputeBackendService() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -236,7 +237,7 @@ func resourceComputeBackendServiceRead(d *schema.ResourceData, meta interface{})
 	d.Set("backend", flattenBackends(service.Backends))
 	d.Set("connection_draining_timeout_sec", service.ConnectionDraining.DrainingTimeoutSec)
 	d.Set("iap", flattenIap(service.Iap))
-
+	d.Set("project", project)
 	d.Set("health_checks", service.HealthChecks)
 
 	return nil

google/resource_compute_disk.go

@@ -71,6 +71,7 @@ func resourceComputeDisk() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -313,6 +314,7 @@ func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("snapshot", disk.SourceSnapshot)
 	d.Set("labels", disk.Labels)
 	d.Set("label_fingerprint", disk.LabelFingerprint)
+	d.Set("project", project)
 
 	return nil
 }

google/resource_compute_global_address.go

@@ -36,6 +36,7 @@ func resourceComputeGlobalAddress() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -98,6 +99,7 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{})
 	d.Set("name", addr.Name)
 	d.Set("ip_version", addr.IpVersion)
 	d.Set("address", addr.Address)
+	d.Set("project", project)
 	d.Set("self_link", ConvertSelfLinkToV1(addr.SelfLink))
 
 	return nil

google/resource_compute_global_forwarding_rule.go

@@ -89,6 +89,7 @@ func resourceComputeGlobalForwardingRule() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -288,6 +289,7 @@ func resourceComputeGlobalForwardingRuleRead(d *schema.ResourceData, meta interf
 	d.Set("self_link", ConvertSelfLinkToV1(frule.SelfLink))
 	d.Set("labels", frule.Labels)
 	d.Set("label_fingerprint", frule.LabelFingerprint)
+	d.Set("project", project)
 
 	return nil
 }

google/resource_compute_https_health_check.go

@@ -56,6 +56,7 @@ func resourceComputeHttpsHealthCheck() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -220,6 +221,7 @@ func resourceComputeHttpsHealthCheckRead(d *schema.ResourceData, meta interface{
 	d.Set("port", hchk.Port)
 	d.Set("timeout_sec", hchk.TimeoutSec)
 	d.Set("unhealthy_threshold", hchk.UnhealthyThreshold)
+	d.Set("project", project)
 	d.Set("self_link", hchk.SelfLink)
 
 	return nil

google/resource_compute_image.go

@@ -44,6 +44,7 @@ func resourceComputeImage() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -204,6 +205,7 @@ func resourceComputeImageRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("self_link", image.SelfLink)
 	d.Set("labels", image.Labels)
 	d.Set("label_fingerprint", image.LabelFingerprint)
+	d.Set("project", project)
 
 	return nil
 }

google/resource_compute_instance.go

@@ -410,6 +410,7 @@ func resourceComputeInstance() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -786,6 +787,11 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
 func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	instance, err := getInstance(config, d)
 	if err != nil || instance == nil {
 		return err
@@ -956,6 +962,7 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("min_cpu_platform", instance.MinCpuPlatform)
 	d.Set("self_link", ConvertSelfLinkToV1(instance.SelfLink))
 	d.Set("instance_id", fmt.Sprintf("%d", instance.Id))
+	d.Set("project", project)
 	d.SetId(instance.Name)
 
 	return nil

google/resource_compute_instance_group.go

@@ -79,6 +79,7 @@ func resourceComputeInstanceGroup() *schema.Resource {
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -232,6 +233,7 @@ func resourceComputeInstanceGroupRead(d *schema.ResourceData, meta interface{})
 	// Set computed fields
 	d.Set("network", instanceGroup.Network)
 	d.Set("size", instanceGroup.Size)
+	d.Set("project", project)
 	d.Set("self_link", instanceGroup.SelfLink)
 
 	return nil

google/resource_compute_network.go

@@ -53,6 +53,7 @@ func resourceComputeNetwork() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -117,6 +118,7 @@ func resourceComputeNetworkRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("self_link", network.SelfLink)
 	d.Set("name", network.Name)
 	d.Set("auto_create_subnetworks", network.AutoCreateSubnetworks)
+	d.Set("project", project)
 
 	return nil
 }

google/resource_compute_project_metadata.go

@@ -27,6 +27,7 @@ func resourceComputeProjectMetadata() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 		},
@@ -115,6 +116,7 @@ func resourceComputeProjectMetadataRead(d *schema.ResourceData, meta interface{}
 		return fmt.Errorf("Error setting metadata: %s", err)
 	}
 
+	d.Set("project", project)
 	d.SetId("common_metadata")
 
 	return nil

google/resource_compute_project_metadata_item.go

@@ -31,6 +31,7 @@ func resourceComputeProjectMetadataItem() *schema.Resource {
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 		},
@@ -80,6 +81,7 @@ func resourceComputeProjectMetadataItemRead(d *schema.ResourceData, meta interfa
 		return nil
 	}
 
+	d.Set("project", projectID)
 	d.Set("key", d.Id())
 	d.Set("value", val)
 

google/resource_compute_region_autoscaler.go

@@ -45,6 +45,7 @@ func resourceComputeRegionAutoscaler() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -125,6 +126,7 @@ func resourceComputeRegionAutoscalerRead(d *schema.ResourceData, meta interface{
 	d.Set("target", scaler.Target)
 	d.Set("region", GetResourceNameFromSelfLink(scaler.Region))
 	d.Set("description", scaler.Description)
+	d.Set("project", project)
 	if scaler.AutoscalingPolicy != nil {
 		d.Set("autoscaling_policy", flattenAutoscalingPolicy(scaler.AutoscalingPolicy))
 	}

google/resource_compute_region_backend_service.go

@@ -65,6 +65,7 @@ func resourceComputeRegionBackendService() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -83,6 +84,7 @@ func resourceComputeRegionBackendService() *schema.Resource {
 			"region": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -211,6 +213,8 @@ func resourceComputeRegionBackendServiceRead(d *schema.ResourceData, meta interf
 	d.Set("self_link", service.SelfLink)
 	d.Set("backend", flattenBackends(service.Backends))
 	d.Set("health_checks", service.HealthChecks)
+	d.Set("project", project)
+	d.Set("region", region)
 
 	return nil
 }

google/resource_compute_route.go

@@ -78,6 +78,7 @@ func resourceComputeRoute() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -217,6 +218,7 @@ func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("next_hop_vpn_tunnel", route.NextHopVpnTunnel)
 	d.Set("tags", route.Tags)
 	d.Set("next_hop_network", route.NextHopNetwork)
+	d.Set("project", project)
 	d.Set("self_link", route.SelfLink)
 
 	return nil

google/resource_compute_snapshot.go

@@ -68,6 +68,7 @@ func resourceComputeSnapshot() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -174,6 +175,7 @@ func resourceComputeSnapshotRead(d *schema.ResourceData, meta interface{}) error
 
 	d.Set("labels", snapshot.Labels)
 	d.Set("label_fingerprint", snapshot.LabelFingerprint)
+	d.Set("project", project)
 
 	return nil
 }

google/resource_compute_ssl_certificate.go

@@ -73,6 +73,7 @@ func resourceComputeSslCertificate() *schema.Resource {
 			"project": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 				ForceNew: true,
 			},
 
@@ -148,6 +149,7 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{})
 	d.Set("description", cert.Description)
 	d.Set("name", cert.Name)
 	d.Set("certificate", cert.Certificate)
+	d.Set("project", project)
 
 	return nil
 }