Fix an edge-case in forceNewIfNetworkIPNotUpdatable function (#11653)

modular-magician · modular-magician · commit 958e77461896 · 2024-09-06T16:25:47.000Z
[upstream:a13ca6505fa3c36cab0ab4550332c76a8592ad96]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/11653.txt b/.changelog/11653.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: setting `network_ip` to "" will no longer cause diff and will be treated the same as `null`
+```
diff --git a/google-beta/services/compute/resource_compute_instance.go b/google-beta/services/compute/resource_compute_instance.go
@@ -146,7 +146,7 @@ func forceNewIfNetworkIPNotUpdatableFunc(d tpgresource.TerraformResourceDiff) er
 		oldS, newS := d.GetChange(subnetworkKey)
 		subnetworkProjectKey := prefix + ".subnetwork_project"
 		networkIPKey := prefix + ".network_ip"
-		if d.HasChange(networkIPKey) {
+		if d.HasChange(networkIPKey) && d.Get(networkIPKey).(string) != "" {
 			if tpgresource.CompareSelfLinkOrResourceName("", oldS.(string), newS.(string), nil) && !d.HasChange(subnetworkProjectKey) && tpgresource.CompareSelfLinkOrResourceName("", oldN.(string), newN.(string), nil) {
 				if err := d.ForceNew(networkIPKey); err != nil {
 					return err

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:enhancement
	`2`	+compute: setting `network_ip` to "" will no longer cause diff and will be treated the same as `null`
	`3`	+```