Skip to content

pkg/destroy/aws: Fix fail-slow error handling in deleteEC2SubnetByVPC #2497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Oct 11, 2019
Merged

pkg/destroy/aws: Fix fail-slow error handling in deleteEC2SubnetByVPC #2497

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/destroy/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down