fix: respect --timeout flag for all AWS resource deletion waiters

Previously, many AWS resource deletion waiters had hardcoded timeouts
that ignored the user-provided --timeout flag. This change:

- Adds GetTimeoutWithDefault() helper to BaseAwsResource
- Defines default timeout constants in each resource's types file
- Updates all waiters to use the configured timeout or default

Affected resources:
- RDS instances and clusters (was 1 min / 15 min, now 30 min default)
- Elasticache (was 15 min)
- ECS Services (was 15 min)
- ASG (was 5 min)
- EC2 instances (was 15 min)
- EC2 Network Interfaces (was 5 min)
- EC2 VPC (was 5 min)
- EBS volumes (was 5 min)
- EKS clusters, node groups, fargate profiles (was 15 min)
- ELBv2 (was 15 min)
- Redshift (was 5 min)
- Backup Vault (was 1 min)
- OpenSearch (was 5 min)
- NAT Gateway (was 5 min)

Fixes #964

Author: james00012

aws/resources/asg.go

@@ -2,7 +2,6 @@ package resources
 
 import (
 	"context"
-	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/autoscaling"
@@ -72,7 +71,7 @@ func (ag *ASGroups) nukeAll(groupNames []*string) error {
 		waiter := autoscaling.NewGroupNotExistsWaiter(ag.Client)
 		err := waiter.Wait(ag.Context, &autoscaling.DescribeAutoScalingGroupsInput{
 			AutoScalingGroupNames: deletedGroupNames,
-		}, 5*time.Minute)
+		}, ag.GetTimeoutWithDefault(asgDefaultWaitTimeout))
 
 		if err != nil {
 			logging.Errorf("[Failed] %s", err)

aws/resources/asg_types.go

@@ -2,13 +2,16 @@ package resources
 
 import (
 	"context"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/autoscaling"
 	"github.com/gruntwork-io/cloud-nuke/config"
 	"github.com/gruntwork-io/go-commons/errors"
 )
 
+const asgDefaultWaitTimeout = 5 * time.Minute
+
 type ASGroupsAPI interface {
 	DescribeAutoScalingGroups(ctx context.Context, params *autoscaling.DescribeAutoScalingGroupsInput, optFns ...func(*autoscaling.Options)) (*autoscaling.DescribeAutoScalingGroupsOutput, error)
 	DeleteAutoScalingGroup(ctx context.Context, params *autoscaling.DeleteAutoScalingGroupInput, optFns ...func(*autoscaling.Options)) (*autoscaling.DeleteAutoScalingGroupOutput, error)

aws/resources/backup_vault.go

@@ -97,7 +97,8 @@ func (bv *BackupVault) nukeRecoveryPoints(name *string) error {
 }
 
 func (bv *BackupVault) WaitUntilRecoveryPointsDeleted(name *string) error {
-	timeoutCtx, cancel := context.WithTimeout(bv.Context, 1*time.Minute)
+	waitTimeout := bv.GetTimeoutWithDefault(backupVaultDefaultWaitTimeout)
+	timeoutCtx, cancel := context.WithTimeout(bv.Context, waitTimeout)
 	defer cancel()
 
 	ticker := time.NewTicker(1 * time.Second)
@@ -106,7 +107,7 @@ func (bv *BackupVault) WaitUntilRecoveryPointsDeleted(name *string) error {
 	for {
 		select {
 		case <-timeoutCtx.Done():
-			return fmt.Errorf("recovery point deletion check timed out after 1 minute")
+			return fmt.Errorf("recovery point deletion check timed out after %v", waitTimeout)
 		case <-ticker.C:
 			output, err := bv.Client.ListRecoveryPointsByBackupVault(bv.Context, &backup.ListRecoveryPointsByBackupVaultInput{
 				BackupVaultName: name,

aws/resources/backup_vault_types.go

@@ -2,13 +2,16 @@ package resources
 
 import (
 	"context"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/backup"
 	"github.com/gruntwork-io/cloud-nuke/config"
 	"github.com/gruntwork-io/go-commons/errors"
 )
 
+const backupVaultDefaultWaitTimeout = 1 * time.Minute
+
 type BackupVaultAPI interface {
 	DeleteBackupVault(ctx context.Context, params *backup.DeleteBackupVaultInput, optFns ...func(*backup.Options)) (*backup.DeleteBackupVaultOutput, error)
 	DeleteRecoveryPoint(ctx context.Context, params *backup.DeleteRecoveryPointInput, optFns ...func(*backup.Options)) (*backup.DeleteRecoveryPointOutput, error)

aws/resources/base_resource.go

@@ -108,3 +108,11 @@ func (br *BaseAwsResource) IsNukable(identifier string) (bool, error) {
 
 	return true, nil
 }
+
+// GetTimeoutWithDefault returns the configured timeout or the provided default if not set
+func (br *BaseAwsResource) GetTimeoutWithDefault(defaultTimeout time.Duration) time.Duration {
+	if br.Timeout == 0 {
+		return defaultTimeout
+	}
+	return br.Timeout
+}

aws/resources/ebs.go

@@ -3,7 +3,6 @@ package resources
 import (
 	"context"
 	goerr "errors"
-	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -118,7 +117,7 @@ func (ev *EBSVolumes) nukeAll(volumeIds []*string) error {
 		waiter := ec2.NewVolumeDeletedWaiter(ev.Client)
 		err := waiter.Wait(ev.Context, &ec2.DescribeVolumesInput{
 			VolumeIds: aws.ToStringSlice(deletedVolumeIDs),
-		}, 5*time.Minute)
+		}, ev.GetTimeoutWithDefault(ebsDefaultWaitTimeout))
 		if err != nil {
 			logging.Debugf("[Failed] %s", err)
 			return errors.WithStackTrace(err)

aws/resources/ebs_types.go

@@ -2,13 +2,16 @@ package resources
 
 import (
 	"context"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/gruntwork-io/cloud-nuke/config"
 	"github.com/gruntwork-io/go-commons/errors"
 )
 
+const ebsDefaultWaitTimeout = 5 * time.Minute
+
 type EBSVolumesAPI interface {
 	DescribeVolumes(ctx context.Context, params *ec2.DescribeVolumesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeVolumesOutput, error)
 	DeleteVolume(ctx context.Context, params *ec2.DeleteVolumeInput, optFns ...func(*ec2.Options)) (*ec2.DeleteVolumeOutput, error)

aws/resources/ec2.go

@@ -2,7 +2,6 @@ package resources
 
 import (
 	"context"
-	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -161,7 +160,7 @@ func (ei *EC2Instances) nukeAll(instanceIds []*string) error {
 				Values: aws.ToStringSlice(instanceIds),
 			},
 		},
-	}, 15*time.Minute)
+	}, ei.GetTimeoutWithDefault(ec2DefaultWaitTimeout))
 
 	if err != nil {
 		logging.Debugf("[Failed] %s", err)

aws/resources/ec2_network_interface.go

@@ -212,7 +212,7 @@ func (ni *NetworkInterface) nukeInstance(id *string) error {
 	waiter := ec2.NewInstanceTerminatedWaiter(ni.Client)
 	err = waiter.Wait(ni.Context, &ec2.DescribeInstancesInput{
 		InstanceIds: []string{instanceID},
-	}, 5*time.Minute)
+	}, ni.GetTimeoutWithDefault(ec2NetworkInterfaceDefaultWaitTimeout))
 	if err != nil {
 		logging.Debugf("[nukeInstance] Instance termination waiting failed for instance %s: %v", instanceID, err)
 		return errors.WithStackTrace(err)

aws/resources/ec2_network_interface_types.go

@@ -2,6 +2,7 @@ package resources
 
 import (
 	"context"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -10,7 +11,8 @@ import (
 )
 
 const (
-	NetworkInterfaceTypeInterface = "interface"
+	NetworkInterfaceTypeInterface         = "interface"
+	ec2NetworkInterfaceDefaultWaitTimeout = 5 * time.Minute
 )
 
 type NetworkInterfaceAPI interface {