Skip to content

chore: replace old queries due to cyndi migration(tag fiels) #2239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RostyslavKachan wants to merge 2 commits into
base: master
Choose a base branch
from
+67 −13
Open

chore: replace old queries due to cyndi migration(tag fiels) #2239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f8a65
chore: replace old queries due to cyndi migration(tag fiels)
RostyslavKachan Feb 24, 2026
6ed8e90
chore : replace old queries due to cyndi migration(sap_sids, ansible,…
RostyslavKachan Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions manager/cve_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
from common.peewee_model import SystemCveData
from common.peewee_model import SystemGroupSet
from common.peewee_model import SystemPlatform
from common.peewee_model import SystemTagSet
from common.peewee_model import SystemVulnerabilities
from common.peewee_model import SystemVulnerablePackage
from common.peewee_model import VulnerablePackageCVE
Expand Down Expand Up @@ -265,7 +266,11 @@ def _full_query(rh_account_id, synopsis, parsed_args, filters, remediation_filte
InsightsRule.resolution_text,
InsightsRule.kbase_node_id,
InsightsRule.more_info_text,
InventoryHosts.tags,
(
fn.COALESCE(SystemTagSet.tags, "[]").alias("tags")
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT)
else InventoryHosts.tags
),
InventoryHosts.updated,
InventoryHosts.insights_id,
(
Expand Down Expand Up @@ -303,6 +308,7 @@ def _full_query(rh_account_id, synopsis, parsed_args, filters, remediation_filte
if remediation_filter:
subq = subq.where(SystemVulnerabilities.remediation_type_id << remediation_filter)

subq = subq.switch(SystemPlatform).join(SystemTagSet, JOIN.LEFT_OUTER)
subq = cyndi_join(subq)
return apply_filters(subq, parsed_args, filters, {})

Expand Down Expand Up @@ -338,7 +344,11 @@ def _unpatched_full_query(self, rh_account_id, synopsis, parsed_args, filters) -
Value(None).alias("resolution_text"),
Value(0).alias("kbase_node_id"),
Value(None).alias("more_info_text"),
InventoryHosts.tags,
(
fn.COALESCE(SystemTagSet.tags, "[]").alias("tags")
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT)
else InventoryHosts.tags
),
InventoryHosts.updated,
InventoryHosts.insights_id,
(
Expand Down Expand Up @@ -370,6 +380,7 @@ def _unpatched_full_query(self, rh_account_id, synopsis, parsed_args, filters) -
.where(system_is_active(image=None))
.where(SystemVulnerablePackage.rh_account_id == rh_account_id)
)
unfixed_subq = unfixed_subq.switch(SystemPlatform).join(SystemTagSet, JOIN.LEFT_OUTER)
unfixed_subq = cyndi_join(unfixed_subq)
unfixed_subq = apply_filters(unfixed_subq, parsed_args, filters, {"unfixed": [True]})

Expand All @@ -396,7 +407,11 @@ def _id_query(rh_account_id, synopsis, parsed_args, filters, remediation_filter=
SystemVulnerabilities.mitigation_reason,
SystemPlatform.display_name.alias("display_name"),
fn.COALESCE(SystemVulnerabilities.remediation_type_id, remediation.PLAYBOOK.value).alias("remediation"),
InventoryHosts.tags,
(
fn.COALESCE(SystemTagSet.tags, "[]").alias("tags")
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT)
else InventoryHosts.tags
),
InventoryHosts.updated,
InventoryHosts.insights_id,
(
Expand Down Expand Up @@ -429,6 +444,7 @@ def _id_query(rh_account_id, synopsis, parsed_args, filters, remediation_filter=
if remediation_filter:
subq = subq.where(SystemVulnerabilities.remediation_type_id << remediation_filter)

subq = subq.switch(SystemPlatform).join(SystemTagSet, JOIN.LEFT_OUTER)
subq = cyndi_join(subq)
return apply_filters(subq, parsed_args, filters, {})

Expand All @@ -452,7 +468,11 @@ def _unpatched_id_query(self, rh_account_id, synopsis, parsed_args, filters) ->
Value(None).alias("mitigation_reason"),
SystemPlatform.display_name.alias("display_name"),
Value(remediation.NONE.value).alias("remediation"),
InventoryHosts.tags,
(
fn.COALESCE(SystemTagSet.tags, "[]").alias("tags")
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT)
else InventoryHosts.tags
),
InventoryHosts.updated,
InventoryHosts.insights_id,
(
Expand Down Expand Up @@ -483,6 +503,7 @@ def _unpatched_id_query(self, rh_account_id, synopsis, parsed_args, filters) ->
.where(system_is_active(image=None))
)

unfixed_subq = unfixed_subq.switch(SystemPlatform).join(SystemTagSet, JOIN.LEFT_OUTER)
unfixed_subq = cyndi_join(unfixed_subq)
unfixed_subq = apply_filters(unfixed_subq, parsed_args, filters, {"unfixed": [True]})

Expand Down
35 changes: 28 additions & 7 deletions manager/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from common.peewee_model import SystemCveData
from common.peewee_model import SystemGroupSet
from common.peewee_model import SystemPlatform
from common.peewee_model import SystemTagSet
from common.peewee_model import SystemVulnerabilities
from common.peewee_model import SystemVulnerablePackage

Expand Down Expand Up @@ -353,8 +354,9 @@ def _filter_system_by_tags(query, args, _kwargs):
object: Modified query with system CVE status filter applied
"""
if "tags" in args and args["tags"]:
tags_column = SystemTagSet.tags if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT) else InventoryHosts.tags
for tag in args["tags"]:
query = query.where(InventoryHosts.tags.contains([tag]))
query = query.where(tags_column.contains([tag]))
return query


Expand Down Expand Up @@ -420,10 +422,17 @@ def _filter_system_by_sap_sids(query, args, _kwargs):
"""
if "sap_sids" in args and args["sap_sids"]:
sap_sids = copy(args["sap_sids"])
expr = InventoryHosts.system_profile.contains({"sap_sids": [sap_sids[0]]})
cyndi_replication_enabled = UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT)
if cyndi_replication_enabled:
expr = SystemPlatform.sap_ids.contains(sap_sids[0])
else:
expr = InventoryHosts.system_profile.contains({"sap_sids": [sap_sids[0]]})
sap_sids.pop(0)
for sap_sid in sap_sids:
expr |= InventoryHosts.system_profile.contains({"sap_sids": [sap_sid]})
if cyndi_replication_enabled:
expr |= SystemPlatform.sap_ids.contains(sap_sid)
else:
expr |= InventoryHosts.system_profile.contains({"sap_sids": [sap_sid]})
query = query.where(expr)
return query

Expand Down Expand Up @@ -567,9 +576,15 @@ def _filter_system_by_ansible(query, args, _kwargs):
"""
if "ansible" in args and args["ansible"] is not None:
if args["ansible"]:
expr = InventoryHosts.system_profile.has_key("ansible")
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT):
expr = SystemPlatform.ansible
else:
expr = InventoryHosts.system_profile.has_key("ansible")
else:
expr = ~(InventoryHosts.system_profile.has_key("ansible"))
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT):
expr = ~SystemPlatform.ansible
else:
expr = ~(InventoryHosts.system_profile.has_key("ansible"))
query = query.where(expr)
return query

Expand All @@ -589,9 +604,15 @@ def _filter_system_by_mssql(query, args, _kwargs):
"""
if "mssql" in args and args["mssql"] is not None:
if args["mssql"]:
expr = InventoryHosts.system_profile.has_key("mssql")
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT):
expr = SystemPlatform.mssql
else:
expr = InventoryHosts.system_profile.has_key("mssql")
else:
expr = ~(InventoryHosts.system_profile.has_key("mssql"))
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT):
expr = ~SystemPlatform.mssql
else:
expr = ~(InventoryHosts.system_profile.has_key("mssql"))
query = query.where(expr)
return query

