Use rule instance table in executor

cmd/dev/app/rule_type/rttst.go

@@ -39,6 +39,7 @@ import (
 	"github.com/stacklok/minder/internal/engine/rtengine"
 	"github.com/stacklok/minder/internal/logger"
 	"github.com/stacklok/minder/internal/profiles"
+	"github.com/stacklok/minder/internal/profiles/models"
 	"github.com/stacklok/minder/internal/providers/credentials"
 	"github.com/stacklok/minder/internal/providers/dockerhub"
 	"github.com/stacklok/minder/internal/providers/github/clients"
@@ -170,13 +171,18 @@ func testCmdRun(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
+	actionConfig := models.ActionConfiguration{
+		Remediate: models.ActionOptFromString(profile.Remediate, models.ActionOptOff),
+		Alert:     models.ActionOptFromString(profile.Alert, models.ActionOptOff),
+	}
+
 	// TODO: use cobra context here
 	ctx := context.Background()
 	eng, err := rtengine.NewRuleTypeEngine(ctx, ruletype, prov)
 	if err != nil {
 		return fmt.Errorf("cannot create rule type engine: %w", err)
 	}
-	actionEngine, err := actions.NewRuleActions(ctx, profile, ruletype, prov)
+	actionEngine, err := actions.NewRuleActions(ctx, ruletype, prov, &actionConfig)
 	if err != nil {
 		return fmt.Errorf("cannot create rule actions engine: %w", err)
 	}
@@ -217,9 +223,14 @@ func runEvaluationForRules(
 			return fmt.Errorf("error validating params against schema: %w", err)
 		}
 
+		rule := models.RuleFromPB(
+			uuid.New(), // Actual rule type ID does not matter here
+			frag,
+		)
+
 		// Create the eval status params
 		evalStatus := &engif.EvalStatusParams{
-			Rule: frag,
+			Rule: &rule,
 			EvalStatusFromDb: &db.ListRuleEvaluationsByProfileIdRow{
 				RemStatus:   remediateStatus,
 				RemMetadata: remMetadata,

database/query/profiles.sql

@@ -154,3 +154,8 @@ GROUP BY r.entity_type;
 
 -- name: CountProfilesByName :one
 SELECT COUNT(*) AS num_named_profiles FROM profiles WHERE lower(name) = lower(sqlc.arg(name));
+
+-- name: BulkGetProfilesByID :many
+SELECT *
+FROM profiles
+WHERE id = ANY(sqlc.arg(profile_ids)::UUID[]);

database/query/rule_instances.sql

@@ -44,21 +44,17 @@ RETURNING id;
 -- name: GetRuleInstancesForProfile :many
 SELECT * FROM rule_instances WHERE profile_id = $1;
 
--- name: GetRuleInstancesForProfileEntity :many
-SELECT * FROM rule_instances WHERE profile_id = $1 AND entity_type = $2;
+-- name: GetRuleInstancesEntityInProjects :many
+SELECT * FROM rule_instances
+WHERE entity_type = $1
+AND project_id = ANY(sqlc.arg(project_ids)::UUID[]);
 
 -- name: DeleteNonUpdatedRules :exec
 DELETE FROM rule_instances
 WHERE profile_id = $1
 AND entity_type = $2
 AND NOT id = ANY(sqlc.arg(updated_ids)::UUID[]);
 
--- name: GetIDByProfileEntityName :one
-SELECT id FROM rule_instances
-WHERE profile_id = $1
-AND entity_type = $2
-AND name = $3;
-
 -- intended as a temporary transition query
 -- this will be removed once rule_instances is used consistently in the engine
 -- name: GetRuleTypeIDByRuleNameEntityProfile :one

database/query/rule_types.sql

@@ -42,3 +42,9 @@ SELECT rt.* FROM rule_type AS rt
 JOIN rule_instances AS ri ON ri.rule_type_id = rt.id
 WHERE ri.entity_type = $1
 AND ri.project_id = ANY(sqlc.arg(projects)::uuid[]);
+
+-- intended as a temporary transition query
+-- this will be removed once the evaluation history tables replace the old state tables
+-- name: GetRuleTypeNameByID :one
+SELECT name FROM rule_type
+WHERE id = $1;

internal/engine/actions/actions.go

@@ -48,9 +48,9 @@ type RuleActionsEngine struct {
 // NewRuleActions creates a new rule actions engine
 func NewRuleActions(
 	ctx context.Context,
-	profile *minderv1.Profile,
 	ruletype *minderv1.RuleType,
 	provider provinfv1.Provider,
+	actionConfig *models.ActionConfiguration,
 ) (*RuleActionsEngine, error) {
 	// Create the remediation engine
 	remEngine, err := remediate.NewRuleRemediator(ruletype, provider)
@@ -72,8 +72,8 @@ func NewRuleActions(
 		// The on/off state of the actions is an integral part of the action engine
 		// and should be set upon creation.
 		actionsOnOff: map[engif.ActionType]models.ActionOpt{
-			remEngine.Class():   remEngine.GetOnOffState(profile),
-			alertEngine.Class(): alertEngine.GetOnOffState(profile),
+			remEngine.Class():   actionConfig.Remediate,
+			alertEngine.Class(): actionConfig.Alert,
 		},
 	}, nil
 }