Remove use of entity_profile_rules table (#3905)

PR #3903 replaced the one part of minder which queried the data in the
`entity_profile_rules` table. This PR removes the code which adds and
removes entries to this table. A future PR will drop the table outright.

database/query/profiles.sql

@@ -46,9 +46,6 @@ RETURNING *;
 -- name: DeleteProfileForEntity :exec
 DELETE FROM entity_profiles WHERE profile_id = $1 AND entity = $2;
 
--- name: GetProfileForEntity :one
-SELECT * FROM entity_profiles WHERE profile_id = $1 AND entity = $2;
-
 -- name: GetProfileByProjectAndID :many
 WITH helper AS(
     SELECT pr.id as profid,
@@ -113,14 +110,6 @@ AND (
 DELETE FROM profiles
 WHERE id = $1 AND project_id = $2;
 
--- name: UpsertRuleInstantiation :one
-INSERT INTO entity_profile_rules (entity_profile_id, rule_type_id)
-VALUES ($1, $2)
-ON CONFLICT (entity_profile_id, rule_type_id) DO NOTHING RETURNING *;
-
--- name: DeleteRuleInstantiation :exec
-DELETE FROM entity_profile_rules WHERE entity_profile_id = $1 AND rule_type_id = $2;
-
 -- name: ListProfilesInstantiatingRuleType :many
 SELECT DISTINCT(p.name)
 FROM profiles AS p

internal/engine/actions/alert/security_advisory/security_advisory.go

@@ -22,14 +22,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/stacklok/minder/internal/profiles/models"
 	htmltemplate "html/template"
 	"strings"
 
-	"github.com/stacklok/minder/internal/db"
-
 	"github.com/google/go-github/v63/github"
 	"github.com/rs/zerolog"
+	"github.com/stacklok/minder/internal/db"
+	"github.com/stacklok/minder/internal/profiles/models"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
 	enginerr "github.com/stacklok/minder/internal/engine/errors"

internal/profiles/service.go

@@ -272,7 +272,7 @@ func (p *profileService) UpdateProfile(
 		minderv1.Entity_ENTITY_TASK_RUN:           profile.GetTaskRun(),
 		minderv1.Entity_ENTITY_BUILD:              profile.GetBuild(),
 	} {
-		if err = updateProfileRulesForEntity(ctx, ent, &updatedProfile, qtx, entRules, rules); err != nil {
+		if err = updateProfileRulesForEntity(ctx, ent, &updatedProfile, qtx, entRules); err != nil {
 			return nil, err
 		}
 
@@ -302,11 +302,6 @@ func (p *profileService) UpdateProfile(
 	}
 
 	unusedRuleStatuses := getUnusedOldRuleStatuses(rules, oldRules)
-	unusedRuleTypes := getUnusedOldRuleTypes(rules, oldRules)
-
-	if err := deleteUnusedRulesFromProfile(ctx, &updatedProfile, unusedRuleTypes, qtx); err != nil {
-		return nil, status.Errorf(codes.Internal, "error updating profile: %v", err)
-	}
 
 	if err := deleteRuleStatusesForProfile(ctx, &updatedProfile, unusedRuleStatuses, qtx); err != nil {
 		return nil, status.Errorf(codes.Internal, "error updating profile: %v", err)
@@ -379,7 +374,7 @@ func copyFieldValue(dstReflect, srcReflect protoreflect.Message, fieldDesc proto
 		dstList.Truncate(0)
 
 		// append all elements from the source list to the destination list
-		// effectivelly replacing the destination list with the source list
+		// effectively replacing the destination list with the source list
 		for i := 0; i < srcList.Len(); i++ {
 			dstList.Append(srcList.Get(i))
 		}
@@ -418,7 +413,7 @@ func createProfileRulesForEntity(
 		log.Printf("error marshalling %s rules: %v", entity, err)
 		return status.Errorf(codes.Internal, "error creating profile")
 	}
-	entProf, err := qtx.CreateProfileForEntity(ctx, db.CreateProfileForEntityParams{
+	_, err = qtx.CreateProfileForEntity(ctx, db.CreateProfileForEntityParams{
 		ProfileID:       profile.ID,
 		Entity:          entities.EntityTypeToDB(entity),
 		ContextualRules: marshalled,
@@ -428,27 +423,6 @@ func createProfileRulesForEntity(
 		return status.Errorf(codes.Internal, "error creating profile")
 	}
 
-	for idx := range rulesInProf {
-		ruleRef := rulesInProf[idx]
-
-		if ruleRef.Entity != entity {
-			continue
-		}
-
-		ruleID := ruleRef.RuleID
-
-		_, err := qtx.UpsertRuleInstantiation(ctx, db.UpsertRuleInstantiationParams{
-			EntityProfileID: entProf.ID,
-			RuleTypeID:      ruleID,
-		})
-		if errors.Is(err, sql.ErrNoRows) {
-			log.Printf("the rule instantiation for rule already existed.")
-		} else if err != nil {
-			log.Printf("error creating rule instantiation: %v", err)
-			return status.Errorf(codes.Internal, "error creating profile")
-		}
-	}
-
 	return err
 }
 
@@ -620,48 +594,12 @@ func (_ *profileService) getRulesFromProfile(
 	return rulesInProf, nil
 }
 
-func deleteUnusedRulesFromProfile(
-	ctx context.Context,
-	profile *db.Profile,
-	unusedRules []EntityAndRuleTuple,
-	querier db.Querier,
-) error {
-	for _, rule := range unusedRules {
-		// get entity profile
-		log.Printf("getting profile for entity %s", rule.Entity)
-		entProf, err := querier.GetProfileForEntity(ctx, db.GetProfileForEntityParams{
-			ProfileID: profile.ID,
-			Entity:    entities.EntityTypeToDB(rule.Entity),
-		})
-		if err != nil {
-			if errors.Is(err, sql.ErrNoRows) {
-				log.Printf("skipping rule deletion for entity %s, profile not found", rule.Entity)
-				continue
-			}
-			log.Printf("error getting profile for entity %s: %v", rule.Entity, err)
-			return fmt.Errorf("error getting profile for entity %s: %w", rule.Entity, err)
-		}
-
-		log.Printf("deleting rule instantiation for rule %s for entity profile %s", rule.RuleID, entProf.ID)
-		if err := querier.DeleteRuleInstantiation(ctx, db.DeleteRuleInstantiationParams{
-			EntityProfileID: entProf.ID,
-			RuleTypeID:      rule.RuleID,
-		}); err != nil {
-			log.Printf("error deleting rule instantiation: %v", err)
-			return fmt.Errorf("error deleting rule instantiation: %w", err)
-		}
-	}
-
-	return nil
-}
-
 func updateProfileRulesForEntity(
 	ctx context.Context,
 	entity minderv1.Entity,
 	profile *db.Profile,
 	qtx db.Querier,
 	rules []*minderv1.Profile_Rule,
-	rulesInProf RuleMapping,
 ) error {
 	if len(rules) == 0 {
 		return qtx.DeleteProfileForEntity(ctx, db.DeleteProfileForEntityParams{
@@ -675,7 +613,7 @@ func updateProfileRulesForEntity(
 		log.Printf("error marshalling %s rules: %v", entity, err)
 		return status.Errorf(codes.Internal, "error creating profile")
 	}
-	entProf, err := qtx.UpsertProfileForEntity(ctx, db.UpsertProfileForEntityParams{
+	_, err = qtx.UpsertProfileForEntity(ctx, db.UpsertProfileForEntityParams{
 		ProfileID:       profile.ID,
 		Entity:          entities.EntityTypeToDB(entity),
 		ContextualRules: marshalled,
@@ -685,25 +623,6 @@ func updateProfileRulesForEntity(
 		return err
 	}
 
-	for idx := range rulesInProf {
-		ruleRef := rulesInProf[idx]
-
-		if ruleRef.Entity != entity {
-			continue
-		}
-
-		_, err := qtx.UpsertRuleInstantiation(ctx, db.UpsertRuleInstantiationParams{
-			EntityProfileID: entProf.ID,
-			RuleTypeID:      ruleRef.RuleID,
-		})
-		if errors.Is(err, sql.ErrNoRows) {
-			log.Printf("the rule instantiation for rule already existed.")
-		} else if err != nil {
-			log.Printf("error creating rule instantiation: %v", err)
-			return status.Errorf(codes.Internal, "error updating profile")
-		}
-	}
-
 	return err
 }
 
@@ -721,28 +640,6 @@ func getUnusedOldRuleStatuses(
 	return unusedRuleStatuses
 }
 
-func getUnusedOldRuleTypes(newRules, oldRules RuleMapping) []EntityAndRuleTuple {
-	var unusedRuleTypes []EntityAndRuleTuple
-
-	oldRulesTypeMap := make(map[string]EntityAndRuleTuple)
-	for ruleTypeAndName, rule := range oldRules {
-		oldRulesTypeMap[ruleTypeAndName.RuleType] = rule
-	}
-
-	newRulesTypeMap := make(map[string]EntityAndRuleTuple)
-	for ruleTypeAndName, rule := range newRules {
-		newRulesTypeMap[ruleTypeAndName.RuleType] = rule
-	}
-
-	for ruleType, rule := range oldRulesTypeMap {
-		if _, ok := newRulesTypeMap[ruleType]; !ok {
-			unusedRuleTypes = append(unusedRuleTypes, rule)
-		}
-	}
-
-	return unusedRuleTypes
-}
-
 func deleteRuleStatusesForProfile(
 	ctx context.Context,
 	profile *db.Profile,