Expand Down
16 changes: 14 additions & 2 deletions manager/system_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
from common.peewee_model import SystemCveData
from common.peewee_model import SystemGroupSet
from common.peewee_model import SystemPlatform
from common.peewee_model import SystemTagSet
from common.peewee_model import SystemVulnerabilities
from common.peewee_model import SystemVulnerablePackage
from common.peewee_model import VulnerablePackageCVE
Expand Down Expand Up @@ -523,7 +524,11 @@ def _full_query(rh_account_id):
SystemPlatform.culled_timestamp,
Case(None, (((SystemPlatform.opt_out == False), SystemPlatform.cve_count_cache),), None).alias("cve_count"),
fn.COALESCE(SystemPlatform.host_type, HostType.RPMDNF).alias("host_type"),
InventoryHosts.tags,
(
fn.COALESCE(SystemTagSet.tags, "[]").alias("tags")
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT)
else InventoryHosts.tags
),
InventoryHosts.updated,
InventoryHosts.insights_id,
OS_INFO_QUERY.alias("os"),
Expand All @@ -537,6 +542,8 @@ def _full_query(rh_account_id):

return (
SystemPlatform.select(*selectables)
.switch(SystemPlatform)
.join(SystemTagSet, JOIN.LEFT_OUTER)
.where(SystemPlatform.rh_account_id == rh_account_id)
.where(system_is_active(deleted=False, image=None, opt_out=None, stale=None))
.where(SystemPlatform.last_evaluation.is_null(False) | SystemPlatform.advisor_evaluated.is_null(False))
Expand Down Expand Up @@ -827,7 +834,11 @@ def handle_get(cls, **kwargs):
SystemPlatform.last_upload,
SystemPlatform.stale,
fn.COALESCE(SystemPlatform.host_type, HostType.RPMDNF).alias("host_type"),
InventoryHosts.tags,
(
fn.COALESCE(SystemTagSet.tags, "[]").alias("tags")
if UNLEASH.is_enabled(CYNDI_REPLICATION_REPLACEMENT)
else InventoryHosts.tags
),
InventoryHosts.updated,
InventoryHosts.insights_id,
OS_INFO_QUERY.alias("os"),
Expand All @@ -848,6 +859,7 @@ def handle_get(cls, **kwargs):
.dicts()
)
query = apply_filters(query, args, [filter_types.SYSTEM_TAGS], {})
query = query.switch(SystemPlatform).join(SystemTagSet, JOIN.LEFT_OUTER)
system = cyndi_join(query).get()
except DoesNotExist as exc:
raise ApplicationException("inventory_id must exist and inventory_id must be visible to user", 404) from exc
Expand Down