Merge pull request #11347 from shishir-a412ed/cleanup

Code cleanup: Remove extra if clause.
hashicorp · Oct 20, 2021 · fceb6ce · fceb6ce
2 parents 6d35e2f + e14e355
commit fceb6ce
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 40 deletions.
diff --git a/command/job_allocs.go b/command/job_allocs.go
@@ -118,11 +118,7 @@ func (c *JobAllocsCommand) Run(args []string) int {
 		return 1
 	}
 	if len(jobs) > 1 {
-		if 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 {
+		if (jobID != jobs[0].ID) || (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
 		}

diff --git a/command/job_deployments.go b/command/job_deployments.go
@@ -123,11 +123,7 @@ func (c *JobDeploymentsCommand) Run(args []string) int {
 		return 1
 	}
 	if len(jobs) > 1 {
-		if 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 {
+		if (jobID != jobs[0].ID) || (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
 		}

diff --git a/command/job_history.go b/command/job_history.go
@@ -134,11 +134,7 @@ func (c *JobHistoryCommand) Run(args []string) int {
 		return 1
 	}
 	if len(jobs) > 1 {
-		if 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 {
+		if (jobID != jobs[0].ID) || (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
 		}

diff --git a/command/job_inspect.go b/command/job_inspect.go
@@ -130,11 +130,7 @@ func (c *JobInspectCommand) Run(args []string) int {
 		return 1
 	}
 	if len(jobs) > 1 {
-		if 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 {
+		if (jobID != jobs[0].ID) || (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
 		}

diff --git a/command/job_promote.go b/command/job_promote.go
@@ -128,11 +128,7 @@ func (c *JobPromoteCommand) Run(args []string) int {
 		return 1
 	}
 	if len(jobs) > 1 {
-		if 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 {
+		if (jobID != jobs[0].ID) || (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
 		}

diff --git a/command/job_revert.go b/command/job_revert.go
@@ -148,11 +148,7 @@ func (c *JobRevertCommand) Run(args []string) int {
 		return 1
 	}
 	if len(jobs) > 1 {
-		if 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 {
+		if (jobID != jobs[0].ID) || (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
 		}

diff --git a/command/job_status.go b/command/job_status.go
@@ -158,11 +158,7 @@ func (c *JobStatusCommand) Run(args []string) int {
 		return 1
 	}
 	if len(jobs) > 1 {
-		if 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 {
+		if (jobID != jobs[0].ID) || (allNamespaces && jobs[0].ID == jobs[1].ID) {
 			c.Ui.Error(fmt.Sprintf("Prefix matched multiple jobs\n\n%s", createStatusListOutput(jobs, allNamespaces)))
 			return 1
 		}

diff --git a/command/job_stop.go b/command/job_stop.go
@@ -136,11 +136,7 @@ func (c *JobStopCommand) Run(args []string) int {
 		return 1
 	}
 	if len(jobs) > 1 {
-		if 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 {
+		if (jobID != jobs[0].ID) || (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
 		}