chore(selectors/kernel): consolidate action verification checks

Signed-off-by: David Windsor <[email protected]>

Author: dwindsor

pkg/selectors/kernel.go

@@ -1519,35 +1519,35 @@ func HasOverride(spec *v1alpha1.KProbeSpec) bool {
 	return false
 }
 
-func HasSigkillAction(kspec *v1alpha1.KProbeSpec) bool {
-	for i := range kspec.Selectors {
-		s := &kspec.Selectors[i]
-		for j := range s.MatchActions {
-			act := strings.ToLower(s.MatchActions[j].Action)
-			if act == "sigkill" {
+// HasAction returns true if any selector in the KProbeSpec has the specified action
+func HasAction(kspec *v1alpha1.KProbeSpec, actionName string) bool {
+	act := strings.ToLower(actionName)
+	for _, s := range kspec.Selectors {
+		for _, action := range s.MatchActions {
+			if strings.ToLower(action.Action) == act {
 				return true
 			}
 		}
 	}
 	return false
 }
 
-func HasFilter(selectors []v1alpha1.KProbeSelector, index uint32) bool {
-	for _, s := range selectors {
-		for _, a := range s.MatchArgs {
-			if a.Index == index {
+// HasActionType returns true if any selector in the KProbeSpec has the specified action type
+func HasActionType(kspec *v1alpha1.KProbeSpec, actionType int32) bool {
+	for _, s := range kspec.Selectors {
+		for _, action := range s.MatchActions {
+			if ActionTypeFromString(action.Action) == actionType {
 				return true
 			}
 		}
 	}
 	return false
 }
 
-// HasNotifyEnforcerAction returns true if any selector in the KProbeSpec has a NotifyEnforcer action
-func HasNotifyEnforcerAction(kspec *v1alpha1.KProbeSpec) bool {
-	for _, s := range kspec.Selectors {
-		for _, action := range s.MatchActions {
-			if action.Action == "NotifyEnforcer" {
+func HasFilter(selectors []v1alpha1.KProbeSelector, index uint32) bool {
+	for _, s := range selectors {
+		for _, a := range s.MatchArgs {
+			if a.Index == index {
 				return true
 			}
 		}

pkg/sensors/tracing/generickprobe.go

@@ -466,7 +466,7 @@ func preValidateKprobe(
 		}
 	}
 
-	if selectors.HasSigkillAction(f) && !config.EnableLargeProgs() {
+	if selectors.HasActionType(f, selectors.ActionTypeSigKill) && !config.EnableLargeProgs() {
 		return nil, errors.New("sigkill action requires kernel >= 5.3.0")
 	}
 
@@ -540,7 +540,7 @@ func preValidateKprobes(log logger.FieldLogger, kprobes []v1alpha1.KProbeSpec, l
 
 	// If the NotifyEnforcer action is specified, there must be at least one enforcer.
 	for _, kprobe := range kprobes {
-		if selectors.HasNotifyEnforcerAction(&kprobe) {
+		if selectors.HasActionType(&kprobe, selectors.ActionTypeNotifyEnforcer) {
 			if len(enforcers) == 0 {
 				return nil, errors.New("NotifyEnforcer action specified, but spec contains no enforcers")
 			}