Merge pull request docker-archive-public#3362 from nathanleclaire/fix_dangling_amazonec2_ssh_key

nathanleclaire · nathanleclaire · commit 4e898b180615 · 2016-04-25T11:48:35.000-07:00
Ensure that attempt to remove instance and SSH key both go through
diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go
@@ -748,16 +748,23 @@ func (d *Driver) Kill() error {
 }
 
 func (d *Driver) Remove() error {
+	multierr := mcnutils.MultiError{
+		Errs: []error{},
+	}
+
 	if err := d.terminate(); err != nil {
-		return fmt.Errorf("unable to terminate instance: %s", err)
+		multierr.Errs = append(multierr.Errs, err)
 	}
 
-	// remove keypair
 	if err := d.deleteKeyPair(); err != nil {
-		return fmt.Errorf("unable to remove key pair: %s", err)
+		multierr.Errs = append(multierr.Errs, err)
 	}
 
-	return nil
+	if len(multierr.Errs) == 0 {
+		return nil
+	}
+
+	return multierr
 }
 
 func (d *Driver) getInstance() (*ec2.Instance, error) {
diff --git a/libmachine/mcnutils/utils.go b/libmachine/mcnutils/utils.go
@@ -11,6 +11,18 @@ import (
 	"time"
 )
 
+type MultiError struct {
+	Errs []error
+}
+
+func (e MultiError) Error() string {
+	aggregate := ""
+	for _, err := range e.Errs {
+		aggregate += err.Error() + "\n"
+	}
+	return aggregate
+}
+
 // GetHomeDir returns the home directory
 // TODO: Having this here just strikes me as dangerous, but some of the drivers
 // depend on it ;_;

Original file line number	Diff line number	Diff line change
`@@ -748,16 +748,23 @@ func (d *Driver) Kill() error {`
`748`	`748`	`}`
`749`	`749`
`750`	`750`	`func (d *Driver) Remove() error {`
	`751`	`+ multierr := mcnutils.MultiError{`
	`752`	`+ Errs: []error{},`
	`753`	`+ }`
	`754`	`+`
`751`	`755`	`if err := d.terminate(); err != nil {`
`752`		`- return fmt.Errorf("unable to terminate instance: %s", err)`
	`756`	`+ multierr.Errs = append(multierr.Errs, err)`
`753`	`757`	`}`
`754`	`758`
`755`		`- // remove keypair`
`756`	`759`	`if err := d.deleteKeyPair(); err != nil {`
`757`		`- return fmt.Errorf("unable to remove key pair: %s", err)`
	`760`	`+ multierr.Errs = append(multierr.Errs, err)`
`758`	`761`	`}`
`759`	`762`
`760`		`- return nil`
	`763`	`+ if len(multierr.Errs) == 0 {`
	`764`	`+ return nil`
	`765`	`+ }`
	`766`	`+`
	`767`	`+ return multierr`
`761`	`768`	`}`
`762`	`769`
`763`	`770`	`func (d Driver) getInstance() (ec2.Instance, error) {`