If a router interface or peer is the last one, ensure it's removed. (#…

…1877)
hashicorp · Aug 16, 2018 · 0909aa5 · 0909aa5
1 parent a79fbac
commit 0909aa5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/google/resource_compute_router_interface.go b/google/resource_compute_router_interface.go
@@ -240,6 +240,10 @@ func resourceComputeRouterInterfaceDelete(d *schema.ResourceData, meta interface
 		Interfaces: newIfaces,
 	}
 
+	if len(newIfaces) == 0 {
+		patchRouter.ForceSendFields = append(patchRouter.ForceSendFields, "Interfaces")
+	}
+
 	log.Printf("[DEBUG] Updating router %s/%s with interfaces: %+v", region, routerName, newIfaces)
 	op, err := routersService.Patch(project, region, router.Name, patchRouter).Do()
 	if err != nil {

diff --git a/google/resource_compute_router_peer.go b/google/resource_compute_router_peer.go
@@ -261,6 +261,10 @@ func resourceComputeRouterPeerDelete(d *schema.ResourceData, meta interface{}) e
 		BgpPeers: newPeers,
 	}
 
+	if len(newPeers) == 0 {
+		patchRouter.ForceSendFields = append(patchRouter.ForceSendFields, "BgpPeers")
+	}
+
 	log.Printf("[DEBUG] Updating router %s/%s with peers: %+v", region, routerName, newPeers)
 	op, err := routersService.Patch(project, region, router.Name, patchRouter).Do()
 	if err != nil {