cli: Lookup subcommand names dynamically
This lets us get the chosen subcommands dynamically and removes the eventual need for three package imports.
This commit is contained in:
@@ -68,15 +68,15 @@ func (obj *DeployArgs) Run(ctx context.Context, data *cliUtil.Data) (bool, error
|
|||||||
var name string
|
var name string
|
||||||
var args interface{}
|
var args interface{}
|
||||||
if cmd := obj.DeployEmpty; cmd != nil {
|
if cmd := obj.DeployEmpty; cmd != nil {
|
||||||
name = emptyGAPI.Name
|
name = cliUtil.LookupSubcommand(obj, cmd) // "empty"
|
||||||
args = cmd
|
args = cmd
|
||||||
}
|
}
|
||||||
if cmd := obj.DeployLang; cmd != nil {
|
if cmd := obj.DeployLang; cmd != nil {
|
||||||
name = langGAPI.Name
|
name = cliUtil.LookupSubcommand(obj, cmd) // "lang"
|
||||||
args = cmd
|
args = cmd
|
||||||
}
|
}
|
||||||
if cmd := obj.DeployYaml; cmd != nil {
|
if cmd := obj.DeployYaml; cmd != nil {
|
||||||
name = yamlGAPI.Name
|
name = cliUtil.LookupSubcommand(obj, cmd) // "yaml"
|
||||||
args = cmd
|
args = cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -109,15 +109,15 @@ func (obj *RunArgs) Run(ctx context.Context, data *cliUtil.Data) (bool, error) {
|
|||||||
var name string
|
var name string
|
||||||
var args interface{}
|
var args interface{}
|
||||||
if cmd := obj.RunEmpty; cmd != nil {
|
if cmd := obj.RunEmpty; cmd != nil {
|
||||||
name = emptyGAPI.Name
|
name = cliUtil.LookupSubcommand(obj, cmd) // "empty"
|
||||||
args = cmd
|
args = cmd
|
||||||
}
|
}
|
||||||
if cmd := obj.RunLang; cmd != nil {
|
if cmd := obj.RunLang; cmd != nil {
|
||||||
name = langGAPI.Name
|
name = cliUtil.LookupSubcommand(obj, cmd) // "lang"
|
||||||
args = cmd
|
args = cmd
|
||||||
}
|
}
|
||||||
if cmd := obj.RunYaml; cmd != nil {
|
if cmd := obj.RunYaml; cmd != nil {
|
||||||
name = yamlGAPI.Name
|
name = cliUtil.LookupSubcommand(obj, cmd) // "yaml"
|
||||||
args = cmd
|
args = cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
58
cli/util/args.go
Normal file
58
cli/util/args.go
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
// Mgmt
|
||||||
|
// Copyright (C) 2013-2024+ James Shubin and the project contributors
|
||||||
|
// Written by James Shubin <james@shubin.ca> and the project contributors
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package util
|
||||||
|
|
||||||
|
import (
|
||||||
|
"reflect"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// LookupSubcommand returns the name of the subcommand in the obj, of a struct.
|
||||||
|
// This is useful for determining the name of the subcommand that was activated.
|
||||||
|
// It returns an empty string if a specific name was not found.
|
||||||
|
func LookupSubcommand(obj interface{}, st interface{}) string {
|
||||||
|
val := reflect.ValueOf(obj)
|
||||||
|
if val.Kind() == reflect.Ptr { // max one de-referencing
|
||||||
|
val = val.Elem()
|
||||||
|
}
|
||||||
|
|
||||||
|
v := reflect.ValueOf(st) // value of the struct
|
||||||
|
typ := val.Type()
|
||||||
|
for i := 0; i < typ.NumField(); i++ {
|
||||||
|
f := val.Field(i) // value of the field
|
||||||
|
if f.Interface() != v.Interface() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
field := typ.Field(i)
|
||||||
|
alias, ok := field.Tag.Lookup("arg")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// XXX: `arg` needs a split by comma first or fancier parsing
|
||||||
|
prefix := "subcommand"
|
||||||
|
split := strings.Split(alias, ":")
|
||||||
|
if len(split) != 2 || split[0] != prefix {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
return split[1] // found
|
||||||
|
}
|
||||||
|
return "" // not found
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user