hooks: handle prestart as createRuntime

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Author: giuseppe

pkg/hooks/hooks.go

@@ -122,10 +122,8 @@ func (m *Manager) Hooks(config *rspec.Spec, annotations map[string]string, hasBi
 					switch stage {
 					case "createContainer":
 						config.Hooks.CreateContainer = append(config.Hooks.CreateContainer, namedHook.hook.Hook)
-					case "createRuntime":
+					case "createRuntime", "prestart":
 						config.Hooks.CreateRuntime = append(config.Hooks.CreateRuntime, namedHook.hook.Hook)
-					case "prestart":
-						config.Hooks.Prestart = append(config.Hooks.Prestart, namedHook.hook.Hook)
 					case "poststart":
 						config.Hooks.Poststart = append(config.Hooks.Poststart, namedHook.hook.Hook)
 					case "poststop":

pkg/hooks/hooks_test.go

@@ -52,7 +52,7 @@ func TestGoodNew(t *testing.T) {
 	two := 2
 	three := 3
 	assert.Equal(t, &rspec.Hooks{
-		Prestart: []rspec.Hook{
+		CreateRuntime: []rspec.Hook{
 			{
 				Path:    path,
 				Timeout: &one,
@@ -183,7 +183,7 @@ func TestExtensionStage(t *testing.T) {
 	}
 
 	assert.Equal(t, &rspec.Hooks{
-		Prestart: []rspec.Hook{
+		CreateRuntime: []rspec.Hook{
 			{
 				Path: "/a/b/c",
 			},

pkg/hooks/monitor_test.go

@@ -46,7 +46,7 @@ func TestMonitorOneDirGood(t *testing.T) {
 		}
 
 		assert.Equal(t, &rspec.Hooks{
-			Prestart: []rspec.Hook{
+			CreateRuntime: []rspec.Hook{
 				{
 					Path: path,
 				},
@@ -128,7 +128,7 @@ func TestMonitorTwoDirGood(t *testing.T) {
 	fallbackPath := filepath.Join(fallbackDir, "a.json")
 	fallbackJSON := []byte(fmt.Sprintf("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"%s\"}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"]}", path))
 	fallbackInjected := &rspec.Hooks{
-		Prestart: []rspec.Hook{
+		CreateRuntime: []rspec.Hook{
 			{
 				Path: path,
 			},
@@ -156,7 +156,7 @@ func TestMonitorTwoDirGood(t *testing.T) {
 	primaryJSON := []byte(fmt.Sprintf("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"%s\", \"timeout\": 1}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"]}", path))
 	one := 1
 	primaryInjected := &rspec.Hooks{
-		Prestart: []rspec.Hook{
+		CreateRuntime: []rspec.Hook{
 			{
 				Path:    path,
 				Timeout: &one,