mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-06 18:51:13 +00:00
Back out the Set changes from #1217.
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:
parent
c07cb1c450
commit
53c905b99a
@ -417,8 +417,8 @@ func expandBackends(configured []interface{}) ([]*compute.Backend, error) {
|
|||||||
return backends, nil
|
return backends, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func flattenBackends(backends []*compute.Backend) *schema.Set {
|
func flattenBackends(backends []*compute.Backend) []map[string]interface{} {
|
||||||
result := make([]interface{}, 0, len(backends))
|
result := make([]map[string]interface{}, 0, len(backends))
|
||||||
|
|
||||||
for _, b := range backends {
|
for _, b := range backends {
|
||||||
data := make(map[string]interface{})
|
data := make(map[string]interface{})
|
||||||
@ -433,7 +433,7 @@ func flattenBackends(backends []*compute.Backend) *schema.Set {
|
|||||||
result = append(result, data)
|
result = append(result, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
return schema.NewSet(resourceGoogleComputeBackendServiceBackendHash, result)
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
func expandBackendService(d *schema.ResourceData) (*compute.BackendService, error) {
|
func expandBackendService(d *schema.ResourceData) (*compute.BackendService, error) {
|
||||||
|
@ -339,8 +339,8 @@ func resourceGoogleComputeRegionBackendServiceBackendHash(v interface{}) int {
|
|||||||
return hashcode.String(buf.String())
|
return hashcode.String(buf.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
func flattenRegionBackends(backends []*compute.Backend) *schema.Set {
|
func flattenRegionBackends(backends []*compute.Backend) []map[string]interface{} {
|
||||||
result := make([]interface{}, 0, len(backends))
|
result := make([]map[string]interface{}, 0, len(backends))
|
||||||
|
|
||||||
for _, b := range backends {
|
for _, b := range backends {
|
||||||
data := make(map[string]interface{})
|
data := make(map[string]interface{})
|
||||||
@ -350,5 +350,5 @@ func flattenRegionBackends(backends []*compute.Backend) *schema.Set {
|
|||||||
result = append(result, data)
|
result = append(result, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
return schema.NewSet(resourceGoogleComputeRegionBackendServiceBackendHash, result)
|
return result
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user