From 3739b20385b681c8887a74c2509043eaa19f274d Mon Sep 17 00:00:00 2001
From: Lennart Kats <lennart.kats@databricks.com>
Date: Tue, 26 Dec 2023 16:40:19 +0100
Subject: [PATCH 1/2] Tweak command groups in CLI help

---
 cmd/bundle/bundle.go           | 7 ++++---
 cmd/fs/fs.go                   | 7 ++++---
 cmd/sync/sync.go               | 7 ++++---
 cmd/workspace/grants/grants.go | 2 +-
 cmd/workspace/groups.go        | 6 +++++-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/cmd/bundle/bundle.go b/cmd/bundle/bundle.go
index 128c8302a6..3206b94eef 100644
--- a/cmd/bundle/bundle.go
+++ b/cmd/bundle/bundle.go
@@ -6,9 +6,10 @@ import (
 
 func New() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "bundle",
-		Short: "Databricks Asset Bundles",
-		Long:  "Databricks Asset Bundles\n\nOnline documentation: https://docs.databricks.com/en/dev-tools/bundles",
+		Use:     "bundle",
+		Short:   "Databricks Asset Bundles let you express data/AI/analytics projects as code.",
+		Long:    "Databricks Asset Bundles let you express data/AI/analytics projects as code.\n\nOnline documentation: https://docs.databricks.com/en/dev-tools/bundles",
+		GroupID: "development",
 	}
 
 	initVariableFlag(cmd)
diff --git a/cmd/fs/fs.go b/cmd/fs/fs.go
index 190220f4a3..01d8a745be 100644
--- a/cmd/fs/fs.go
+++ b/cmd/fs/fs.go
@@ -6,9 +6,10 @@ import (
 
 func New() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "fs",
-		Short: "Filesystem related commands",
-		Long:  `Commands to do DBFS operations.`,
+		Use:     "fs",
+		Short:   "Filesystem related commands",
+		Long:    `Commands to do DBFS operations.`,
+		GroupID: "workspace",
 	}
 
 	cmd.AddCommand(
diff --git a/cmd/sync/sync.go b/cmd/sync/sync.go
index f00c02a844..c613e8ca17 100644
--- a/cmd/sync/sync.go
+++ b/cmd/sync/sync.go
@@ -76,9 +76,10 @@ func (f *syncFlags) syncOptionsFromArgs(cmd *cobra.Command, args []string) (*syn
 
 func New() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "sync [flags] SRC DST",
-		Short: "Synchronize a local directory to a workspace directory",
-		Args:  cobra.MaximumNArgs(2),
+		Use:     "sync [flags] SRC DST",
+		Short:   "Synchronize a local directory to a workspace directory",
+		Args:    cobra.MaximumNArgs(2),
+		GroupID: "development",
 	}
 
 	f := syncFlags{
diff --git a/cmd/workspace/grants/grants.go b/cmd/workspace/grants/grants.go
index 020e0bf8bf..d35c2f98e4 100755
--- a/cmd/workspace/grants/grants.go
+++ b/cmd/workspace/grants/grants.go
@@ -19,7 +19,7 @@ var cmdOverrides []func(*cobra.Command)
 func New() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "grants",
-		Short: `In Unity Catalog, data is secure by default.`,
+		Short: `Manage privileges granted in Unity Catalog.`,
 		Long: `In Unity Catalog, data is secure by default. Initially, users have no access
   to data in a metastore. Access can be granted by either a metastore admin, the
   owner of an object, or the owner of the catalog or schema that contains the
diff --git a/cmd/workspace/groups.go b/cmd/workspace/groups.go
index 43159d18bc..b1505e772f 100644
--- a/cmd/workspace/groups.go
+++ b/cmd/workspace/groups.go
@@ -18,7 +18,7 @@ func Groups() []cobra.Group {
 		},
 		{
 			ID:    "jobs",
-			Title: "Jobs",
+			Title: "Workflows",
 		},
 		{
 			ID:    "pipelines",
@@ -52,5 +52,9 @@ func Groups() []cobra.Group {
 			ID:    "settings",
 			Title: "Settings",
 		},
+		{
+			ID:    "development",
+			Title: "Developer Tools",
+		},
 	}
 }

From 81e3546fdde64d1bf4b0d6b032c2eeceb8a8bdef Mon Sep 17 00:00:00 2001
From: Lennart Kats <lennart.kats@databricks.com>
Date: Thu, 28 Dec 2023 13:29:17 +0100
Subject: [PATCH 2/2] Revert change

---
 cmd/workspace/grants/grants.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/workspace/grants/grants.go b/cmd/workspace/grants/grants.go
index d35c2f98e4..020e0bf8bf 100755
--- a/cmd/workspace/grants/grants.go
+++ b/cmd/workspace/grants/grants.go
@@ -19,7 +19,7 @@ var cmdOverrides []func(*cobra.Command)
 func New() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "grants",
-		Short: `Manage privileges granted in Unity Catalog.`,
+		Short: `In Unity Catalog, data is secure by default.`,
 		Long: `In Unity Catalog, data is secure by default. Initially, users have no access
   to data in a metastore. Access can be granted by either a metastore admin, the
   owner of an object, or the owner of the catalog or schema that contains the