Skip to content

Commit cacaf24

Browse files
Remove duplicate alias append and set cobra command operationID
1 parent 84ac910 commit cacaf24

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

internal/cli/api/api.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,15 @@ func createAPICommandGroupToCobraCommand(group shared_api.Group) *cobra.Command
9999
func convertAPIToCobraCommand(command shared_api.Command) (*cobra.Command, error) {
100100
// command properties
101101
commandName := strcase.ToLowerCamel(command.OperationID)
102+
commandOperationID := command.OperationID
102103
commandAliases := command.Aliases
103104

104105
if command.ShortOperationID != "" {
105106
// Add original operation ID to aliases
106107
commandAliases = append(commandAliases, commandName)
107-
// Use shortOperationID as command name
108+
// Use shortOperationID
108109
commandName = strcase.ToLowerCamel(command.ShortOperationID)
110+
commandOperationID = command.ShortOperationID
109111
}
110112

111113
shortDescription, longDescription := splitShortAndLongDescription(command.Description)
@@ -127,7 +129,7 @@ func convertAPIToCobraCommand(command shared_api.Command) (*cobra.Command, error
127129
Short: shortDescription,
128130
Long: longDescription,
129131
Annotations: map[string]string{
130-
"operationId": command.OperationID,
132+
"operationId": commandOperationID,
131133
},
132134
PreRunE: func(cmd *cobra.Command, _ []string) error {
133135
// Go through all commands that have not been touched/modified by the user and try to populate them from the users profile

tools/cmd/api-generator/convert_commands.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,6 @@ func operationToCommand(now time.Time, path, verb string, operation *openapi3.Op
175175
return nil, fmt.Errorf("failed to clean description: %w", err)
176176
}
177177

178-
if shortOperationID != "" {
179-
aliases = append(aliases, strcase.ToLowerCamel(operationID))
180-
}
181-
182178
watcher, err := extractWatcherProperties(operation.Extensions)
183179
if err != nil {
184180
return nil, err

0 commit comments

Comments
 (0)