Revert "Fix version behaviour in google_compute_instance_group (Goo…

…gleCloudPlatform#2506)"

This reverts commit d59ec0f.

third_party/terraform/resources/resource_compute_instance_group.go

@@ -71,11 +71,10 @@ func resourceComputeInstanceGroup() *schema.Resource {
 			},
 
 			"network": {
-				Type:             schema.TypeString,
-				Optional:         true,
-				Computed:         true,
-				DiffSuppressFunc: compareSelfLinkOrResourceName,
-				ForceNew:         true,
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
 			},
 
 			"project": {

third_party/terraform/resources/resource_compute_target_pool.go

@@ -216,6 +216,36 @@ func resourceComputeTargetPoolCreate(d *schema.ResourceData, meta interface{}) e
 	return resourceComputeTargetPoolRead(d, meta)
 }
 
+func calcAddRemove(from []string, to []string) ([]string, []string) {
+	add := make([]string, 0)
+	remove := make([]string, 0)
+	for _, u := range to {
+		found := false
+		for _, v := range from {
+			if u == v {
+				found = true
+				break
+			}
+		}
+		if !found {
+			add = append(add, u)
+		}
+	}
+	for _, u := range from {
+		found := false
+		for _, v := range to {
+			if u == v {
+				found = true
+				break
+			}
+		}
+		if !found {
+			remove = append(remove, u)
+		}
+	}
+	return add, remove
+}
+
 func resourceComputeTargetPoolUpdate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 

third_party/terraform/utils/utils.go.erb

@@ -542,36 +542,3 @@ func getInterconnectAttachmentLink(config *Config, project, region, ic string) (
 
 	return ic, nil
 }
-
-// Given two sets of references (with "from" values in self link form),
-// determine which need to be added or removed // during an update using
-// addX/removeX APIs.
-func calcAddRemove(from []string, to []string) (add, remove []string) {
-	add = make([]string, 0)
-	remove = make([]string, 0)
-	for _, u := range to {
-		found := false
-		for _, v := range from {
-			if compareSelfLinkOrResourceName("", v, u, nil) {
-				found = true
-				break
-			}
-		}
-		if !found {
-			add = append(add, u)
-		}
-	}
-	for _, u := range from {
-		found := false
-		for _, v := range to {
-			if compareSelfLinkOrResourceName("", u, v, nil) {
-				found = true
-				break
-			}
-		}
-		if !found {
-			remove = append(remove, u)
-		}
-	}
-	return add, remove
-}