Unify errors from kubeconfig.Parse

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
This commit is contained in:
Ahmet Alp Balkan 2020-04-12 16:20:34 -07:00
parent 5aaccdf801
commit c82e299daa
No known key found for this signature in database
GPG Key ID: 441833503E604E2C
7 changed files with 9 additions and 6 deletions

View File

@ -16,7 +16,7 @@ func (_op CurrentOp) Run(stdout, _ io.Writer) error {
kc := new(kubeconfig.Kubeconfig).WithLoader(defaultLoader)
defer kc.Close()
if err := kc.Parse(); err != nil {
return errors.Wrap(err, "failed to parse kubeconfig")
return errors.Wrap(err, "kubeconfig error")
}
v := kc.GetCurrentContext()

View File

@ -37,7 +37,7 @@ func deleteContext(name string) (deleteName string, wasActiveContext bool, err e
kc := new(kubeconfig.Kubeconfig).WithLoader(defaultLoader)
defer kc.Close()
if err := kc.Parse(); err != nil {
return "", false, errors.Wrap(err, "failed to parse kubeconfig")
return "", false, errors.Wrap(err, "kubeconfig error")
}
cur := kc.GetCurrentContext()

View File

@ -32,6 +32,9 @@ func (*StandardKubeconfigLoader) Load() (kubeconfig.ReadWriteResetCloser, error)
}
f, err := os.OpenFile(cfgPath, os.O_RDWR, 0)
if err != nil {
if os.IsNotExist(err) {
return nil, errors.Errorf("kubeconfig file not found at %s", cfgPath)
}
return nil, errors.Wrap(err, "failed to open file")
}
return &kubeconfigFile{f}, nil

View File

@ -18,7 +18,7 @@ func (_ ListOp) Run(stdout, _ io.Writer) error {
kc := new(kubeconfig.Kubeconfig).WithLoader(defaultLoader)
defer kc.Close()
if err := kc.Parse(); err != nil {
return errors.Wrap(err, "failed to parse kubeconfig")
return errors.Wrap(err, "kubeconfig error")
}
ctxs := kc.ContextNames()

View File

@ -36,7 +36,7 @@ func (op RenameOp) Run(_, stderr io.Writer) error {
kc := new(kubeconfig.Kubeconfig).WithLoader(defaultLoader)
defer kc.Close()
if err := kc.Parse(); err != nil {
return errors.Wrap(err, "failed to parse kubeconfig")
return errors.Wrap(err, "kubeconfig error")
}
cur := kc.GetCurrentContext()

View File

@ -38,7 +38,7 @@ func switchContext(name string) (string, error) {
kc := new(kubeconfig.Kubeconfig).WithLoader(defaultLoader)
defer kc.Close()
if err := kc.Parse(); err != nil {
return "", errors.Wrap(err, "failed to parse kubeconfig")
return "", errors.Wrap(err, "kubeconfig error")
}
prev := kc.GetCurrentContext()

View File

@ -16,7 +16,7 @@ func (_ UnsetOp) Run(_, stderr io.Writer) error {
kc := new(kubeconfig.Kubeconfig).WithLoader(defaultLoader)
defer kc.Close()
if err := kc.Parse(); err != nil {
return errors.Wrap(err, "failed to parse kubeconfig")
return errors.Wrap(err, "kubeconfig error")
}
if err := kc.UnsetCurrentContext(); err != nil {