Revert previous implementation

Signed-off-by: Lucas Heinlen <lheinlen@onecause.com>

pkg/action/hooks.go

@@ -31,14 +31,12 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
 	executingHooks := []*release.Hook{}
 
 	for _, h := range rl.Hooks {
-		if !h.ExecutionDisabled {
 		for _, e := range h.Events {
 			if e == hook {
 				executingHooks = append(executingHooks, h)
 			}
 		}
 	}
-	}
 
 	// hooke are pre-ordered by kind, so keep order stable
 	sort.Stable(hookByWeight(executingHooks))

pkg/action/release_testing.go

@@ -64,26 +64,37 @@ func (r *ReleaseTesting) Run(name string) (*release.Release, error) {
 		return rel, err
 	}
 
+	skippedHooks := []*release.Hook{}
+	executingHooks := []*release.Hook{}
 	if len(r.Filters["!name"]) != 0 {
 		for _, h := range rel.Hooks {
 			if contains(r.Filters["!name"], h.Name) {
-				h.ExecutionDisabled = true
+				skippedHooks = append(skippedHooks, h)
+			} else {
+				executingHooks = append(executingHooks, h)
 			}
 		}
+		rel.Hooks = executingHooks
 	}
 	if len(r.Filters["name"]) != 0 {
+		executingHooks = nil
 		for _, h := range rel.Hooks {
-			if !contains(r.Filters["name"], h.Name) {
+			if contains(r.Filters["name"], h.Name) {
-				h.ExecutionDisabled = true
+				executingHooks = append(executingHooks, h)
+			} else {
+				skippedHooks = append(skippedHooks, h)
 			}
 		}
+		rel.Hooks = executingHooks
 	}
 
 	if err := r.cfg.execHook(rel, release.HookTest, r.Timeout); err != nil {
+		rel.Hooks = append(skippedHooks, rel.Hooks...)
 		r.cfg.Releases.Update(rel)
 		return rel, err
 	}
 
+	rel.Hooks = append(skippedHooks, rel.Hooks...)
 	return rel, r.cfg.Releases.Update(rel)
 }
 

pkg/release/hook.go

@@ -76,8 +76,6 @@ type Hook struct {
 	Weight int `json:"weight,omitempty"`
 	// DeletePolicies are the policies that indicate when to delete the hook
 	DeletePolicies []HookDeletePolicy `json:"delete_policies,omitempty"`
-	// ExecutionDisabled is set to true when a hook has been filtered out and should not be executed
-	ExecutionDisabled bool `json:"-"`
 }
 
 // A HookExecution records the result for the last execution of a hook for a given release.