Fix an issue where path prefix was presumed for variables

hashicorp · Nov 14, 2024 · 3621929 · 3621929
1 parent 671d9d5
commit 3621929
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/command/meta.go b/command/meta.go
@@ -482,9 +482,13 @@ var CommandUIRoutes = map[string]UIRoute{
 		Description: "View allocation details",
 	},
 	"var list": {
-		Path:        "/variables/path/:prefix",
+		Path:        "/variables",
 		Description: "View Nomad variables",
 	},
+	"var list prefix": {
+		Path:        "/variables/path/:prefix",
+		Description: "View Nomad variables at this path",
+	},
 	"var get": {
 		Path:        "/variables/var/:path@:namespace",
 		Description: "View variable details",

diff --git a/command/var_list.go b/command/var_list.go
@@ -217,15 +217,25 @@ func (c *VarListCommand) Run(args []string) int {
 		c.Ui.Warn(fmt.Sprintf("Next page token: %s", qm.NextToken))
 	}
 
-	hint, _ := c.Meta.showUIPath(UIHintContext{
-		Command: "var list",
-		PathParams: map[string]string{
-			"prefix": prefix,
-		},
-		OpenURL: openURL,
-	})
-	if hint != "" {
-		c.Ui.Output(hint)
+	if prefix != "" {
+		hint, _ := c.Meta.showUIPath(UIHintContext{
+			Command: "var list prefix",
+			PathParams: map[string]string{
+				"prefix": prefix,
+			},
+			OpenURL: openURL,
+		})
+		if hint != "" {
+			c.Ui.Output(hint)
+		}
+	} else {
+		hint, _ := c.Meta.showUIPath(UIHintContext{
+			Command: "var list",
+			OpenURL: openURL,
+		})
+		if hint != "" {
+			c.Ui.Output(hint)
+		}
 	}
 
 	return 0