inspect/stop uses prefix search

hashicorp · Mar 21, 2016 · eec0e3e · eec0e3e
1 parent 52347d4
commit eec0e3e
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 56 deletions.
diff --git a/command/inspect.go b/command/inspect.go
@@ -50,36 +50,34 @@ func (c *InspectCommand) Run(args []string) int {
 	}
 
 	// Check if the job exists
-	job, _, err := client.Jobs().RawJob(jobID, nil)
+	jobs, _, err := client.Jobs().PrefixList(jobID)
 	if err != nil {
-		jobs, _, err := client.Jobs().PrefixList(jobID)
-		if err != nil {
-			c.Ui.Error(fmt.Sprintf("Error inspecting job: %s", err))
-			return 1
-		}
-		if len(jobs) == 0 {
-			c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID))
-			return 1
-		}
-		if len(jobs) > 1 {
-			out := make([]string, len(jobs)+1)
-			out[0] = "ID|Type|Priority|Status"
-			for i, job := range jobs {
-				out[i+1] = fmt.Sprintf("%s|%s|%d|%s",
-					job.ID,
-					job.Type,
-					job.Priority,
-					job.Status)
-			}
-			c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", formatList(out)))
-			return 0
-		}
-		// Prefix lookup matched a single job
-		job, _, err = client.Jobs().RawJob(jobs[0].ID, nil)
-		if err != nil {
-			c.Ui.Error(fmt.Sprintf("Error inspecting job: %s", err))
-			return 1
+		c.Ui.Error(fmt.Sprintf("Error inspecting job: %s", err))
+		return 1
+	}
+	if len(jobs) == 0 {
+		c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID))
+		return 1
+	}
+	if len(jobs) > 1 {
+		out := make([]string, len(jobs)+1)
+		out[0] = "ID|Type|Priority|Status"
+		for i, job := range jobs {
+			out[i+1] = fmt.Sprintf("%s|%s|%d|%s",
+				job.ID,
+				job.Type,
+				job.Priority,
+				job.Status)
 		}
+		c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", formatList(out)))
+		return 0
+	}
+
+	// Prefix lookup matched a single job
+	job, _, err := client.Jobs().RawJob(jobs[0].ID, nil)
+	if err != nil {
+		c.Ui.Error(fmt.Sprintf("Error inspecting job: %s", err))
+		return 1
 	}
 
 	// Print the contents of the job

diff --git a/command/stop.go b/command/stop.go
@@ -75,36 +75,33 @@ func (c *StopCommand) Run(args []string) int {
 	}
 
 	// Check if the job exists
-	job, _, err := client.Jobs().Info(jobID, nil)
+	jobs, _, err := client.Jobs().PrefixList(jobID)
 	if err != nil {
-		jobs, _, err := client.Jobs().PrefixList(jobID)
-		if err != nil {
-			c.Ui.Error(fmt.Sprintf("Error deregistering job: %s", err))
-			return 1
-		}
-		if len(jobs) == 0 {
-			c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID))
-			return 1
-		}
-		if len(jobs) > 1 {
-			out := make([]string, len(jobs)+1)
-			out[0] = "ID|Type|Priority|Status"
-			for i, job := range jobs {
-				out[i+1] = fmt.Sprintf("%s|%s|%d|%s",
-					job.ID,
-					job.Type,
-					job.Priority,
-					job.Status)
-			}
-			c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", formatList(out)))
-			return 0
-		}
-		// Prefix lookup matched a single job
-		job, _, err = client.Jobs().Info(jobs[0].ID, nil)
-		if err != nil {
-			c.Ui.Error(fmt.Sprintf("Error deregistering job: %s", err))
-			return 1
+		c.Ui.Error(fmt.Sprintf("Error deregistering job: %s", err))
+		return 1
+	}
+	if len(jobs) == 0 {
+		c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID))
+		return 1
+	}
+	if len(jobs) > 1 {
+		out := make([]string, len(jobs)+1)
+		out[0] = "ID|Type|Priority|Status"
+		for i, job := range jobs {
+			out[i+1] = fmt.Sprintf("%s|%s|%d|%s",
+				job.ID,
+				job.Type,
+				job.Priority,
+				job.Status)
 		}
+		c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", formatList(out)))
+		return 0
+	}
+	// Prefix lookup matched a single job
+	job, _, err := client.Jobs().Info(jobs[0].ID, nil)
+	if err != nil {
+		c.Ui.Error(fmt.Sprintf("Error deregistering job: %s", err))
+		return 1
 	}
 
 	// Invoke the stop