This adds the following commands: - faas-cli - faas-cli help - faas-cli build - faas-cli deploy - faas-cli remove (alias: rm) - faas-cli version - faas-cli push Note that the following is also added but hidden from help pending a more robust bash completion solution, initially using the Cobra generated bash completion but needs spf13/cobra#520 to merge before it'll work on the OSX default Bash 3.x. - faas-cli bashcompletion This commit intercepts the command line args passed to `faas-cli` and attempts to translate them from the deprecated go flag based syntax (`faas-cli -action xxx`) to the new Cobra verb/noun based syntax (`faas-cli xxx`), it also translates a frozen set of legacy flags (with the go-style single-dash) into a GNU style double-dash. Note that some special cases are included: - changing the delete action to remove - passing the function name as a noun to remove rather than as an arg to `-name` - it also handles the legacy format where args are passed after = (`-name=fnname`). If the translation results in a new set of args then a message is displayed to the user (stderr) telling warning that they are using the deprecated cli syntax and also prints the new syntax command that is being executed and which they should use going forward. Any errors thrown during translation result in the command failing with it printing the error cause to stderr. This renames the `fetchTemplates.go` file to use snake case. The convention appears to be for snakecase - as observed in both the Go and Kubernetes source. For example heres a random selection of source files. - https://github.com/kubernetes/kubernetes/blob/master/pkg/kubeapiserver/default_storage_factory_builder.go - https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/bash_comp_utils.go - https://github.com/golang/go/blob/master/src/compress/bzip2/move_to_front.go Note that the language spec does not set a hard rule for source file names, only for package names, but making this change for consistency. Note that this file was initially generated by Cobra, but has been tweaked to include some fixes. It it an experimental initial version. This commit adds some instructions on enabling the `faas-cli` bash auto-completion support. Instructions for Linux users are very light as it differs per-distro and the assumption is that Linux users should be capable of following their Distros instructions on enabling bash completion support. Signed-off-by: John McCabe <john@johnmccabe.net>
129 lines
3.7 KiB
Go
129 lines
3.7 KiB
Go
package pflag
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// -- intSlice Value
|
|
type intSliceValue struct {
|
|
value *[]int
|
|
changed bool
|
|
}
|
|
|
|
func newIntSliceValue(val []int, p *[]int) *intSliceValue {
|
|
isv := new(intSliceValue)
|
|
isv.value = p
|
|
*isv.value = val
|
|
return isv
|
|
}
|
|
|
|
func (s *intSliceValue) Set(val string) error {
|
|
ss := strings.Split(val, ",")
|
|
out := make([]int, len(ss))
|
|
for i, d := range ss {
|
|
var err error
|
|
out[i], err = strconv.Atoi(d)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
}
|
|
if !s.changed {
|
|
*s.value = out
|
|
} else {
|
|
*s.value = append(*s.value, out...)
|
|
}
|
|
s.changed = true
|
|
return nil
|
|
}
|
|
|
|
func (s *intSliceValue) Type() string {
|
|
return "intSlice"
|
|
}
|
|
|
|
func (s *intSliceValue) String() string {
|
|
out := make([]string, len(*s.value))
|
|
for i, d := range *s.value {
|
|
out[i] = fmt.Sprintf("%d", d)
|
|
}
|
|
return "[" + strings.Join(out, ",") + "]"
|
|
}
|
|
|
|
func intSliceConv(val string) (interface{}, error) {
|
|
val = strings.Trim(val, "[]")
|
|
// Empty string would cause a slice with one (empty) entry
|
|
if len(val) == 0 {
|
|
return []int{}, nil
|
|
}
|
|
ss := strings.Split(val, ",")
|
|
out := make([]int, len(ss))
|
|
for i, d := range ss {
|
|
var err error
|
|
out[i], err = strconv.Atoi(d)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// GetIntSlice return the []int value of a flag with the given name
|
|
func (f *FlagSet) GetIntSlice(name string) ([]int, error) {
|
|
val, err := f.getFlagType(name, "intSlice", intSliceConv)
|
|
if err != nil {
|
|
return []int{}, err
|
|
}
|
|
return val.([]int), nil
|
|
}
|
|
|
|
// IntSliceVar defines a intSlice flag with specified name, default value, and usage string.
|
|
// The argument p points to a []int variable in which to store the value of the flag.
|
|
func (f *FlagSet) IntSliceVar(p *[]int, name string, value []int, usage string) {
|
|
f.VarP(newIntSliceValue(value, p), name, "", usage)
|
|
}
|
|
|
|
// IntSliceVarP is like IntSliceVar, but accepts a shorthand letter that can be used after a single dash.
|
|
func (f *FlagSet) IntSliceVarP(p *[]int, name, shorthand string, value []int, usage string) {
|
|
f.VarP(newIntSliceValue(value, p), name, shorthand, usage)
|
|
}
|
|
|
|
// IntSliceVar defines a int[] flag with specified name, default value, and usage string.
|
|
// The argument p points to a int[] variable in which to store the value of the flag.
|
|
func IntSliceVar(p *[]int, name string, value []int, usage string) {
|
|
CommandLine.VarP(newIntSliceValue(value, p), name, "", usage)
|
|
}
|
|
|
|
// IntSliceVarP is like IntSliceVar, but accepts a shorthand letter that can be used after a single dash.
|
|
func IntSliceVarP(p *[]int, name, shorthand string, value []int, usage string) {
|
|
CommandLine.VarP(newIntSliceValue(value, p), name, shorthand, usage)
|
|
}
|
|
|
|
// IntSlice defines a []int flag with specified name, default value, and usage string.
|
|
// The return value is the address of a []int variable that stores the value of the flag.
|
|
func (f *FlagSet) IntSlice(name string, value []int, usage string) *[]int {
|
|
p := []int{}
|
|
f.IntSliceVarP(&p, name, "", value, usage)
|
|
return &p
|
|
}
|
|
|
|
// IntSliceP is like IntSlice, but accepts a shorthand letter that can be used after a single dash.
|
|
func (f *FlagSet) IntSliceP(name, shorthand string, value []int, usage string) *[]int {
|
|
p := []int{}
|
|
f.IntSliceVarP(&p, name, shorthand, value, usage)
|
|
return &p
|
|
}
|
|
|
|
// IntSlice defines a []int flag with specified name, default value, and usage string.
|
|
// The return value is the address of a []int variable that stores the value of the flag.
|
|
func IntSlice(name string, value []int, usage string) *[]int {
|
|
return CommandLine.IntSliceP(name, "", value, usage)
|
|
}
|
|
|
|
// IntSliceP is like IntSlice, but accepts a shorthand letter that can be used after a single dash.
|
|
func IntSliceP(name, shorthand string, value []int, usage string) *[]int {
|
|
return CommandLine.IntSliceP(name, shorthand, value, usage)
|
|
}
|