fix droplet cleanup bug

bohendo · bohendo · commit daf1d252a00b · 2023-10-10T10:30:13.000-04:00
diff --git a/cmd/cloudexec/clean.go b/cmd/cloudexec/clean.go
@@ -12,11 +12,11 @@ import (
 func ConfirmDeleteDroplets(config config.Config, dropletName string, instanceToJobs map[int64][]int64) error {
 	instances, err := do.GetDropletsByName(config, dropletName)
 	if err != nil {
-		return fmt.Errorf("Failed to get droplet by name: %w", err)
+		return fmt.Errorf("Failed to get droplets by name: %w", err)
 	}
 	if len(instances) > 0 {
 		// TODO: support multiple droplets
-		fmt.Println("existing instance(s) found:")
+		fmt.Printf("Existing %s instance(s) found:\n", dropletName)
 		for _, instance := range instances {
 			// get a pretty string describing the jobs associated with this instance
 			if instanceToJobs == nil {
@@ -47,7 +47,7 @@ func ConfirmDeleteDroplets(config config.Config, dropletName string, instanceToJ
 			}
 		}
 	} else {
-		fmt.Println("zero instances found")
+		fmt.Printf("Zero %s instances found\n", dropletName)
 	}
 	return nil
 }
diff --git a/cmd/cloudexec/main.go b/cmd/cloudexec/main.go
@@ -259,7 +259,7 @@ func main() {
 					if err != nil {
 						return err
 					}
-					err = ConfirmDeleteDroplets(config, username, instanceToJobs)
+					err = ConfirmDeleteDroplets(config, dropletName, instanceToJobs)
 					if err != nil {
 						return err
 					}

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ import (`
`12`	`12`	`func ConfirmDeleteDroplets(config config.Config, dropletName string, instanceToJobs map[int64][]int64) error {`
`13`	`13`	`instances, err := do.GetDropletsByName(config, dropletName)`
`14`	`14`	`if err != nil {`
`15`		`- return fmt.Errorf("Failed to get droplet by name: %w", err)`
	`15`	`+ return fmt.Errorf("Failed to get droplets by name: %w", err)`
`16`	`16`	`}`
`17`	`17`	`if len(instances) > 0 {`
`18`	`18`	`// TODO: support multiple droplets`
`19`		`- fmt.Println("existing instance(s) found:")`
	`19`	`+ fmt.Printf("Existing %s instance(s) found:\n", dropletName)`
`20`	`20`	`for _, instance := range instances {`
`21`	`21`	`// get a pretty string describing the jobs associated with this instance`
`22`	`22`	`if instanceToJobs == nil {`
`@@ -47,7 +47,7 @@ func ConfirmDeleteDroplets(config config.Config, dropletName string, instanceToJ`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`} else {`
`50`		`- fmt.Println("zero instances found")`
	`50`	`+ fmt.Printf("Zero %s instances found\n", dropletName)`
`51`	`51`	`}`
`52`	`52`	`return nil`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ func main() {`
`259`	`259`	`if err != nil {`
`260`	`260`	`return err`
`261`	`261`	`}`
`262`		`- err = ConfirmDeleteDroplets(config, username, instanceToJobs)`
	`262`	`+ err = ConfirmDeleteDroplets(config, dropletName, instanceToJobs)`
`263`	`263`	`if err != nil {`
`264`	`264`	`return err`
`265`	`265`	`}`