compute: used net.IP.Equal vs bytes.Equal for IP comparison (GoogleCloudPlatform#12279)

wyardley · zeleena · commit 3911e25714f8 · 2024-11-18T22:59:28.000Z
diff --git a/mmv1/templates/terraform/constants/compute_forwarding_rule.go.tmpl b/mmv1/templates/terraform/constants/compute_forwarding_rule.go.tmpl
@@ -51,7 +51,7 @@ func InternalIpDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {
 			addr_equality = true
 		} else {
 			// old and new are IP addresses
-			addr_equality = bytes.Equal(addr_old, addr_new)
+			addr_equality = net.IP.Equal(addr_old, addr_new)
 		}
 	}
 
@@ -64,4 +64,4 @@ func InternalIpDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {
 	}
 
 	return addr_equality && netmask_equality
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func InternalIpDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {`
`51`	`51`	`addr_equality = true`
`52`	`52`	`} else {`
`53`	`53`	`// old and new are IP addresses`
`54`		`- addr_equality = bytes.Equal(addr_old, addr_new)`
	`54`	`+ addr_equality = net.IP.Equal(addr_old, addr_new)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`@@ -64,4 +64,4 @@ func InternalIpDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`return addr_equality && netmask_equality`
`67`		`-}`
	`67`	`+}`