revert GroupID back to settingsv2; filter out empty groups in the help output

Author: anton-107

acceptance/cmd/account/account-help/out.test.toml

@@ -0,0 +1,5 @@
+Local = true
+Cloud = false
+
+[EnvMatrix]
+  DATABRICKS_CLI_DEPLOYMENT = ["terraform", "direct-exp"]

acceptance/cmd/account/account-help/output.txt

@@ -0,0 +1,60 @@
+
+>>> [CLI] account --help
+Databricks Account Commands
+
+Usage:
+  databricks account [command]
+
+Identity and Access Management
+  access-control                      These APIs manage access rules on resources in an account.
+  groups                              Groups simplify identity management, making it easier to assign access to Databricks account, data, and other securable objects.
+  service-principals                  Identities for use with jobs, automated tools, and systems such as scripts, apps, and CI/CD platforms.
+  users                               User identities recognized by Databricks and represented by email addresses.
+  workspace-assignment                The Workspace Permission Assignment API allows you to manage workspace permissions for principals in your account.
+
+Unity Catalog
+  metastore-assignments               These APIs manage metastore assignments to a workspace.
+  metastores                          These APIs manage Unity Catalog metastores for an account.
+  storage-credentials                 These APIs manage storage credentials for a particular metastore.
+
+Settings
+  ip-access-lists                     The Accounts IP Access List API enables account admins to configure IP access lists for access to the account console.
+  network-connectivity                These APIs provide configurations for the network connectivity of your workspaces for serverless compute resources.
+  network-policies                    These APIs manage network policies for this account.
+  settings                            Accounts Settings API allows users to manage settings at the account level.
+  workspace-network-configuration     These APIs allow configuration of network settings for Databricks workspaces by selecting which network policy to associate with the workspace.
+
+Provisioning
+  credentials                         These APIs manage credential configurations for this workspace.
+  encryption-keys                     These APIs manage encryption key configurations for this workspace (optional).
+  networks                            These APIs manage network configurations for customer-managed VPCs (optional).
+  private-access                      These APIs manage private access settings for this account.
+  storage                             These APIs manage storage configurations for this workspace.
+  vpc-endpoints                       These APIs manage VPC endpoint configurations for this account.
+  workspaces                          These APIs manage workspaces for this account.
+
+Billing
+  billable-usage                      This API allows you to download billable usage logs for the specified account and date range.
+  budget-policy                       A service serves REST API about Budget policies.
+  budgets                             These APIs manage budget configurations for this account.
+  log-delivery                        These APIs manage log delivery configurations for this account.
+  usage-dashboards                    These APIs manage usage dashboards for this account.
+
+OAuth
+  custom-app-integration              These APIs enable administrators to manage custom OAuth app integrations, which is required for adding/using Custom OAuth App Integration like Tableau Cloud for Databricks in AWS cloud.
+  federation-policy                   These APIs manage account federation policies.
+  o-auth-published-apps               These APIs enable administrators to view all the available published OAuth applications in Databricks.
+  published-app-integration           These APIs enable administrators to manage published OAuth app integrations, which is required for adding/using Published OAuth App Integration like Tableau Desktop for Databricks in AWS cloud.
+  service-principal-federation-policy These APIs manage service principal federation policies.
+  service-principal-secrets           These APIs enable administrators to manage service principal secrets.
+
+Flags:
+  -h, --help   help for account
+
+Global Flags:
+      --debug            enable debug logging
+  -o, --output type      output type: text or json (default text)
+  -p, --profile string   ~/.databrickscfg profile
+  -t, --target string    bundle target to use (if applicable)
+
+Use "databricks account [command] --help" for more information about a command.

acceptance/cmd/account/account-help/script

@@ -0,0 +1 @@
+trace $CLI account --help

cmd/account/cmd.go

@@ -18,6 +18,10 @@ func Groups() []cobra.Group {
 			ID:    "settings",
 			Title: "Settings",
 		},
