Skip to content

Commit 6c5d6b7

Browse files
rosborosbo
authored
Store project and region in state (#784)
* Store project and region in state * Delete unused project in runtimeconfig_variable
1 parent 9930daa commit 6c5d6b7

File tree

52 files changed

+150
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+150
-15
lines changed

‎google/resource_bigquery_dataset.go

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func resourceBigQueryDataset() *schema.Resource {
4848
"project": {
4949
Type: schema.TypeString,
5050
Optional: true,
51+
Computed: true,
5152
ForceNew: true,
5253
},
5354

@@ -227,6 +228,7 @@ func resourceBigQueryDatasetRead(d *schema.ResourceData, meta interface{}) error
227228
return handleNotFoundError(err, d, fmt.Sprintf("BigQuery dataset %q", datasetID))
228229
}
229230

231+
d.Set("project", projectID)
230232
d.Set("etag", res.Etag)
231233
d.Set("labels", res.Labels)
232234
d.Set("self_link", res.SelfLink)

‎google/resource_bigquery_table.go

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func resourceBigQueryTable() *schema.Resource {
4242
"project": {
4343
Type: schema.TypeString,
4444
Optional: true,
45+
Computed: true,
4546
ForceNew: true,
4647
},
4748

@@ -316,6 +317,7 @@ func resourceBigQueryTableRead(d *schema.ResourceData, meta interface{}) error {
316317
return handleNotFoundError(err, d, fmt.Sprintf("BigQuery table %q", tableID))
317318
}
318319

320+
d.Set("project", projectID)
319321
d.Set("description", res.Description)
320322
d.Set("expiration_time", res.ExpirationTime)
321323
d.Set("friendly_name", res.FriendlyName)

‎google/resource_bigtable_instance.go

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func resourceBigtableInstance() *schema.Resource {
6868
"project": {
6969
Type: schema.TypeString,
7070
Optional: true,
71+
Computed: true,
7172
ForceNew: true,
7273
},
7374
},
@@ -160,6 +161,7 @@ func resourceBigtableInstanceRead(d *schema.ResourceData, meta interface{}) erro
160161
return fmt.Errorf("Error retrieving instance. Could not find %s. %s", d.Id(), err)
161162
}
162163

164+
d.Set("project", project)
163165
d.Set("name", instance.Name)
164166
d.Set("display_name", instance.DisplayName)
165167

‎google/resource_bigtable_table.go

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func resourceBigtableTable() *schema.Resource {
3838
"project": {
3939
Type: schema.TypeString,
4040
Optional: true,
41+
Computed: true,
4142
ForceNew: true,
4243
},
4344
},
@@ -109,6 +110,8 @@ func resourceBigtableTableRead(d *schema.ResourceData, meta interface{}) error {
109110
return fmt.Errorf("Error retrieving table. Could not find %s in %s. %s", name, instanceName, err)
110111
}
111112

113+
d.Set("project", project)
114+
112115
return nil
113116
}
114117

