Remove wait for instances stable on IGM and RIGM deletion. (#9781) (#…

…6829) [upstream:322748e9e7f49197ba404b851cb7d3ad057d107d] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jan 9, 2024 · ba796fa · ba796fa
1 parent 1a744ca
commit ba796fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git a/.changelog/9781.txt b/.changelog/9781.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+compute: fixed an issue where we would `wait_for_instances` before deleting on `google_*_compute_instance_manager`
+```
diff --git a/google-beta/services/compute/resource_compute_instance_group_manager.go b/google-beta/services/compute/resource_compute_instance_group_manager.go
@@ -5,7 +5,6 @@ package compute
 import (
 	"fmt"
 	"log"
-	"regexp"
 	"sort"
 	"strings"
 	"time"
@@ -959,21 +958,6 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 
-	if d.Get("wait_for_instances").(bool) {
-		err := computeIGMWaitForInstanceStatus(d, meta)
-		if err != nil {
-			notFound, reErr := regexp.MatchString(`not found`, err.Error())
-			if reErr != nil {
-				return reErr
-			}
-			if notFound {
-				// manager was not found, we can exit gracefully
-				return nil
-			}
-			return err
-		}
-	}
-
 	userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
 	if err != nil {
 		return err

diff --git a/google-beta/services/compute/resource_compute_region_instance_group_manager.go b/google-beta/services/compute/resource_compute_region_instance_group_manager.go
@@ -5,7 +5,6 @@ package compute
 import (
 	"fmt"
 	"log"
-	"regexp"
 	"strings"
 	"time"
 
@@ -902,21 +901,6 @@ func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, met
 func resourceComputeRegionInstanceGroupManagerDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 
-	if d.Get("wait_for_instances").(bool) {
-		err := computeRIGMWaitForInstanceStatus(d, meta)
-		if err != nil {
-			notFound, reErr := regexp.MatchString(`not found`, err.Error())
-			if reErr != nil {
-				return reErr
-			}
-			if notFound {
-				// manager was not found, we can exit gracefully
-				return nil
-			}
-			return err
-		}
-	}
-
 	userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
 	if err != nil {
 		return err