Merge pull request #1221 from terraform-providers/paddy_backout_1217_…

…backends Back out the Set changes from #1217.
hashicorp · Mar 19, 2018 · dce6757 · dce6757
2 parents c07cb1c + 53c905b
commit dce6757
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/google/resource_compute_backend_service.go b/google/resource_compute_backend_service.go
@@ -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) {

diff --git a/google/resource_compute_region_backend_service.go b/google/resource_compute_region_backend_service.go
@@ -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
 }