‎google/resource_compute_address.go

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ func resourceComputeAddress() *schema.Resource {
7777
"project": &schema.Schema{
7878
Type: schema.TypeString,
7979
Optional: true,
80+
Computed: true,
8081
ForceNew: true,
8182
},
8283

@@ -197,6 +198,7 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error
197198
d.Set("address", addr.Address)
198199
d.Set("self_link", ConvertSelfLinkToV1(addr.SelfLink))
199200
d.Set("name", addr.Name)
201+
d.Set("project", addressId.Project)
200202
d.Set("region", GetResourceNameFromSelfLink(addr.Region))
201203

202204
return nil

‎google/resource_compute_autoscaler.go

+2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ func resourceComputeAutoscaler() *schema.Resource {
120120
"project": &schema.Schema{
121121
Type: schema.TypeString,
122122
Optional: true,
123+
Computed: true,
123124
ForceNew: true,
124125
},
125126

@@ -316,6 +317,7 @@ func resourceComputeAutoscalerRead(d *schema.ResourceData, meta interface{}) err
316317
return nil
317318
}
318319

320+
d.Set("project", project)
319321
d.Set("self_link", scaler.SelfLink)
320322
d.Set("name", scaler.Name)
321323
d.Set("target", scaler.Target)

‎google/resource_compute_backend_bucket.go

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ func resourceComputeBackendBucket() *schema.Resource {
4646
"project": &schema.Schema{
4747
Type: schema.TypeString,
4848
Optional: true,
49+
Computed: true,
4950
ForceNew: true,
5051
},
5152

@@ -119,6 +120,7 @@ func resourceComputeBackendBucketRead(d *schema.ResourceData, meta interface{})
119120
d.Set("bucket_name", bucket.BucketName)
120121
d.Set("description", bucket.Description)
121122
d.Set("enable_cdn", bucket.EnableCdn)
123+
d.Set("project", project)
122124
d.Set("self_link", bucket.SelfLink)
123125

124126
return nil

‎google/resource_compute_backend_service.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ func resourceComputeBackendService() *schema.Resource {
132132
"project": &schema.Schema{
133133
Type: schema.TypeString,
134134
Optional: true,
135+
Computed: true,
135136
ForceNew: true,
136137
},
137138

@@ -236,7 +237,7 @@ func resourceComputeBackendServiceRead(d *schema.ResourceData, meta interface{})
236237
d.Set("backend", flattenBackends(service.Backends))
237238
d.Set("connection_draining_timeout_sec", service.ConnectionDraining.DrainingTimeoutSec)
238239
d.Set("iap", flattenIap(service.Iap))
239-
240+
d.Set("project", project)
240241
d.Set("health_checks", service.HealthChecks)
241242

242243
return nil

‎google/resource_compute_disk.go

+2
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ func resourceComputeDisk() *schema.Resource {
7171
"project": &schema.Schema{
7272
Type: schema.TypeString,
7373
Optional: true,
74+
Computed: true,
7475
ForceNew: true,
7576
},
7677

@@ -313,6 +314,7 @@ func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error {
313314
d.Set("snapshot", disk.SourceSnapshot)
314315
d.Set("labels", disk.Labels)
315316
d.Set("label_fingerprint", disk.LabelFingerprint)
317+
d.Set("project", project)
316318

317319
return nil
318320
}

‎google/resource_compute_global_address.go

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func resourceComputeGlobalAddress() *schema.Resource {
3636
"project": &schema.Schema{
3737
Type: schema.TypeString,
3838
Optional: true,
39+
Computed: true,
3940
ForceNew: true,
4041
},
4142

@@ -98,6 +99,7 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{})
9899
d.Set("name", addr.Name)
99100
d.Set("ip_version", addr.IpVersion)
100101
d.Set("address", addr.Address)
102+
d.Set("project", project)
101103
d.Set("self_link", ConvertSelfLinkToV1(addr.SelfLink))
102104

103105
return nil

‎google/resource_compute_global_forwarding_rule.go

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ func resourceComputeGlobalForwardingRule() *schema.Resource {
8989
"project": &schema.Schema{
9090
Type: schema.TypeString,
9191
Optional: true,
92+
Computed: true,
9293
ForceNew: true,
9394
},
9495

@@ -288,6 +289,7 @@ func resourceComputeGlobalForwardingRuleRead(d *schema.ResourceData, meta interf
288289
d.Set("self_link", ConvertSelfLinkToV1(frule.SelfLink))
289290
d.Set("labels", frule.Labels)
290291
d.Set("label_fingerprint", frule.LabelFingerprint)
292+
d.Set("project", project)
291293

292294
return nil
293295
}

‎google/resource_compute_https_health_check.go

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ func resourceComputeHttpsHealthCheck() *schema.Resource {
5656
"project": &schema.Schema{
5757
Type: schema.TypeString,
5858
Optional: true,
59+
Computed: true,
5960
ForceNew: true,
6061
},
6162

@@ -220,6 +221,7 @@ func resourceComputeHttpsHealthCheckRead(d *schema.ResourceData, meta interface{
220221
d.Set("port", hchk.Port)
221222
d.Set("timeout_sec", hchk.TimeoutSec)
222223
d.Set("unhealthy_threshold", hchk.UnhealthyThreshold)
224+
d.Set("project", project)
223225
d.Set("self_link", hchk.SelfLink)
224226

225227
return nil

‎google/resource_compute_image.go

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ func resourceComputeImage() *schema.Resource {
4444
"project": &schema.Schema{
4545
Type: schema.TypeString,
4646
Optional: true,
47+
Computed: true,
4748
ForceNew: true,
4849
},
4950

@@ -204,6 +205,7 @@ func resourceComputeImageRead(d *schema.ResourceData, meta interface{}) error {
204205
d.Set("self_link", image.SelfLink)
205206
d.Set("labels", image.Labels)
206207
d.Set("label_fingerprint", image.LabelFingerprint)
208+
d.Set("project", project)
207209

208210
return nil
209211
}

‎google/resource_compute_instance.go

+7
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ func resourceComputeInstance() *schema.Resource {
410410
"project": &schema.Schema{
411411
Type: schema.TypeString,
412412
Optional: true,
413+
Computed: true,
413414
ForceNew: true,
414415
},
415416

@@ -786,6 +787,11 @@ func resourceComputeInstanceCreate(d *schema.ResourceData, meta interface{}) err
786787
func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error {
787788
config := meta.(*Config)
788789

790+
project, err := getProject(d, config)
791+
if err != nil {
792+
return err
793+
}
794+
789795
instance, err := getInstance(config, d)
790796
if err != nil || instance == nil {
791797
return err
@@ -956,6 +962,7 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
956962
d.Set("min_cpu_platform", instance.MinCpuPlatform)
957963
d.Set("self_link", ConvertSelfLinkToV1(instance.SelfLink))
958964
d.Set("instance_id", fmt.Sprintf("%d", instance.Id))
965+
d.Set("project", project)
959966
d.SetId(instance.Name)
960967

961968
return nil

‎google/resource_compute_instance_group.go

+2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ func resourceComputeInstanceGroup() *schema.Resource {
7979
"project": {
8080
Type: schema.TypeString,
8181
Optional: true,
82+
Computed: true,
8283
ForceNew: true,
8384
},
8485

@@ -232,6 +233,7 @@ func resourceComputeInstanceGroupRead(d *schema.ResourceData, meta interface{})
232233
// Set computed fields
233234
d.Set("network", instanceGroup.Network)
234235
d.Set("size", instanceGroup.Size)
236+
d.Set("project", project)
235237
d.Set("self_link", instanceGroup.SelfLink)
236238

237239
return nil

‎google/resource_compute_network.go

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ func resourceComputeNetwork() *schema.Resource {
5353
"project": &schema.Schema{
5454
Type: schema.TypeString,
5555
Optional: true,
56+
Computed: true,
5657
ForceNew: true,
5758
},
5859

@@ -117,6 +118,7 @@ func resourceComputeNetworkRead(d *schema.ResourceData, meta interface{}) error
117118
d.Set("self_link", network.SelfLink)
118119
d.Set("name", network.Name)
119120
d.Set("auto_create_subnetworks", network.AutoCreateSubnetworks)
121+
d.Set("project", project)
120122

121123
return nil
122124
}

‎google/resource_compute_project_metadata.go

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ func resourceComputeProjectMetadata() *schema.Resource {
2727
"project": &schema.Schema{
2828
Type: schema.TypeString,
2929
Optional: true,
30+
Computed: true,
3031
ForceNew: true,
3132
},
3233
},
@@ -115,6 +116,7 @@ func resourceComputeProjectMetadataRead(d *schema.ResourceData, meta interface{}
115116
return fmt.Errorf("Error setting metadata: %s", err)
116117
}
117118

119+
d.Set("project", project)
118120
d.SetId("common_metadata")
119121

120122
return nil

‎google/resource_compute_project_metadata_item.go

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func resourceComputeProjectMetadataItem() *schema.Resource {
3131
"project": {
3232
Type: schema.TypeString,
3333
Optional: true,
34+
Computed: true,
3435
ForceNew: true,
3536
},
3637
},
@@ -80,6 +81,7 @@ func resourceComputeProjectMetadataItemRead(d *schema.ResourceData, meta interfa
8081
return nil
8182
}
8283

84+
d.Set("project", projectID)
8385
d.Set("key", d.Id())
8486
d.Set("value", val)
8587

‎google/resource_compute_region_autoscaler.go

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ func resourceComputeRegionAutoscaler() *schema.Resource {
4545
"project": &schema.Schema{
4646
Type: schema.TypeString,
4747
Optional: true,
48+
Computed: true,
4849
ForceNew: true,
4950
},
5051

@@ -125,6 +126,7 @@ func resourceComputeRegionAutoscalerRead(d *schema.ResourceData, meta interface{
125126
d.Set("target", scaler.Target)
126127
d.Set("region", GetResourceNameFromSelfLink(scaler.Region))
127128
d.Set("description", scaler.Description)
129+
d.Set("project", project)
128130
if scaler.AutoscalingPolicy != nil {
129131
d.Set("autoscaling_policy", flattenAutoscalingPolicy(scaler.AutoscalingPolicy))
130132
}

‎google/resource_compute_region_backend_service.go

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ func resourceComputeRegionBackendService() *schema.Resource {
6565
"project": &schema.Schema{
6666
Type: schema.TypeString,
6767
Optional: true,
68+
Computed: true,
6869
ForceNew: true,
6970
},
7071

@@ -83,6 +84,7 @@ func resourceComputeRegionBackendService() *schema.Resource {
8384
"region": &schema.Schema{
8485
Type: schema.TypeString,
8586
Optional: true,
87+
Computed: true,
8688
ForceNew: true,
8789
},
8890

@@ -211,6 +213,8 @@ func resourceComputeRegionBackendServiceRead(d *schema.ResourceData, meta interf
211213
d.Set("self_link", service.SelfLink)
212214
d.Set("backend", flattenBackends(service.Backends))
213215
d.Set("health_checks", service.HealthChecks)
216+
d.Set("project", project)
217+
d.Set("region", region)
214218

215219
return nil
216220
}

‎google/resource_compute_route.go

+2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ func resourceComputeRoute() *schema.Resource {
7878
"project": &schema.Schema{
7979
Type: schema.TypeString,
8080
Optional: true,
81+
Computed: true,
8182
ForceNew: true,
8283
},
8384

@@ -217,6 +218,7 @@ func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error {
217218
d.Set("next_hop_vpn_tunnel", route.NextHopVpnTunnel)
218219
d.Set("tags", route.Tags)
219220
d.Set("next_hop_network", route.NextHopNetwork)
221+
d.Set("project", project)
220222
d.Set("self_link", route.SelfLink)
221223

222224
return nil

‎google/resource_compute_snapshot.go

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func resourceComputeSnapshot() *schema.Resource {
6868
"project": &schema.Schema{
6969
Type: schema.TypeString,
7070
Optional: true,
71+
Computed: true,
7172
ForceNew: true,
7273
},
7374

@@ -174,6 +175,7 @@ func resourceComputeSnapshotRead(d *schema.ResourceData, meta interface{}) error
174175

175176
d.Set("labels", snapshot.Labels)
176177
d.Set("label_fingerprint", snapshot.LabelFingerprint)
178+
d.Set("project", project)
177179

178180
return nil
179181
}

‎google/resource_compute_ssl_certificate.go

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ func resourceComputeSslCertificate() *schema.Resource {
7373
"project": &schema.Schema{
7474
Type: schema.TypeString,
7575
Optional: true,
76+
Computed: true,
7677
ForceNew: true,
7778
},
7879

@@ -148,6 +149,7 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{})
148149
d.Set("description", cert.Description)
149150
d.Set("name", cert.Name)
150151
d.Set("certificate", cert.Certificate)
152+
d.Set("project", project)
151153

152154
return nil
153155
}

0 commit comments

Comments
 (0)