public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Back out the Set changes from #1217.

Browse Source 
PR #1217 mistakenly updated the Set logic when flattening backends,
which caused some cascading errors and wasn't strictly necessary to
resolve the issue at hand. This backs out those changes, and instead
makes the smallest possible change to resolve the initial error, by
separating the logic for flattening regional backends from the logic for
flattening global backends.
This commit is contained in:
Paddy Carver 2018-03-19 12:08:58 -07:00
parent c07cb1c450
commit 53c905b99a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
google/resource_compute_backend_service.go
View File

@ -417,8 +417,8 @@ func expandBackends(configured []interface{}) ([]*compute.Backend, error) {
return backends, nil
}
func flattenBackends(backends []*compute.Backend) *schema.Set {
result := make([]interface{}, 0, len(backends))
func flattenBackends(backends []*compute.Backend) []map[string]interface{} {
result := make([]map[string]interface{}, 0, len(backends))
for _, b := range backends {
data := make(map[string]interface{})
@ -433,7 +433,7 @@ func flattenBackends(backends []*compute.Backend) *schema.Set {
result = append(result, data)
}
return schema.NewSet(resourceGoogleComputeBackendServiceBackendHash, result)
return result
}
func expandBackendService(d *schema.ResourceData) (*compute.BackendService, error) {

6
google/resource_compute_region_backend_service.go
View File

@ -339,8 +339,8 @@ func resourceGoogleComputeRegionBackendServiceBackendHash(v interface{}) int {
return hashcode.String(buf.String())
}
func flattenRegionBackends(backends []*compute.Backend) *schema.Set {
result := make([]interface{}, 0, len(backends))
func flattenRegionBackends(backends []*compute.Backend) []map[string]interface{} {
result := make([]map[string]interface{}, 0, len(backends))
for _, b := range backends {
data := make(map[string]interface{})
@ -350,5 +350,5 @@ func flattenRegionBackends(backends []*compute.Backend) *schema.Set {
result = append(result, data)
}
return schema.NewSet(resourceGoogleComputeRegionBackendServiceBackendHash, result)
return result
}