From 58524d549227174767884a568cb4e5d31c73bee7 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 10 Oct 2019 16:55:00 -0700
Subject: [PATCH] pkg/destroy/aws: Fix fail-slow error handling in
 deleteEC2SubnetByVPC

Fix a bug from 37a7f49c77 (pkg/destroy/aws: Delete subnets by VPC,
2019-08-13, #2214), where failFast=false lead to all deleteEC2Subnet
errors being ignored.  Luckily we have 'failFast: true' for them, so
no exposed change, but fixing this bug protects us from exposing it if
we toggle failFast in the future.
---
 pkg/destroy/aws/aws.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/destroy/aws/aws.go b/pkg/destroy/aws/aws.go
index 8cc486949f9..4dd5d953534 100644
--- a/pkg/destroy/aws/aws.go
+++ b/pkg/destroy/aws/aws.go
@@ -1148,6 +1148,7 @@ func deleteEC2SubnetsByVPC(client *ec2.EC2, vpc string, failFast bool, logger lo
 		return err
 	}
 
+	var lastError error
 	for _, subnet := range results.Subnets {
 		err := deleteEC2Subnet(client, *subnet.SubnetId, logger.WithField("subnet", *subnet.SubnetId))
 		if err != nil {
@@ -1155,10 +1156,14 @@ func deleteEC2SubnetsByVPC(client *ec2.EC2, vpc string, failFast bool, logger lo
 			if failFast {
 				return err
 			}
+			if lastError != nil {
+				logger.Debug(lastError)
+			}
+			lastError = err
 		}
 	}
 
-	return nil
+	return lastError
 }
 
 func deleteEC2Volume(client *ec2.EC2, id string, logger logrus.FieldLogger) error {