Skip to content

Bug 1747519: pkg/destroy/aws: Do not failFast for deleteEC2SecurityGroupsByVPC #2346

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
Sep 11, 2019
Merged

Bug 1747519: pkg/destroy/aws: Do not failFast for deleteEC2SecurityGroupsByVPC #2346

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
19 changes: 11 additions & 8 deletions pkg/destroy/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,15 +1188,18 @@ func deleteEC2VPC(ec2Client *ec2.EC2, elbClient *elb.ELB, elbv2Client *elbv2.ELB
return v2lbError
}

for _, helper := range [](func(client *ec2.EC2, vpc string, failFast bool, logger logrus.FieldLogger) error){
deleteEC2NATGatewaysByVPC, // not always tagged
deleteEC2NetworkInterfaceByVPC, // not always tagged
deleteEC2RouteTablesByVPC, // not always tagged
deleteEC2SecurityGroupsByVPC, // not always tagged
deleteEC2SubnetsByVPC, // not always tagged
deleteEC2VPCEndpointsByVPC, // not taggable
for _, child := range []struct {
helper func(client *ec2.EC2, vpc string, failFast bool, logger logrus.FieldLogger) error
failFast bool
}{
{helper: deleteEC2NATGatewaysByVPC, failFast: true}, // not always tagged
{helper: deleteEC2NetworkInterfaceByVPC, failFast: true}, // not always tagged
{helper: deleteEC2RouteTablesByVPC, failFast: true}, // not always tagged
{helper: deleteEC2SecurityGroupsByVPC, failFast: false}, // not always tagged
{helper: deleteEC2SubnetsByVPC, failFast: true}, // not always tagged
{helper: deleteEC2VPCEndpointsByVPC, failFast: true}, // not taggable
} {
err := helper(ec2Client, id, true, logger)
err := child.helper(ec2Client, id, child.failFast, logger)
if err != nil {
return err
}
Expand Down