From e03586b7dc20b4be3fdb06e50cacb80ce8c440c6 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Mon, 24 May 2021 09:39:38 -0400 Subject: [PATCH] cli: improve wildcard namespace prefix matches When a wildcard namespace is used for `nomad job` commands that support prefix matching, avoid asking the user for input if a prefix is an unambiguous exact match so that the behavior is similar to the commands using a specific or unset namespace. --- command/job_deployments.go | 13 ++++++++++--- command/job_history.go | 12 +++++++++--- command/job_inspect.go | 12 +++++++++--- command/job_promote.go | 12 +++++++++--- command/job_revert.go | 12 +++++++++--- command/job_status.go | 13 ++++++++++--- command/job_stop.go | 13 ++++++++++--- 7 files changed, 66 insertions(+), 21 deletions(-) diff --git a/command/job_deployments.go b/command/job_deployments.go index 053e44d81c03..0ec82efb84c6 100644 --- a/command/job_deployments.go +++ b/command/job_deployments.go @@ -122,10 +122,17 @@ func (c *JobDeploymentsCommand) Run(args []string) int { c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID)) return 1 } - if len(jobs) > 1 && (c.allNamespaces() || strings.TrimSpace(jobID) != jobs[0].ID) { - c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) - return 1 + if len(jobs) > 1 { + if strings.TrimSpace(jobID) != jobs[0].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } + if c.allNamespaces() && jobs[0].ID == jobs[1].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } } + jobID = jobs[0].ID q := &api.QueryOptions{Namespace: jobs[0].JobSummary.Namespace} diff --git a/command/job_history.go b/command/job_history.go index f926d182282b..2f922636e080 100644 --- a/command/job_history.go +++ b/command/job_history.go @@ -133,9 +133,15 @@ func (c *JobHistoryCommand) Run(args []string) int { c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID)) return 1 } - if len(jobs) > 1 && (c.allNamespaces() || strings.TrimSpace(jobID) != jobs[0].ID) { - c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) - return 1 + if len(jobs) > 1 { + if strings.TrimSpace(jobID) != jobs[0].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } + if c.allNamespaces() && jobs[0].ID == jobs[1].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } } q := &api.QueryOptions{Namespace: jobs[0].JobSummary.Namespace} diff --git a/command/job_inspect.go b/command/job_inspect.go index 6966f04e8856..ee4214a56188 100644 --- a/command/job_inspect.go +++ b/command/job_inspect.go @@ -129,9 +129,15 @@ func (c *JobInspectCommand) Run(args []string) int { c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID)) return 1 } - if len(jobs) > 1 && (c.allNamespaces() || strings.TrimSpace(jobID) != jobs[0].ID) { - c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) - return 1 + if len(jobs) > 1 { + if strings.TrimSpace(jobID) != jobs[0].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } + if c.allNamespaces() && jobs[0].ID == jobs[1].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } } var version *uint64 diff --git a/command/job_promote.go b/command/job_promote.go index 35ce1bd5555b..0d6d5fcd8b6c 100644 --- a/command/job_promote.go +++ b/command/job_promote.go @@ -127,9 +127,15 @@ func (c *JobPromoteCommand) Run(args []string) int { c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID)) return 1 } - if len(jobs) > 1 && (c.allNamespaces() || strings.TrimSpace(jobID) != jobs[0].ID) { - c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) - return 1 + if len(jobs) > 1 { + if strings.TrimSpace(jobID) != jobs[0].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } + if c.allNamespaces() && jobs[0].ID == jobs[1].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } } jobID = jobs[0].ID q := &api.QueryOptions{Namespace: jobs[0].JobSummary.Namespace} diff --git a/command/job_revert.go b/command/job_revert.go index fecdd22ddd87..e2214e70860a 100644 --- a/command/job_revert.go +++ b/command/job_revert.go @@ -147,9 +147,15 @@ func (c *JobRevertCommand) Run(args []string) int { c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID)) return 1 } - if len(jobs) > 1 && (c.allNamespaces() || strings.TrimSpace(jobID) != jobs[0].ID) { - c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) - return 1 + if len(jobs) > 1 { + if strings.TrimSpace(jobID) != jobs[0].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } + if c.allNamespaces() && jobs[0].ID == jobs[1].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } } // Prefix lookup matched a single job diff --git a/command/job_status.go b/command/job_status.go index fbaf21cae33c..c838ec43a263 100644 --- a/command/job_status.go +++ b/command/job_status.go @@ -157,10 +157,17 @@ func (c *JobStatusCommand) Run(args []string) int { c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID)) return 1 } - if len(jobs) > 1 && (allNamespaces || strings.TrimSpace(jobID) != jobs[0].ID) { - c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, allNamespaces))) - return 1 + if len(jobs) > 1 { + if strings.TrimSpace(jobID) != jobs[0].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, allNamespaces))) + return 1 + } + if allNamespaces && jobs[0].ID == jobs[1].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, allNamespaces))) + return 1 + } } + // Prefix lookup matched a single job q := &api.QueryOptions{Namespace: jobs[0].JobSummary.Namespace} job, _, err := client.Jobs().Info(jobs[0].ID, q) diff --git a/command/job_stop.go b/command/job_stop.go index bea83e884b19..dd20e707d0c4 100644 --- a/command/job_stop.go +++ b/command/job_stop.go @@ -135,10 +135,17 @@ func (c *JobStopCommand) Run(args []string) int { c.Ui.Error(fmt.Sprintf("No job(s) with prefix or id %q found", jobID)) return 1 } - if len(jobs) > 1 && (c.allNamespaces() || strings.TrimSpace(jobID) != jobs[0].ID) { - c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) - return 1 + if len(jobs) > 1 { + if strings.TrimSpace(jobID) != jobs[0].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } + if c.allNamespaces() && jobs[0].ID == jobs[1].ID { + c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, c.allNamespaces()))) + return 1 + } } + // Prefix lookup matched a single job q := &api.QueryOptions{Namespace: jobs[0].JobSummary.Namespace} job, _, err := client.Jobs().Info(jobs[0].ID, q)