Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(client/v2): correctly handle enhanced sub commands #21809

Merged
merged 3 commits into from
Sep 26, 2024
Merged

fix(client/v2): correctly handle enhanced sub commands #21809

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53f5842
fix: correctly handle enhanced sub commands
johnletey Sep 18, 2024
0969e1e
chore: small nit
johnletey Sep 18, 2024
0846f80
Merge branch 'main' into custom-subcmds
johnletey Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/v2/autocli/msg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ func (b *Builder) AddMsgServiceCommands(cmd *cobra.Command, cmdDescriptor *autoc
return err
}

cmd.AddCommand(subCmd)
if !subCmdDesc.EnhanceCustomCommand {
cmd.AddCommand(subCmd)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The conditional check alters the command registration behavior.

This change introduces a gate that conditionally adds the subCmd to the parent cmd based on the EnhanceCustomCommand property of the subCmdDesc descriptor. Commands will only be included if EnhanceCustomCommand is false.

Consider adding documentation or comments to clarify:

  • The purpose and effect of the EnhanceCustomCommand property.
  • How this change impacts the CLI user experience, as certain commands may not be available based on this setting.

}

if cmdDescriptor.Service == "" {
Expand Down
4 changes: 3 additions & 1 deletion client/v2/autocli/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ func (b *Builder) AddQueryServiceCommands(cmd *cobra.Command, cmdDescriptor *aut
return err
}

cmd.AddCommand(subCmd)
if !subCmdDesc.EnhanceCustomCommand {
cmd.AddCommand(subCmd)
}
}

// skip empty command descriptors
Expand Down
Loading