Merge pull request #5423 from dokku/respect-plugin-path
Respect PLUGIN_PATH when checking if a plugin trigger exists
This commit is contained in:
@@ -21,6 +21,10 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func setupTests() (err error) {
|
func setupTests() (err error) {
|
||||||
|
if err := os.Setenv("PLUGIN_PATH", "/var/lib/dokku/plugins"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return os.Setenv("PLUGIN_ENABLED_PATH", "/var/lib/dokku/plugins/enabled")
|
return os.Setenv("PLUGIN_ENABLED_PATH", "/var/lib/dokku/plugins/enabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -132,12 +132,13 @@ func PlugnTriggerSetup(triggerName string, args ...string) *sh.Session {
|
|||||||
|
|
||||||
// PlugnTriggerExists returns whether a plugin trigger exists (ignoring the existence of any within the 20_events plugin)
|
// PlugnTriggerExists returns whether a plugin trigger exists (ignoring the existence of any within the 20_events plugin)
|
||||||
func PlugnTriggerExists(triggerName string) bool {
|
func PlugnTriggerExists(triggerName string) bool {
|
||||||
pluginPath := MustGetEnv("PLUGIN_ENABLED_PATH")
|
pluginPath := MustGetEnv("PLUGIN_PATH")
|
||||||
glob := filepath.Join(pluginPath, "*", triggerName)
|
pluginPathPrefix := filepath.Join(pluginPath, "enabled")
|
||||||
|
glob := filepath.Join(pluginPathPrefix, "*", triggerName)
|
||||||
exists := false
|
exists := false
|
||||||
files, _ := filepath.Glob(glob)
|
files, _ := filepath.Glob(glob)
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
plugin := strings.Trim(strings.TrimPrefix(strings.TrimSuffix(file, "/"+triggerName), pluginPath), "/")
|
plugin := strings.Trim(strings.TrimPrefix(strings.TrimSuffix(file, "/"+triggerName), pluginPathPrefix), "/")
|
||||||
if plugin != "20_events" {
|
if plugin != "20_events" {
|
||||||
exists = true
|
exists = true
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func setupTests() (err error) {
|
func setupTests() (err error) {
|
||||||
|
if err := os.Setenv("PLUGIN_PATH", "/var/lib/dokku/plugins"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
return os.Setenv("PLUGIN_ENABLED_PATH", "/var/lib/dokku/plugins/enabled")
|
return os.Setenv("PLUGIN_ENABLED_PATH", "/var/lib/dokku/plugins/enabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user