RHINENG-21445: config cleanup

Author: TenSt

conf/database_admin.env

@@ -5,7 +5,6 @@ MANAGER_PASSWORD=manager
 LISTENER_PASSWORD=listener
 VMAAS_SYNC_PASSWORD=vmaas_sync
 EVALUATOR_PASSWORD=evaluator
-CYNDI_PASSWORD=cyndi
 
 # Optionally set schema_migration=XXX and/or reset_schema
 POD_CONFIG=update_users;update_db_config;wait_for_db=empty

database_admin/config.go

@@ -13,8 +13,6 @@ var (
 	resetSchema = utils.PodConfig.GetBool("reset_schema", false)
 	// Create users and update their password
 	updateUsers = utils.PodConfig.GetBool("update_users", false)
-	// Reset cyndi password
-	updateCyndiPasswd = utils.PodConfig.GetBool("update_cyndi_passwd", false)
 	// rerun config.sql
 	updateDBConfig = utils.PodConfig.GetBool("update_db_config", false)
 )

database_admin/update.go

@@ -134,9 +134,6 @@ func UpdateDB(migrationFilesURL string) {
 		execOrPanic(db, "ALTER USER evaluator WITH PASSWORD '"+utils.GetenvOrFail("EVALUATOR_PASSWORD")+"'")
 		execOrPanic(db, "ALTER USER manager WITH PASSWORD '"+utils.GetenvOrFail("MANAGER_PASSWORD")+"'")
 		execOrPanic(db, "ALTER USER vmaas_sync WITH PASSWORD '"+utils.GetenvOrFail("VMAAS_SYNC_PASSWORD")+"'")
-		if updateCyndiPasswd {
-			execOrPanic(db, "ALTER USER cyndi WITH PASSWORD '"+utils.GetenvOrFail("CYNDI_PASSWORD")+"'")
-		}
 	}
 
 	if updateDBConfig {

manager/config/config.go

@@ -14,8 +14,6 @@ var (
 	// Use in-memory package cache
 	EnabledPackageCache = utils.PodConfig.GetBool("package_cache", true)
 
-	// Allow filtering by cyndi tags
-	EnableCyndiTags = utils.PodConfig.GetBool("cyndi_tags", true)
 	// Use precomputed system counts for advisories
 	DisableCachedCounts = !utils.PodConfig.GetBool("cache_counts", true)
 	// Satellite systems can't be assigned to baselines/templates

manager/controllers/utils.go

@@ -5,7 +5,6 @@ import (
 	"app/base/core"
 	"app/base/database"
 	"app/base/utils"
-	"app/manager/config"
 	"app/manager/middlewares"
 	"encoding/csv"
 	"fmt"
@@ -240,9 +239,6 @@ type Tag struct {
 }
 
 func HasInventoryFilter(filters Filters) bool {
-	if !config.EnableCyndiTags {
-		return false
-	}
 	for _, data := range filters {
 		switch data.Type {
 		case InventoryFilter:
@@ -351,10 +347,6 @@ func parseTags(c *gin.Context, filters Filters) error {
 
 // Filter systems by tags with subquery
 func ApplyInventoryFilter(filters map[string]FilterData, tx *gorm.DB, systemIDExpr string) (*gorm.DB, bool) {
-	if !config.EnableCyndiTags {
-		return tx, false
-	}
-
 	subq := database.DB.
 		Table("system_inventory si").
 		Select("si.inventory_id")