Job run command gets namespaces, and no longer gets ui hints for --ou…

…tput flag
hashicorp · Dec 16, 2024 · 93d4d49 · 93d4d49
1 parent 6bbb350
commit 93d4d49
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/command/job_run.go b/command/job_run.go
@@ -311,17 +311,6 @@ func (c *JobRunCommand) Run(args []string) int {
 
 		c.Ui.Output(string(buf))
 
-		hint, _ := c.Meta.showUIPath(UIHintContext{
-			Command: "job run",
-			PathParams: map[string]string{
-				"jobID": *job.ID,
-			},
-			OpenURL: openURL,
-		})
-		if hint != "" {
-			c.Ui.Output(hint)
-		}
-
 		return 0
 	}
 
@@ -370,6 +359,11 @@ func (c *JobRunCommand) Run(args []string) int {
 
 	evalID := resp.EvalID
 
+	jobNamespace := c.Meta.namespace
+	if jobNamespace == "" {
+		jobNamespace = "default"
+	}
+
 	// Check if we should enter monitor mode
 	if detach || periodic || paramjob || multiregion {
 		c.Ui.Output("Job registration successful")
@@ -392,7 +386,8 @@ func (c *JobRunCommand) Run(args []string) int {
 		hint, _ := c.Meta.showUIPath(UIHintContext{
 			Command: "job run",
 			PathParams: map[string]string{
-				"jobID": *job.ID,
+				"jobID":     *job.ID,
+				"namespace": jobNamespace,
 			},
 			OpenURL: openURL,
 		})
@@ -407,7 +402,8 @@ func (c *JobRunCommand) Run(args []string) int {
 	hint, _ := c.Meta.showUIPath(UIHintContext{
 		Command: "job run",
 		PathParams: map[string]string{
-			"jobID": *job.ID,
+			"jobID":     *job.ID,
+			"namespace": jobNamespace,
 		},
 		OpenURL: openURL,
 	})

diff --git a/command/job_status.go b/command/job_status.go
@@ -294,7 +294,8 @@ func (c *JobStatusCommand) Run(args []string) int {
 		hint, _ := c.Meta.showUIPath(UIHintContext{
 			Command: "job status single",
 			PathParams: map[string]string{
-				"jobID": *job.ID,
+				"jobID":     *job.ID,
+				"namespace": *job.Namespace,
 			},
 			OpenURL: c.openURL,
 		})
@@ -325,7 +326,8 @@ func (c *JobStatusCommand) Run(args []string) int {
 	hint, _ := c.Meta.showUIPath(UIHintContext{
 		Command: "job status single",
 		PathParams: map[string]string{
-			"jobID": *job.ID,
+			"jobID":     *job.ID,
+			"namespace": *job.Namespace,
 		},
 		OpenURL: c.openURL,
 	})

diff --git a/command/meta.go b/command/meta.go
@@ -470,11 +470,11 @@ var CommandUIRoutes = map[string]UIRoute{
 		Description: "View and manage Nomad jobs",
 	},
 	"job status single": {
-		Path:        "/jobs/:jobID",
+		Path:        "/jobs/:jobID@:namespace",
 		Description: "View job details and metrics",
 	},
 	"job run": {
-		Path:        "/jobs/:jobID",
+		Path:        "/jobs/:jobID@:namespace",
 		Description: "View this job",
 	},
 	"alloc status": {