Merge pull request #1221 from terraform-providers/paddy_backout_1217_backends

Back out the Set changes from #1217.
This commit is contained in:
Paddy 2018-03-19 12:52:20 -07:00 committed by GitHub
commit dce6757791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

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) {

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
}