fleetctl: on destroy command ignore units that do not exist

Djalal Harouni · Djalal Harouni · commit ad702480e3a5 · 2016-02-01T17:37:43.000+01:00
fleetctl used to ignore requests to destory units which do not actually exist. This behaviour was changed by commit 9530eed, restore the older behaviour by calling findUnits() to get the right list of units. This fixes: #1383
diff --git a/fleetctl/destroy.go b/fleetctl/destroy.go
@@ -33,9 +33,14 @@ Destroyed units are impossible to start unless re-submitted.`,
 }
 
 func runDestroyUnits(args []string) (exit int) {
-	for _, v := range args {
-		name := unitNameMangle(v)
-		err := cAPI.DestroyUnit(name)
+	units, err := findUnits(args)
+	if err != nil {
+		stderr("%v", err)
+		return 1
+	}
+
+	for _, v := range units {
+		err := cAPI.DestroyUnit(v.Name)
 		if err != nil {
 			stderr("Error destroying units: %v", err)
 			exit = 1
@@ -56,7 +61,7 @@ func runDestroyUnits(args []string) (exit int) {
 			}
 
 			for retry() {
-				u, err := cAPI.Unit(name)
+				u, err := cAPI.Unit(v.Name)
 				if err != nil {
 					stderr("Error destroying units: %v", err)
 					exit = 1
@@ -70,7 +75,7 @@ func runDestroyUnits(args []string) (exit int) {
 			}
 		}
 
-		stdout("Destroyed %s", name)
+		stdout("Destroyed %s", v.Name)
 	}
 	return
 }

Original file line number	Diff line number	Diff line change
@@ -33,9 +33,14 @@ Destroyed units are impossible to start unless re-submitted.`,
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func runDestroyUnits(args []string) (exit int) {`
`36`		`- for _, v := range args {`
`37`		`- name := unitNameMangle(v)`
`38`		`- err := cAPI.DestroyUnit(name)`
	`36`	`+ units, err := findUnits(args)`
	`37`	`+ if err != nil {`
	`38`	`+ stderr("%v", err)`
	`39`	`+ return 1`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ for _, v := range units {`
	`43`	`+ err := cAPI.DestroyUnit(v.Name)`
`39`	`44`	`if err != nil {`
`40`	`45`	`stderr("Error destroying units: %v", err)`
`41`	`46`	`exit = 1`
`@@ -56,7 +61,7 @@ func runDestroyUnits(args []string) (exit int) {`
`56`	`61`	`}`
`57`	`62`
`58`	`63`	`for retry() {`
`59`		`- u, err := cAPI.Unit(name)`
	`64`	`+ u, err := cAPI.Unit(v.Name)`
`60`	`65`	`if err != nil {`
`61`	`66`	`stderr("Error destroying units: %v", err)`
`62`	`67`	`exit = 1`
`@@ -70,7 +75,7 @@ func runDestroyUnits(args []string) (exit int) {`
`70`	`75`	`}`
`71`	`76`	`}`
`72`	`77`
`73`		`- stdout("Destroyed %s", name)`
	`78`	`+ stdout("Destroyed %s", v.Name)`
`74`	`79`	`}`
`75`	`80`	`return`
`76`	`81`	`}`