Merge pull request openshift#2497 from wking/fail-slow-error-logging

pkg/destroy/aws: Fix fail-slow error handling in deleteEC2SubnetByVPC
mtulio · Oct 11, 2019 · 3f77881 · 3f77881
2 parents f0ad4e6 + 58524d5
commit 3f77881
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/destroy/aws/aws.go b/pkg/destroy/aws/aws.go
@@ -1148,17 +1148,22 @@ 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 {
 			err = errors.Wrapf(err, "deleting EC2 subnet %s", *subnet.SubnetId)
 			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 {