(cloudstack-cloudmonkey) branch main updated: Fix auto-completion logic for APIs that end with 'y' (#194)

[bstoyanov]

This is an automated email from the ASF dual-hosted git repository.

borisstoyanov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git


The following commit(s) were added to refs/heads/main by this push:
     new 51244e8  Fix auto-completion logic for APIs that end with 'y' (#194)
51244e8 is described below

commit 51244e85b8ee2e9131726f4d61777839a8e8590e
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Thu Sep 3 06:54:58 2026 -0400

    Fix auto-completion logic for APIs that end with 'y' (#194)
    
    * Fix auto-completion logic for APIs that end with 'y'
    
    * xtract shared pluralizeNoun helper for autocomplete heuristics
    
    * omit already plural apis
---
 cli/completer.go | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/cli/completer.go b/cli/completer.go
index 755cc7f..6db3d30 100644
--- a/cli/completer.go
+++ b/cli/completer.go
@@ -208,6 +208,22 @@ func findAPI(apiMap map[string][]*config.API, relatedNoun 
string) *config.API {
        return autocompleteAPI
 }
 
+// pluralizeNoun applies simple English pluralization rules used by the
+// autocomplete heuristics below (e.g., policy -> policies, disk -> disks).
+func pluralizeNoun(noun string) string {
+       switch {
+       case strings.HasSuffix(noun, "ies"):
+               return noun
+       case strings.HasSuffix(noun, "y") && len(noun) > 1 && 
!strings.ContainsAny(string(noun[len(noun)-2]), "aeiou"):
+               // Handle words ending in consonant + y (e.g., policy -> 
policies)
+               return noun[:len(noun)-1] + "ies"
+       case strings.HasSuffix(noun, "s") || strings.HasSuffix(noun, "x") || 
strings.HasSuffix(noun, "z") || strings.HasSuffix(noun, "ch") || 
strings.HasSuffix(noun, "sh"):
+               return noun + "es"
+       default:
+               return noun + "s"
+       }
+}
+
 func findAutocompleteAPI(arg *config.APIArg, apiFound *config.API, apiMap 
map[string][]*config.API) *config.API {
        if arg.Type == "map" {
                return nil
@@ -220,8 +236,9 @@ func findAutocompleteAPI(arg *config.APIArg, apiFound 
*config.API, apiMap map[st
        case argName == "id" || argName == "ids":
                // Heuristic: user is trying to autocomplete for id/ids arg for 
a list API
                relatedNoun = apiFound.Noun
-               if apiFound.Verb != "list" {
-                       relatedNoun += "s"
+               if apiFound.Verb != "list" && findAPI(apiMap, relatedNoun) == 
nil {
+                       // Noun may already be plural (e.g. bulk ops like 
deleteAlerts)
+                       relatedNoun = pluralizeNoun(relatedNoun)
                }
        case argName == "account":
                // Heuristic: user is trying to autocomplete for accounts
@@ -249,12 +266,7 @@ func findAutocompleteAPI(arg *config.APIArg, apiFound 
*config.API, apiMap map[st
                                }
                        }
                }
-               // Handle common cases where base ends with a vowel and needs 
"es"
-               if strings.HasSuffix(base, "s") || strings.HasSuffix(base, "x") 
|| strings.HasSuffix(base, "z") || strings.HasSuffix(base, "ch") || 
strings.HasSuffix(base, "sh") {
-                       relatedNoun = base + "es"
-               } else {
-                       relatedNoun = base + "s"
-               }
+               relatedNoun = pluralizeNoun(base)
        }
 
        config.Debug("Possible related noun for the arg: ", relatedNoun, " and 
type: ", arg.Type)