Merge pull request #8055 from liuming-dev/patch--refactor-plugin-PluginFileName-magic-value

refactor: alter constant `pluginFileName` to `PluginFileName`
pull/8061/head
Martin Hickey 4 years ago committed by GitHub
commit a11785401b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -23,6 +23,8 @@ import (
"strings"
"github.com/pkg/errors"
"helm.sh/helm/v3/pkg/plugin"
)
// ErrMissingMetadata indicates that plugin.yaml is missing.
@ -100,7 +102,7 @@ func isRemoteHTTPArchive(source string) bool {
// isPlugin checks if the directory contains a plugin.yaml file.
func isPlugin(dirname string) bool {
_, err := os.Stat(filepath.Join(dirname, "plugin.yaml"))
_, err := os.Stat(filepath.Join(dirname, plugin.PluginFileName))
return err == nil
}

@ -28,7 +28,7 @@ import (
"helm.sh/helm/v3/pkg/cli"
)
const pluginFileName = "plugin.yaml"
const PluginFileName = "plugin.yaml"
// Downloaders represents the plugins capability if it can retrieve
// charts from special sources
@ -159,7 +159,7 @@ func (p *Plugin) PrepareCommand(extraArgs []string) (string, []string, error) {
// LoadDir loads a plugin from the given directory.
func LoadDir(dirname string) (*Plugin, error) {
data, err := ioutil.ReadFile(filepath.Join(dirname, pluginFileName))
data, err := ioutil.ReadFile(filepath.Join(dirname, PluginFileName))
if err != nil {
return nil, err
}
@ -177,7 +177,7 @@ func LoadDir(dirname string) (*Plugin, error) {
func LoadAll(basedir string) ([]*Plugin, error) {
plugins := []*Plugin{}
// We want basedir/*/plugin.yaml
scanpath := filepath.Join(basedir, "*", pluginFileName)
scanpath := filepath.Join(basedir, "*", PluginFileName)
matches, err := filepath.Glob(scanpath)
if err != nil {
return plugins, err

Loading…
Cancel
Save