Skip to content

Make auto completion optional #91

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

Merged
merged 3 commits into from
Aug 9, 2021
Merged

Make auto completion optional #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c0c6b7
Make auto completion optional
Pearl1594 Aug 9, 2021
b04f455
Merge branch 'main' of https://github.com/apache/cloudstack-cloudmonk…
Pearl1594 Aug 9, 2021
2e54a36
default autocompletion to true in absense of config
Pearl1594 Aug 9, 2021
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
31 changes: 18 additions & 13 deletions cli/completer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,22 +355,27 @@ func (t *autoCompleter) Do(line []rune, pos int) (options [][]rune, offset int)
return nil, 0
}

autocompleteAPIArgs := []string{"listall=true"}
if autocompleteAPI.Noun == "templates" {
autocompleteAPIArgs = append(autocompleteAPIArgs, "templatefilter=executable")
}
completeArgs := t.Config.Core.AutoComplete
autocompleteAPIArgs := []string{}
argOptions := []argOption{}
if completeArgs {
autocompleteAPIArgs = []string{"listall=true"}
if autocompleteAPI.Noun == "templates" {
autocompleteAPIArgs = append(autocompleteAPIArgs, "templatefilter=executable")
}

if apiFound.Name != "provisionCertificate" && autocompleteAPI.Name == "listHosts" {
autocompleteAPIArgs = append(autocompleteAPIArgs, "type=Routing")
}
if apiFound.Name != "provisionCertificate" && autocompleteAPI.Name == "listHosts" {
autocompleteAPIArgs = append(autocompleteAPIArgs, "type=Routing")
}

spinner := t.Config.StartSpinner("fetching options, please wait...")
request := cmd.NewRequest(nil, completer.Config, nil)
response, _ := cmd.NewAPIRequest(request, autocompleteAPI.Name, autocompleteAPIArgs, false)
t.Config.StopSpinner(spinner)
spinner := t.Config.StartSpinner("fetching options, please wait...")
request := cmd.NewRequest(nil, completer.Config, nil)
response, _ := cmd.NewAPIRequest(request, autocompleteAPI.Name, autocompleteAPIArgs, false)
t.Config.StopSpinner(spinner)

hasID := strings.HasSuffix(arg.Name, "id=") || strings.HasSuffix(arg.Name, "ids=")
argOptions := buildArgOptions(response, hasID)
hasID := strings.HasSuffix(arg.Name, "id=") || strings.HasSuffix(arg.Name, "ids=")
argOptions = buildArgOptions(response, hasID)
}

filteredOptions := []argOption{}
if len(argOptions) > 0 {
Expand Down
27 changes: 14 additions & 13 deletions cmd/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,20 @@ func init() {
Name: "set",
Help: "Configures options for cmk",
SubCommands: map[string][]string{
"prompt": {"🐵", "🐱", "random"},
"asyncblock": {"true", "false"},
"timeout": {"600", "1800", "3600"},
"output": config.GetOutputFormats(),
"profile": {},
"url": {},
"username": {},
"password": {},
"domain": {},
"apikey": {},
"secretkey": {},
"verifycert": {"true", "false"},
"debug": {"true", "false"},
"prompt": {"🐵", "🐱", "random"},
"asyncblock": {"true", "false"},
"timeout": {"600", "1800", "3600"},
"output": config.GetOutputFormats(),
"profile": {},
"url": {},
"username": {},
"password": {},
"domain": {},
"apikey": {},
"secretkey": {},
"verifycert": {"true", "false"},
"debug": {"true", "false"},
"autocomplete": {"true", "false"},
},
Handle: func(r *Request) error {
if len(r.Args) < 1 {
Expand Down
19 changes: 13 additions & 6 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,13 @@ type ServerProfile struct {

// Core block describes common options for the CLI
type Core struct {
Prompt string `ini:"prompt"`
AsyncBlock bool `ini:"asyncblock"`
Timeout int `ini:"timeout"`
Output string `ini:"output"`
VerifyCert bool `ini:"verifycert"`
ProfileName string `ini:"profile"`
Prompt string `ini:"prompt"`
AsyncBlock bool `ini:"asyncblock"`
Timeout int `ini:"timeout"`
Output string `ini:"output"`
VerifyCert bool `ini:"verifycert"`
ProfileName string `ini:"profile"`
AutoComplete bool `ini:"autocomplete"`
}

// Config describes CLI config file and default options
Expand Down Expand Up @@ -140,6 +141,7 @@ func defaultCoreConfig() Core {
Output: JSON,
VerifyCert: true,
ProfileName: "localcloud",
AutoComplete: true,
}
}

Expand Down Expand Up @@ -250,6 +252,9 @@ func saveConfig(cfg *Config) *Config {
// Update
core := new(Core)
conf.Section(ini.DEFAULT_SECTION).MapTo(core)
if (!conf.Section(ini.DEFAULT_SECTION).HasKey("autocomplete")) {
core.AutoComplete = true
}
cfg.Core = core
}

Expand Down Expand Up @@ -339,6 +344,8 @@ func (c *Config) UpdateConfig(key string, value string, update bool) {
} else {
DisableDebugging()
}
case "autocomplete":
c.Core.AutoComplete = value == "true"
default:
fmt.Println("Invalid option provided:", key)
return
Expand Down