PR comments addressed; switched the env var to be consistent and scru…

…nched monitor-adjacent hints a bit more
hashicorp · Jan 23, 2025 · 64f4796 · 64f4796
1 parent 5b5a482
commit 64f4796
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/command/deployment_status.go b/command/deployment_status.go
@@ -197,7 +197,7 @@ func (c *DeploymentStatusCommand) Run(args []string) int {
 		if hint != "" {
 			c.Ui.Output(hint)
 			// Because this is before monitor, newline so we don't scrunch
-			c.Ui.Output("\n")
+			c.Ui.Output("")
 		}
 
 		return 0

diff --git a/command/job_dispatch.go b/command/job_dispatch.go
@@ -241,7 +241,7 @@ func (c *JobDispatchCommand) Run(args []string) int {
 	if hint != "" {
 		c.Ui.Output(hint)
 		// Because this is before monitor, newline so we don't scrunch
-		c.Ui.Output("\n")
+		c.Ui.Output("")
 	}
 	return mon.monitor(resp.EvalID)
 }
diff --git a/command/job_run.go b/command/job_run.go
@@ -410,7 +410,7 @@ func (c *JobRunCommand) Run(args []string) int {
 	if hint != "" {
 		c.Ui.Output(hint)
 		// Because this is before monitor, newline so we don't scrunch
-		c.Ui.Output("\n")
+		c.Ui.Output("")
 	}
 
 	mon := newMonitor(c.Ui, client, length)

diff --git a/command/meta.go b/command/meta.go
@@ -253,7 +253,7 @@ func (m *Meta) SetupUi(args []string) {
 	}
 
 	// Check to see if the user has disabled hints via env var.
-	showCLIHints := os.Getenv(EnvNomadShowCLIHints)
+	showCLIHints := os.Getenv(EnvNomadCLIShowHints)
 	if showCLIHints == "false" {
 		m.showCLIHints = pointer.Of(false)
 	} else if showCLIHints == "true" {
@@ -612,7 +612,7 @@ func (m *Meta) uiHintsDisabled() bool {
 	}
 
 	agentConfig := agent.Config
-	agentUIConfig, ok := agentConfig["UI"].(map[string]interface{})
+	agentUIConfig, ok := agentConfig["UI"].(map[string]any)
 	if !ok {
 		return false
 	}

diff --git a/command/meta_test.go b/command/meta_test.go
@@ -537,7 +537,7 @@ func TestMeta_ShowUIPath_EnvVarOverride(t *testing.T) {
 
 			// Set environment variable
 			if tc.envValue != "" {
-				t.Setenv("NOMAD_SHOW_CLI_HINTS", tc.envValue)
+				t.Setenv("NOMAD_CLI_SHOW_HINTS", tc.envValue)
 			}
 
 			// Create a test server with UI enabled and CLI hints as per test case

diff --git a/website/content/docs/commands/index.mdx b/website/content/docs/commands/index.mdx
@@ -94,7 +94,7 @@ flags.
 
 - `NOMAD_CLI_NO_COLOR` - Disables colored command output.
 
-- `NOMAD_SHOW_CLI_HINTS` - Enables ui-hints in common CLI command output.
+- `NOMAD_CLI_SHOW_HINTS` - Enables ui-hints in common CLI command output.
 
 #### mTLS Environment Variables