Skip to content

pkg/destroy/aws: Destroy all instances not terminated #1403

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
Mar 12, 2019
Merged

pkg/destroy/aws: Destroy all instances not terminated #1403

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
12 changes: 4 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 @@ -572,14 +572,6 @@ func deleteEC2ElasticIP(client *ec2.EC2, id string, logger logrus.FieldLogger) e
func deleteEC2Instance(ec2Client *ec2.EC2, iamClient *iam.IAM, id string, logger logrus.FieldLogger) error {
response, err := ec2Client.DescribeInstances(&ec2.DescribeInstancesInput{
InstanceIds: []*string{aws.String(id)},

// only fetch instances in 'running|pending' state since 'terminated' ones take a while to really get cleaned up
Filters: []*ec2.Filter{
{
Name: aws.String("instance-state-name"),
Values: []*string{aws.String("running"), aws.String("pending")},
},
},
})
if err != nil {
if err.(awserr.Error).Code() == "InvalidInstanceID.NotFound" {
Expand All @@ -590,6 +582,10 @@ func deleteEC2Instance(ec2Client *ec2.EC2, iamClient *iam.IAM, id string, logger

for _, reservation := range response.Reservations {
for _, instance := range reservation.Instances {
// Skip 'terminated' instances since they take a while to really get cleaned up
if *instance.State.Name == "terminated" {
continue
}
if instance.IamInstanceProfile != nil {
parsed, err := arn.Parse(*instance.IamInstanceProfile.Arn)
if err != nil {
Expand Down