External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-10-29 22:03:20 -02:30
Code Issues Packages Projects Releases Wiki Activity

[AAP-86051] Bump DAB pin to match log_orm_bypass_violation API

Browse Source 
CI builds awx_devel from requirements_git; pin at 282fb8e exposed a 6-arg
log_orm_bypass_violation while workflow pseudo-field audit uses the 5-arg
shape from newer DAB. Align pin with #1147 head and tighten dedupe test setup.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Vidya Nambiar
2026-09-28 15:59:33 -04:00
co-authored by Cursor
parent a6b7588b22
commit 2f91703b9d
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/tests/unit/utils/conftest.py
+14
View File
@@ -0,0 +1,14 @@
import logging
import pytest
_VALIDATION_SIGNALS_LOGGER = 'ansible_base.lib.utils.validation_signals'
@pytest.fixture(autouse=True)
def capture_validation_signal_logs_for_bypass_tests(request, caplog):
"""DAB caplog pattern (pytest + xdist); only for bypass observability tests."""
if request.module.__name__ != 'awx.main.tests.unit.utils.test_validation_bypass_observability':
return
caplog.set_level(logging.DEBUG)
caplog.set_level(logging.WARNING, logger=_VALIDATION_SIGNALS_LOGGER)
awx/main/tests/unit/utils/test_validation_bypass_observability.py
+10 -2
View File
@@ -80,13 +80,21 @@ def test_audit_bulk_model_instances_logs_host_description_on_bulk_create(caplog)
@pytest.mark.django_db
@pytest.mark.usefixtures('capture_validation_signal_logs')
def test_audit_workflow_job_nodes_skips_when_serializer_already_logged(caplog):
from ansible_base.lib.utils.validation_signals import register_serializer_validation_rejection
from ansible_base.lib.utils.validation_signals import (
get_validation_context_token,
register_serializer_validation_rejection,
reset_validation_context,
)
wfj = WorkflowJob.objects.create(name='wf-audit-limit-dedupe')
node = WorkflowJobNode(workflow_job=wfj, identifier='wf-node-1')
node.limit = '<script>x</script>'
register_serializer_validation_rejection('main.WorkflowJobNode', 'limit')
audit_workflow_job_nodes_for_bulk_create([node])
token = get_validation_context_token()
try:
audit_workflow_job_nodes_for_bulk_create([node])
finally:
reset_validation_context(token)
assert 'ORM bypass' not in caplog.text
requirements/requirements_git.txt
+1 -1
View File
@@ -21,5 +21,5 @@ certifi @ git+https://github.com/ansible/system-certifi.git@devel
ansible-runner @ git+https://github.com/ansible/ansible-runner.git@devel
awx-plugins-core[credentials-github-app] @ git+https://github.com/ansible/awx-plugins.git@devel
# AAP-86051: bulk_validation_audit + validation bypass observability (django-ansible-base#1147); revert to @devel after merge
django-ansible-base[feature-flags,jwt-consumer,rbac,resource-registry,rest-filters] @ git+https://github.com/vidyanambiar/django-ansible-base@282fb8e13c97656847a5879ac050108d3ba2b35a
django-ansible-base[feature-flags,jwt-consumer,rbac,resource-registry,rest-filters] @ git+https://github.com/vidyanambiar/django-ansible-base@d2cdd4fb3ff1ac9530f3bee81224a47f08225751
awx-plugins-interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git