backport of commit b59d1ef

hashicorp · Mar 3, 2023 · f80d466 · f80d466
1 parent f8239c0
commit f80d466
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/command/job_inspect_test.go b/command/job_inspect_test.go
@@ -38,7 +38,7 @@ func TestInspectCommand_Fails(t *testing.T) {
 	if code := cmd.Run([]string{"-address=" + url, "nope"}); code != 1 {
 		t.Fatalf("expect exit 1, got: %d", code)
 	}
-	if out := ui.ErrorWriter.String(); !strings.Contains(out, "No job(s) with prefix or id") {
+	if out := ui.ErrorWriter.String(); !strings.Contains(out, "No job(s) with prefix or ID") {
 		t.Fatalf("expect not found error, got: %s", out)
 	}
 	ui.ErrorWriter.Reset()
@@ -47,7 +47,7 @@ func TestInspectCommand_Fails(t *testing.T) {
 	if code := cmd.Run([]string{"-address=nope", "nope"}); code != 1 {
 		t.Fatalf("expected exit code 1, got: %d", code)
 	}
-	if out := ui.ErrorWriter.String(); !strings.Contains(out, "Error inspecting job") {
+	if out := ui.ErrorWriter.String(); !strings.Contains(out, "Error querying job prefix") {
 		t.Fatalf("expected failed query error, got: %s", out)
 	}
 	ui.ErrorWriter.Reset()

diff --git a/command/job_scaling_events.go b/command/job_scaling_events.go
@@ -76,9 +76,6 @@ func (j *JobScalingEventsCommand) Run(args []string) int {
 		return 1
 	}
 
-	// Get the job ID.
-	jobID := args[0]
-
 	// Get the HTTP client.
 	client, err := j.Meta.Client()
 	if err != nil {

diff --git a/command/job_stop_test.go b/command/job_stop_test.go
@@ -114,7 +114,7 @@ func TestStopCommand_Fails(t *testing.T) {
 	must.One(t, code)
 
 	out = ui.ErrorWriter.String()
-	must.StrContains(t, out, "No job(s) with prefix or id")
+	must.StrContains(t, out, "No job(s) with prefix or ID")
 
 	ui.ErrorWriter.Reset()
 
@@ -123,7 +123,7 @@ func TestStopCommand_Fails(t *testing.T) {
 	must.One(t, code)
 
 	out = ui.ErrorWriter.String()
-	must.StrContains(t, out, "Error finding jobs with prefix: nope")
+	must.StrContains(t, out, "Error querying job prefix")
 }
 
 func TestStopCommand_AutocompleteArgs(t *testing.T) {

diff --git a/command/meta.go b/command/meta.go
@@ -286,7 +286,6 @@ func (m *Meta) JobIDByPrefix(client *api.Client, prefix string, filter JobByPref
 	if len(jobs) > 1 {
 		exactMatch := prefix == jobs[0].ID
 		matchInMultipleNamespaces := m.allNamespaces() && jobs[0].ID == jobs[1].ID
-		fmt.Println(m.allNamespaces())
 		if !exactMatch || matchInMultipleNamespaces {
 			return "", "", fmt.Errorf(
 				"Prefix %q matched multiple jobs\n\n%s",