diff options
| -rw-r--r-- | pkg/hooks/read.go | 7 | ||||
| -rw-r--r-- | pkg/hooks/read_test.go | 21 |
2 files changed, 26 insertions, 2 deletions
diff --git a/pkg/hooks/read.go b/pkg/hooks/read.go index ae34913b6..a8c9a7adc 100644 --- a/pkg/hooks/read.go +++ b/pkg/hooks/read.go @@ -67,13 +67,16 @@ func ReadDir(path string, extensionStages []string, hooks map[string]*current.Ho } for _, file := range files { - hook, err := Read(filepath.Join(path, file.Name()), extensionStages) + filePath := filepath.Join(path, file.Name()) + hook, err := Read(filePath, extensionStages) if err != nil { if err == ErrNoJSONSuffix { continue } if os.IsNotExist(err) { - continue + if err2, ok := err.(*os.PathError); ok && err2.Path == filePath { + continue + } } return err } diff --git a/pkg/hooks/read_test.go b/pkg/hooks/read_test.go index 69e7aff44..811cace23 100644 --- a/pkg/hooks/read_test.go +++ b/pkg/hooks/read_test.go @@ -191,3 +191,24 @@ func TestBadDir(t *testing.T) { } assert.Regexp(t, "^parsing hook \"[^\"]*a.json\": unrecognized hook version: \"-1\"$", err.Error()) } + +func TestHookExecutableDoesNotExit(t *testing.T) { + dir, err := ioutil.TempDir("", "hooks-test-") + if err != nil { + t.Fatal(err) + } + defer os.RemoveAll(dir) + + jsonPath := filepath.Join(dir, "hook.json") + err = ioutil.WriteFile(jsonPath, []byte("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"/does/not/exist\"}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"]}"), 0644) + if err != nil { + t.Fatal(err) + } + + hooks := map[string]*current.Hook{} + err = ReadDir(dir, []string{}, hooks) + if err == nil { + t.Fatal("unexpected success") + } + assert.Regexp(t, "^stat /does/not/exist: no such file or directory$", err.Error()) +} |