+		{
+			ID:    "settingsv2",
+			Title: "Settings (v2)",
+		},
 		{
 			ID:    "provisioning",
 			Title: "Provisioning",

cmd/account/groups.go

@@ -19,6 +19,7 @@ import (
 	"github.com/databricks/cli/cmd/sync"
 	"github.com/databricks/cli/cmd/version"
 	"github.com/databricks/cli/cmd/workspace"
+	"github.com/databricks/cli/libs/cmdgroup"
 	"github.com/spf13/cobra"
 )
 
@@ -27,41 +28,6 @@ const (
 	permissionsGroup = "permissions"
 )
 
-// filterGroups returns command groups that have at least one available (non-hidden) command.
-// Empty groups or groups with only hidden commands are filtered out from the help output.
-// Commands that belong to filtered groups will have their GroupID cleared.
-func filterGroups(groups []cobra.Group, allCommands []*cobra.Command) []cobra.Group {
-	var filteredGroups []cobra.Group
-
-	// Create a map to track which groups have available commands
-	groupHasAvailableCommands := make(map[string]bool)
-
-	// Check each command to see if it belongs to a group and is available
-	for _, cmd := range allCommands {
-		if cmd.GroupID != "" && cmd.IsAvailableCommand() {
-			groupHasAvailableCommands[cmd.GroupID] = true
-		}
-	}
-
-	// Collect groups that have available commands
-	validGroupIDs := make(map[string]bool)
-	for _, group := range groups {
-		if groupHasAvailableCommands[group.ID] {
-			filteredGroups = append(filteredGroups, group)
-			validGroupIDs[group.ID] = true
-		}
-	}
-
-	// Clear GroupID for commands that belong to filtered groups
-	for _, cmd := range allCommands {
-		if cmd.GroupID != "" && !validGroupIDs[cmd.GroupID] {
-			cmd.GroupID = ""
-		}
-	}
-
-	return filteredGroups
-}
-
 func New(ctx context.Context) *cobra.Command {
 	cli := root.New(ctx)
 
@@ -115,7 +81,7 @@ func New(ctx context.Context) *cobra.Command {
 	// Add workspace command groups, filtering out empty groups or groups with only hidden commands.
 	allGroups := workspace.Groups()
 	allCommands := cli.Commands()
-	filteredGroups := filterGroups(allGroups, allCommands)
+	filteredGroups := cmdgroup.FilterGroups(allGroups, allCommands)
 	for i := range filteredGroups {
 		cli.AddGroup(&filteredGroups[i])
 	}

cmd/account/settings-v2/settings-v2.go

@@ -106,3 +106,38 @@ func tmpl(w io.Writer, text string, data any) error {
 	template.Must(t.Parse(text))
 	return t.Execute(w, data)
 }
+
+// FilterGroups returns command groups that have at least one available (non-hidden) command.
+// Empty groups or groups with only hidden commands are filtered out from the help output.
+// Commands that belong to filtered groups will have their GroupID cleared.
+func FilterGroups(groups []cobra.Group, allCommands []*cobra.Command) []cobra.Group {
+	var filteredGroups []cobra.Group
+
+	// Create a map to track which groups have available commands
+	groupHasAvailableCommands := make(map[string]bool)
+
+	// Check each command to see if it belongs to a group and is available
+	for _, cmd := range allCommands {
+		if cmd.GroupID != "" && cmd.IsAvailableCommand() {
+			groupHasAvailableCommands[cmd.GroupID] = true
+		}
+	}
+
+	// Collect groups that have available commands
+	validGroupIDs := make(map[string]bool)
+	for _, group := range groups {
+		if groupHasAvailableCommands[group.ID] {
+			filteredGroups = append(filteredGroups, group)
+			validGroupIDs[group.ID] = true
+		}
+	}
+
+	// Clear GroupID for commands that belong to filtered groups
+	for _, cmd := range allCommands {
+		if cmd.GroupID != "" && !validGroupIDs[cmd.GroupID] {
+			cmd.GroupID = ""
+		}
+	}
+
+	return filteredGroups
+}