RHINENG-19230: rename kafka related functions to something generic

as they no more deal with baselines

Author: MichaelMraka

manager/config/config.go

@@ -21,8 +21,6 @@ var (
 	// Satellite systems can't be assigned to baselines/templates
 	EnableSatelliteFunctionality = utils.PodConfig.GetBool("satellite_functionality", true)
 
-	// Send recalc message for systems which have been assigned to a different baseline
-	EnableBaselineChangeEval = utils.PodConfig.GetBool("baseline_change_eval", true)
 	// Send recalc message for systems which have been assigned to a different template
 	EnableTemplateChangeEval = utils.PodConfig.GetBool("template_change_eval", true)
 	// Honor rbac permissions (can be disabled for tests)

manager/controllers/template_subscribed_systems_update.go

@@ -59,7 +59,7 @@ func TemplateSubscribedSystemsUpdateHandler(c *gin.Context) {
 	// re-evaluate systems added/removed from templates
 	if config.EnableTemplateChangeEval {
 		inventoryAIDs := kafka.InventoryIDs2InventoryAIDs(account, systemList)
-		kafka.EvaluateBaselineSystems(inventoryAIDs)
+		kafka.RecalcSystems(inventoryAIDs)
 	}
 	c.Status(http.StatusOK)
 }

manager/controllers/template_systems_delete.go

@@ -53,7 +53,7 @@ func TemplateSystemsDeleteHandler(c *gin.Context) {
 	// re-evaluate systems removed from templates
 	if config.EnableTemplateChangeEval {
 		inventoryAIDs := kafka.InventoryIDs2InventoryAIDs(account, req.Systems)
-		kafka.EvaluateBaselineSystems(inventoryAIDs)
+		kafka.RecalcSystems(inventoryAIDs)
 	}
 	c.Status(http.StatusOK)
 }

manager/controllers/template_systems_update.go

@@ -86,7 +86,7 @@ func TemplateSystemsUpdateHandler(c *gin.Context) {
 	// re-evaluate systems added/removed from templates
 	if config.EnableTemplateChangeEval {
 		inventoryAIDs := kafka.InventoryIDs2InventoryAIDs(account, req.Systems)
-		kafka.EvaluateBaselineSystems(inventoryAIDs)
+		kafka.RecalcSystems(inventoryAIDs)
 	}
 	c.Status(http.StatusOK)
 }

manager/kafka/kafka.go

@@ -2,13 +2,8 @@ package kafka
 
 import (
 	"app/base"
-	"app/base/models"
 	"app/base/mqueue"
 	"app/base/utils"
-
-	"app/manager/config"
-
-	"gorm.io/gorm"
 )
 
 var (
@@ -21,44 +16,19 @@ type inventoryIDsBatch struct {
 }
 
 func TryStartEvalQueue(createWriter mqueue.CreateWriter) {
-	if !config.EnableBaselineChangeEval {
-		return
-	}
 	evalTopic := utils.FailIfEmpty(utils.CoreCfg.EvalTopic, "EVAL_TOPIC")
 	evalWriter = createWriter(evalTopic)
 	inventoryIDsChan = make(chan inventoryIDsBatch)
-	go runBaselineRecalcLoop()
+	go runRecalcLoop()
 }
 
-func runBaselineRecalcLoop() {
+func runRecalcLoop() {
 	for {
 		batch := <-inventoryIDsChan
 		sendInventoryIDs(batch.InventoryIDs)
 	}
 }
 
-func GetInventoryIDsToEvaluate(db *gorm.DB, baselineID *int64, accountID int,
-	configUpdated bool, updatedInventoryIDs []string) []mqueue.EvalData {
-	if !config.EnableBaselineChangeEval {
-		return nil
-	}
-
-	if !configUpdated && updatedInventoryIDs == nil {
-		return nil // no evaluation needed for no config and inventory IDs updates
-	}
-
-	var inventoryAIDs []mqueue.EvalData
-	if !configUpdated { // we just need to evaluate updated inventory IDs
-		inventoryAIDs = InventoryIDs2InventoryAIDs(accountID, updatedInventoryIDs)
-	} else { // config updated - we need to update all baseline inventory IDs and the added ones too
-		inventoryAIDs = getInventoryIDs(db, baselineID, accountID, updatedInventoryIDs)
-	}
-
-	utils.LogDebug("nInventoryIDs", len(inventoryAIDs), "accountID", accountID,
-		"Loaded inventory IDs to evaluate")
-	return inventoryAIDs
-}
-
 func InventoryIDs2InventoryAIDs(accountID int, inventoryIDs []string) []mqueue.EvalData {
 	inventoryAIDs := make([]mqueue.EvalData, 0, len(inventoryIDs))
 	for _, v := range inventoryIDs {
@@ -67,25 +37,6 @@ func InventoryIDs2InventoryAIDs(accountID int, inventoryIDs []string) []mqueue.E
 	return inventoryAIDs
 }
 
-func getInventoryIDs(db *gorm.DB, baselineID *int64, accountID int, inventoryIDs []string) []mqueue.EvalData {
-	var inventoryAIDs []mqueue.EvalData
-	query := db.Model(&models.SystemPlatform{}).
-		Select("inventory_id, rh_account_id").
-		Where("rh_account_id = ? AND baseline_id = ?", accountID, baselineID)
-
-	if len(inventoryIDs) > 0 {
-		query = query.Or("inventory_id IN (?) AND rh_account_id = ?", inventoryIDs, accountID)
-	}
-
-	err := query.Order("inventory_id").
-		Scan(&inventoryAIDs).Error
-	if err != nil {
-		utils.LogError("err", err.Error(),
-			"Unable to load inventory IDs for baseline")
-	}
-	return inventoryAIDs
-}
-
 func sendInventoryIDs(inventoryIDs mqueue.EvalDataSlice) {
 	if len(inventoryIDs) == 0 {
 		return
@@ -98,13 +49,8 @@ func sendInventoryIDs(inventoryIDs mqueue.EvalDataSlice) {
 	}
 }
 
-// Send all account systems of given baseline to evaluation.
-// Evaluate all account systems with no baseline if baselineID is nil (used for deleted baseline).
-func EvaluateBaselineSystems(inventoryAIDs []mqueue.EvalData) {
-	if !config.EnableBaselineChangeEval {
-		return
-	}
-
+// Send given systems to re-evaluation.
+func RecalcSystems(inventoryAIDs []mqueue.EvalData) {
 	batch := inventoryIDsBatch{InventoryIDs: inventoryAIDs}
 	inventoryIDsChan <- batch
 }

manager/kafka/kafka_test.go

@@ -16,12 +16,12 @@ func testEvaluateBaselineSystems(t *testing.T, baselineID *int64, accountID int,
 	configUpdated bool, inventoryIDs []string) mqueue.PlatformEvent {
 	utils.SkipWithoutDB(t)
 	core.SetupTestEnvironment()
-	config.EnableBaselineChangeEval = true
+	config.EnableTemplateChangeEval = true
 
 	writerMock := mqueue.MockKafkaWriter{}
 	TryStartEvalQueue(mqueue.MockCreateKafkaWriter(&writerMock))
 	inventoryAIDs := GetInventoryIDsToEvaluate(database.DB, baselineID, accountID, configUpdated, inventoryIDs)
-	EvaluateBaselineSystems(inventoryAIDs)
+	RecalcSystems(inventoryAIDs)
 	utils.AssertEqualWait(t, 1, func() (exp, act interface{}) {
 		return 1, len(writerMock.Messages)
 	})