change define argument order
parent
9f941105a0
commit
9c11343733
|
|
@ -79,7 +79,7 @@ func (a Aliases) Get(k string) (string, bool) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Define declares a new alias.
|
// Define declares a new alias.
|
||||||
func (a Aliases) Define(alias, command string) {
|
func (a Aliases) Define(command, alias string) {
|
||||||
if _, ok := a.Alias[alias]; ok {
|
if _, ok := a.Alias[alias]; ok {
|
||||||
// Don't override aliases. Take order of alias registration as precedence.
|
// Don't override aliases. Take order of alias registration as precedence.
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ func TestAliasDefine(t *testing.T) {
|
||||||
configAlias := config.NewAliases()
|
configAlias := config.NewAliases()
|
||||||
for _, aliases := range tt.aliases {
|
for _, aliases := range tt.aliases {
|
||||||
for _, a := range aliases.aliases {
|
for _, a := range aliases.aliases {
|
||||||
configAlias.Define(a, aliases.cmd)
|
configAlias.Define(aliases.cmd, a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for alias, cmd := range tt.registeredCommands {
|
for alias, cmd := range tt.registeredCommands {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import (
|
||||||
|
|
||||||
"github.com/derailed/k9s/internal/k8s"
|
"github.com/derailed/k9s/internal/k8s"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
yaml "gopkg.in/yaml.v2"
|
"gopkg.in/yaml.v2"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||||
)
|
)
|
||||||
|
|
@ -17,6 +17,8 @@ type CustomResourceDefinition struct {
|
||||||
instance *unstructured.Unstructured
|
instance *unstructured.Unstructured
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var _ Columnar = (*CustomResourceDefinition)(nil)
|
||||||
|
|
||||||
// NewCustomResourceDefinitionList returns a new resource list.
|
// NewCustomResourceDefinitionList returns a new resource list.
|
||||||
func NewCustomResourceDefinitionList(c Connection, ns string) List {
|
func NewCustomResourceDefinitionList(c Connection, ns string) List {
|
||||||
return NewList(
|
return NewList(
|
||||||
|
|
|
||||||
|
|
@ -61,13 +61,13 @@ func allCRDs(c k8s.Connection, vv viewers) {
|
||||||
gvr := k8s.NewGVR(meta.Group, meta.Version, meta.Plural)
|
gvr := k8s.NewGVR(meta.Group, meta.Version, meta.Plural)
|
||||||
gvrs := gvr.String()
|
gvrs := gvr.String()
|
||||||
if meta.Plural != "" {
|
if meta.Plural != "" {
|
||||||
aliases.Define(meta.Plural, gvrs)
|
aliases.Define(gvrs, meta.Plural)
|
||||||
}
|
}
|
||||||
if meta.Singular != "" {
|
if meta.Singular != "" {
|
||||||
aliases.Define(meta.Singular, gvrs)
|
aliases.Define(gvrs, meta.Singular)
|
||||||
}
|
}
|
||||||
for _, a := range meta.ShortNames {
|
for _, a := range meta.ShortNames {
|
||||||
aliases.Define(a, gvrs)
|
aliases.Define(gvrs, a)
|
||||||
}
|
}
|
||||||
|
|
||||||
vv[gvrs] = viewer{
|
vv[gvrs] = viewer{
|
||||||
|
|
@ -144,13 +144,13 @@ func load(c k8s.Connection, vv viewers) {
|
||||||
cmd.gvr = gvr.String()
|
cmd.gvr = gvr.String()
|
||||||
vv[gvr.String()] = cmd
|
vv[gvr.String()] = cmd
|
||||||
gvrStr := gvr.String()
|
gvrStr := gvr.String()
|
||||||
aliases.Define(strings.ToLower(res.Kind), gvrStr)
|
aliases.Define(gvrStr, strings.ToLower(res.Kind))
|
||||||
aliases.Define(res.Name, gvrStr)
|
aliases.Define(gvrStr, res.Name)
|
||||||
if len(res.SingularName) > 0 {
|
if len(res.SingularName) > 0 {
|
||||||
aliases.Define(res.SingularName, gvrStr)
|
aliases.Define(gvrStr, res.SingularName)
|
||||||
}
|
}
|
||||||
for _, s := range res.ShortNames {
|
for _, s := range res.ShortNames {
|
||||||
aliases.Define(s, gvrStr)
|
aliases.Define(gvrStr, s)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue