github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70443 from juanvallejo/jvallejo/plugin-list-improvements 

prevent sorting of PATH dirs for kubectl plugins
pull/58/head
k8s-ci-robot 2018-10-30 16:16:28 -07:00 committed by GitHub
parent 1dd7e6f65c 901c798681
commit 59625d8788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/plugin/BUILD
View File

@ -9,7 +9,6 @@ go_library(
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/util/i18n:go_default_library",
"//pkg/kubectl/util/templates:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
],

23
pkg/kubectl/cmd/plugin/plugin.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package plugin
import (
"bytes"
"fmt"
"io/ioutil"
"os"
@ -26,7 +27,6 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/genericclioptions"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
@ -108,11 +108,12 @@ func (o *PluginListOptions) Run() error {
pluginsFound := false
isFirstFile := true
pluginErrors := []error{}
pluginWarnings := 0
paths := sets.NewString(filepath.SplitList(os.Getenv(path))...)
for _, dir := range paths.List() {
for _, dir := range filepath.SplitList(os.Getenv(path)) {
files, err := ioutil.ReadDir(dir)
if err != nil {
pluginErrors = append(pluginErrors, fmt.Errorf("error: unable to read directory %q in your PATH: %v", dir, err))
continue
}
@ -146,15 +147,23 @@ func (o *PluginListOptions) Run() error {
}
if !pluginsFound {
return fmt.Errorf("error: unable to find any kubectl plugins in your PATH")
pluginErrors = append(pluginErrors, fmt.Errorf("error: unable to find any kubectl plugins in your PATH"))
}
if pluginWarnings > 0 {
fmt.Fprintln(o.ErrOut)
if pluginWarnings == 1 {
return fmt.Errorf("one plugin warning was found")
pluginErrors = append(pluginErrors, fmt.Errorf("error: one plugin warning was found"))
} else {
pluginErrors = append(pluginErrors, fmt.Errorf("error: %v plugin warnings were found", pluginWarnings))
}
return fmt.Errorf("%v plugin warnings were found", pluginWarnings)
}
if len(pluginErrors) > 0 {
fmt.Fprintln(o.ErrOut)
errs := bytes.NewBuffer(nil)
for _, e := range pluginErrors {
fmt.Fprintln(errs, e)
}
return fmt.Errorf("%s", errs.String())
}
return nil