Skip to content

Commit ba796fa

Browse files
Remove wait for instances stable on IGM and RIGM deletion. (#9781) (#6829)
[upstream:322748e9e7f49197ba404b851cb7d3ad057d107d] Signed-off-by: Modular Magician <[email protected]>
1 parent 1a744ca commit ba796fa

File tree

3 files changed

+3
-32
lines changed

3 files changed

+3
-32
lines changed

.changelog/9781.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
compute: fixed an issue where we would `wait_for_instances` before deleting on `google_*_compute_instance_manager`
3+
```

google-beta/services/compute/resource_compute_instance_group_manager.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package compute
55
import (
66
"fmt"
77
"log"
8-
"regexp"
98
"sort"
109
"strings"
1110
"time"
@@ -959,21 +958,6 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
959958
func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta interface{}) error {
960959
config := meta.(*transport_tpg.Config)
961960

962-
if d.Get("wait_for_instances").(bool) {
963-
err := computeIGMWaitForInstanceStatus(d, meta)
964-
if err != nil {
965-
notFound, reErr := regexp.MatchString(`not found`, err.Error())
966-
if reErr != nil {
967-
return reErr
968-
}
969-
if notFound {
970-
// manager was not found, we can exit gracefully
971-
return nil
972-
}
973-
return err
974-
}
975-
}
976-
977961
userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
978962
if err != nil {
979963
return err

google-beta/services/compute/resource_compute_region_instance_group_manager.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package compute
55
import (
66
"fmt"
77
"log"
8-
"regexp"
98
"strings"
109
"time"
1110

@@ -902,21 +901,6 @@ func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, met
902901
func resourceComputeRegionInstanceGroupManagerDelete(d *schema.ResourceData, meta interface{}) error {
903902
config := meta.(*transport_tpg.Config)
904903

905-
if d.Get("wait_for_instances").(bool) {
906-
err := computeRIGMWaitForInstanceStatus(d, meta)
907-
if err != nil {
908-
notFound, reErr := regexp.MatchString(`not found`, err.Error())
909-
if reErr != nil {
910-
return reErr
911-
}
912-
if notFound {
913-
// manager was not found, we can exit gracefully
914-
return nil
915-
}
916-
return err
917-
}
918-
}
919-
920904
userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
921905
if err != nil {
922906
return err

0 commit comments

Comments
 (0)