kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Multiple matched objects now treated as an error condition.

Browse Source
This commit is contained in:
Alex Dadgar
2017-07-20 17:31:07 -07:00
parent d104ccce6b
commit 3cd8d50bbc
17 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
command/deployment_fail.go
View File

@@ -81,8 +81,8 @@ func (c *DeploymentFailCommand) Run(args []string) int {
}
if len(possible) != 0 {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 1
}
u, _, err := client.Deployments().Fail(deploy.ID, nil)

4
command/deployment_pause.go
View File

@@ -73,8 +73,8 @@ func (c *DeploymentPauseCommand) Run(args []string) int {
}
if len(possible) != 0 {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 1
}
if _, _, err := client.Deployments().Pause(deploy.ID, true, nil); err != nil {

4
command/deployment_promote.go
View File

@@ -92,8 +92,8 @@ func (c *DeploymentPromoteCommand) Run(args []string) int {
}
if len(possible) != 0 {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 1
}
var u *api.DeploymentUpdateResponse

4
command/deployment_resume.go
View File

@@ -79,8 +79,8 @@ func (c *DeploymentResumeCommand) Run(args []string) int {
}
if len(possible) != 0 {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 1
}
u, _, err := client.Deployments().Pause(deploy.ID, false, nil)

4
command/deployment_status.go
View File

@@ -84,8 +84,8 @@ func (c *DeploymentStatusCommand) Run(args []string) int {
}
if len(possible) != 0 {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple deployments\n\n%s", formatDeployments(possible, length)))
return 1
}
if json || len(tmpl) > 0 {

4
command/eval_status.go
View File

@@ -137,8 +137,8 @@ func (c *EvalStatusCommand) Run(args []string) int {
failures,
)
}
c.Ui.Output(fmt.Sprintf("Prefix matched multiple evaluations\n\n%s", formatList(out)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple evaluations\n\n%s", formatList(out)))
return 1
}
// If we are in monitor mode, monitor and exit

4
command/fs.go
View File

@@ -160,8 +160,8 @@ func (f *FSCommand) Run(args []string) int {
if len(allocs) > 1 {
// Format the allocs
out := formatAllocListStubs(allocs, verbose, length)
f.Ui.Output(fmt.Sprintf("Prefix matched multiple allocations\n\n%s", out))
return 0
f.Ui.Error(fmt.Sprintf("Prefix matched multiple allocations\n\n%s", out))
return 1
}
// Prefix lookup matched a single allocation
alloc, _, err := client.Allocations().Info(allocs[0].ID, nil)

4
command/inspect.go
View File

@@ -97,8 +97,8 @@ func (c *InspectCommand) Run(args []string) int {
return 1
}
if len(jobs) > 1 && strings.TrimSpace(jobID) != jobs[0].ID {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 1
}
var version *uint64

4
command/job_deployments.go
View File

@@ -82,8 +82,8 @@ func (c *JobDeploymentsCommand) Run(args []string) int {
return 1
}
if len(jobs) > 1 && strings.TrimSpace(jobID) != jobs[0].ID {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 1
}
jobID = jobs[0].ID

4
command/job_history.go
View File

@@ -100,8 +100,8 @@ func (c *JobHistoryCommand) Run(args []string) int {
return 1
}
if len(jobs) > 1 && strings.TrimSpace(jobID) != jobs[0].ID {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 1
}
// Prefix lookup matched a single job

4
command/job_promote.go
View File

@@ -96,8 +96,8 @@ func (c *JobPromoteCommand) Run(args []string) int {
return 1
}
if len(jobs) > 1 && strings.TrimSpace(jobID) != jobs[0].ID {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 1
}
jobID = jobs[0].ID

4
command/job_revert.go
View File

@@ -91,8 +91,8 @@ func (c *JobRevertCommand) Run(args []string) int {
return 1
}
if len(jobs) > 1 && strings.TrimSpace(jobID) != jobs[0].ID {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 1
}
// Prefix lookup matched a single job

4
command/logs.go
View File

@@ -136,8 +136,8 @@ func (l *LogsCommand) Run(args []string) int {
if len(allocs) > 1 {
// Format the allocs
out := formatAllocListStubs(allocs, verbose, length)
l.Ui.Output(fmt.Sprintf("Prefix matched multiple allocations\n\n%s", out))
return 0
l.Ui.Error(fmt.Sprintf("Prefix matched multiple allocations\n\n%s", out))
return 1
}
// Prefix lookup matched a single allocation
alloc, _, err := client.Allocations().Info(allocs[0].ID, nil)

4
command/node_drain.go
View File

@@ -124,8 +124,8 @@ func (c *NodeDrainCommand) Run(args []string) int {
node.Status)
}
// Dump the output
c.Ui.Output(fmt.Sprintf("Prefix matched multiple nodes\n\n%s", formatList(out)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple nodes\n\n%s", formatList(out)))
return 1
}
// Prefix lookup matched a single node

4
command/node_status.go
View File

@@ -231,8 +231,8 @@ func (c *NodeStatusCommand) Run(args []string) int {
node.Status)
}
// Dump the output
c.Ui.Output(fmt.Sprintf("Prefix matched multiple nodes\n\n%s", formatList(out)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple nodes\n\n%s", formatList(out)))
return 1
}
// Prefix lookup matched a single node
node, _, err := client.Nodes().Info(nodes[0].ID, nil)

4
command/status.go
View File

@@ -121,8 +121,8 @@ func (c *StatusCommand) Run(args []string) int {
return 1
}
if len(jobs) > 1 && strings.TrimSpace(jobID) != jobs[0].ID {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 1
}
// Prefix lookup matched a single job
job, _, err := client.Jobs().Info(jobs[0].ID, nil)

4
command/stop.go
View File

@@ -94,8 +94,8 @@ func (c *StopCommand) Run(args []string) int {
return 1
}
if len(jobs) > 1 && strings.TrimSpace(jobID) != jobs[0].ID {
c.Ui.Output(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 0
c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs)))
return 1
}
// Prefix lookup matched a single job
job, _, err := client.Jobs().Info(jobs[0].ID, nil)