External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update for django-ansible-base split (#14783)

Browse Source 
* update paths and names

* temp to get tests passing

* fix typo
This commit is contained in:
jessicamack
2024-01-19 12:30:32 -05:00
committed by GitHub
parent d91da39f81
commit 209747d88e
21 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/generics.py
View File

@@ -30,8 +30,8 @@ from rest_framework.permissions import IsAuthenticated
from rest_framework.renderers import StaticHTMLRenderer from rest_framework.renderers import StaticHTMLRenderer
from rest_framework.negotiation import DefaultContentNegotiation from rest_framework.negotiation import DefaultContentNegotiation
from ansible_base.filters.rest_framework.field_lookup_backend import FieldLookupBackend from ansible_base.rest_filters.rest_framework.field_lookup_backend import FieldLookupBackend
from ansible_base.utils.models import get_all_field_names from ansible_base.lib.utils.models import get_all_field_names
# AWX # AWX
from awx.main.models import UnifiedJob, UnifiedJobTemplate, User, Role, Credential, WorkflowJobTemplateNode, WorkflowApprovalTemplate from awx.main.models import UnifiedJob, UnifiedJobTemplate, User, Role, Credential, WorkflowJobTemplateNode, WorkflowApprovalTemplate

2
awx/api/serializers.py
View File

@@ -43,7 +43,7 @@ from rest_framework.utils.serializer_helpers import ReturnList
# Django-Polymorphic # Django-Polymorphic
from polymorphic.models import PolymorphicModel from polymorphic.models import PolymorphicModel
from ansible_base.utils.models import get_type_for_model from ansible_base.lib.utils.models import get_type_for_model
# AWX # AWX
from awx.main.access import get_user_capabilities from awx.main.access import get_user_capabilities

2
awx/conf/models.py
View File

@@ -7,7 +7,7 @@ import json
# Django # Django
from django.db import models from django.db import models
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx.main.models.base import CreatedModifiedModel from awx.main.models.base import CreatedModifiedModel

2
awx/main/access.py
View File

@@ -20,7 +20,7 @@ from rest_framework.exceptions import ParseError, PermissionDenied
# Django OAuth Toolkit # Django OAuth Toolkit
from awx.main.models.oauth import OAuth2Application, OAuth2AccessToken from awx.main.models.oauth import OAuth2Application, OAuth2AccessToken
from ansible_base.utils.validation import to_python_boolean from ansible_base.lib.utils.validation import to_python_boolean
# AWX # AWX
from awx.main.utils import ( from awx.main.utils import (

2
awx/main/models/__init__.py
View File

@@ -6,7 +6,7 @@ from django.conf import settings # noqa
from django.db import connection from django.db import connection
from django.db.models.signals import pre_delete # noqa from django.db.models.signals import pre_delete # noqa
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx.main.models.base import BaseModel, PrimordialModel, accepts_json, CLOUD_INVENTORY_SOURCES, VERBOSITY_CHOICES # noqa from awx.main.models.base import BaseModel, PrimordialModel, accepts_json, CLOUD_INVENTORY_SOURCES, VERBOSITY_CHOICES # noqa

2
awx/main/models/ad_hoc_commands.py
View File

@@ -12,7 +12,7 @@ from django.utils.text import Truncator
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx.api.versioning import reverse from awx.api.versioning import reverse

2
awx/main/models/ha.py
View File

@@ -17,7 +17,7 @@ from django.db.models import Sum, Q
import redis import redis
from solo.models import SingletonModel from solo.models import SingletonModel
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx import __version__ as awx_application_version from awx import __version__ as awx_application_version

2
awx/main/models/inventory.py
View File

@@ -25,7 +25,7 @@ from django.db.models import Q
# REST Framework # REST Framework
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx.api.versioning import reverse from awx.api.versioning import reverse

2
awx/main/models/jobs.py
View File

@@ -20,7 +20,7 @@ from django.core.exceptions import FieldDoesNotExist
# REST Framework # REST Framework
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx.api.versioning import reverse from awx.api.versioning import reverse

2
awx/main/models/mixins.py
View File

@@ -16,7 +16,7 @@ from django.db.models.query import QuerySet
from django.utils.crypto import get_random_string from django.utils.crypto import get_random_string
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx.main.models.rbac import Role, RoleAncestorEntry from awx.main.models.rbac import Role, RoleAncestorEntry

2
awx/main/models/notifications.py
View File

@@ -15,7 +15,7 @@ from django.utils.encoding import smart_str, force_str
from jinja2 import sandbox, ChainableUndefined from jinja2 import sandbox, ChainableUndefined
from jinja2.exceptions import TemplateSyntaxError, UndefinedError, SecurityError from jinja2.exceptions import TemplateSyntaxError, UndefinedError, SecurityError
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx.api.versioning import reverse from awx.api.versioning import reverse

2
awx/main/models/unified_jobs.py
View File

@@ -30,7 +30,7 @@ from rest_framework.exceptions import ParseError
# Django-Polymorphic # Django-Polymorphic
from polymorphic.models import PolymorphicModel from polymorphic.models import PolymorphicModel
from ansible_base.utils.models import prevent_search, get_type_for_model from ansible_base.lib.utils.models import prevent_search, get_type_for_model
# AWX # AWX
from awx.main.models.base import CommonModelNameNotUnique, PasswordFieldsModel, NotificationFieldsModel from awx.main.models.base import CommonModelNameNotUnique, PasswordFieldsModel, NotificationFieldsModel

2
awx/main/models/workflow.py
View File

@@ -23,7 +23,7 @@ from crum import get_current_user
from jinja2 import sandbox from jinja2 import sandbox
from jinja2.exceptions import TemplateSyntaxError, UndefinedError, SecurityError from jinja2.exceptions import TemplateSyntaxError, UndefinedError, SecurityError
from ansible_base.utils.models import prevent_search from ansible_base.lib.utils.models import prevent_search
# AWX # AWX
from awx.api.versioning import reverse from awx.api.versioning import reverse

2
awx/main/scheduler/task_manager.py
View File

@@ -17,7 +17,7 @@ from django.utils.timezone import now as tz_now
from django.conf import settings from django.conf import settings
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from ansible_base.utils.models import get_type_for_model from ansible_base.lib.utils.models import get_type_for_model
# AWX # AWX
from awx.main.dispatch.reaper import reap_job from awx.main.dispatch.reaper import reap_job

2
awx/main/tests/functional/api/test_survey_spec.py
View File

@@ -2,7 +2,7 @@ from unittest import mock
import pytest import pytest
import json import json
from ansible_base.utils.models import get_type_for_model from ansible_base.lib.utils.models import get_type_for_model
from awx.api.versioning import reverse from awx.api.versioning import reverse
from awx.main.models.jobs import JobTemplate, Job from awx.main.models.jobs import JobTemplate, Job

2
awx/main/tests/unit/api/test_filters.py
View File

@@ -5,7 +5,7 @@ import pytest
# Django # Django
from rest_framework.exceptions import PermissionDenied from rest_framework.exceptions import PermissionDenied
from ansible_base.filters.rest_framework.field_lookup_backend import FieldLookupBackend from ansible_base.rest_filters.rest_framework.field_lookup_backend import FieldLookupBackend
from awx.main.models import ( from awx.main.models import (
AdHocCommand, AdHocCommand,

2
awx/main/tests/unit/utils/test_common.py
View File

@@ -12,7 +12,7 @@ from unittest import mock
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
from ansible_base.utils.models import get_type_for_model from ansible_base.lib.utils.models import get_type_for_model
from awx.main.utils import common from awx.main.utils import common
from awx.api.validators import HostnameRegexValidator from awx.api.validators import HostnameRegexValidator

2
awx/main/tests/unit/utils/test_filters.py
View File

@@ -69,7 +69,7 @@ class mockHost:
@mock.patch('awx.main.utils.filters.get_model', return_value=mockHost()) @mock.patch('awx.main.utils.filters.get_model', return_value=mockHost())
class TestSmartFilterQueryFromString: class TestSmartFilterQueryFromString:
@mock.patch( @mock.patch(
'ansible_base.filters.rest_framework.field_lookup_backend.get_fields_from_path', lambda model, path: ([model], path) 'ansible_base.rest_filters.rest_framework.field_lookup_backend.get_fields_from_path', lambda model, path: ([model], path)
) # disable field filtering, because a__b isn't a real Host field ) # disable field filtering, because a__b isn't a real Host field
@pytest.mark.parametrize( @pytest.mark.parametrize(
"filter_string,q_expected", "filter_string,q_expected",

2
awx/main/utils/filters.py
View File

@@ -161,7 +161,7 @@ class SmartFilter(object):
else: else:
# detect loops and restrict access to sensitive fields # detect loops and restrict access to sensitive fields
# this import is intentional here to avoid a circular import # this import is intentional here to avoid a circular import
from ansible_base.filters.rest_framework.field_lookup_backend import FieldLookupBackend from ansible_base.rest_filters.rest_framework.field_lookup_backend import FieldLookupBackend
FieldLookupBackend().get_field_from_lookup(Host, k) FieldLookupBackend().get_field_from_lookup(Host, k)
kwargs[k] = v kwargs[k] = v

15
awx/settings/defaults.py
View File

@@ -352,7 +352,7 @@ INSTALLED_APPS = [
'awx.ui', 'awx.ui',
'awx.sso', 'awx.sso',
'solo', 'solo',
'ansible_base', 'ansible_base.rest_filters',
] ]
INTERNAL_IPS = ('127.0.0.1',) INTERNAL_IPS = ('127.0.0.1',)
@@ -1077,13 +1077,10 @@ HOST_METRIC_SUMMARY_TASK_INTERVAL = 7 # days
# django-ansible-base # django-ansible-base
ANSIBLE_BASE_FEATURES = {'AUTHENTICATION': False, 'SWAGGER': False, 'FILTERING': True}
from ansible_base import settings # noqa: E402
settings_file = os.path.join(os.path.dirname(settings.__file__), 'dynamic_settings.py')
include(settings_file)
ANSIBLE_BASE_TEAM_MODEL = 'main.Team' ANSIBLE_BASE_TEAM_MODEL = 'main.Team'
ANSIBLE_BASE_ORGANIZATION_MODEL = 'main.Organization' ANSIBLE_BASE_ORGANIZATION_MODEL = 'main.Organization'
from ansible_base.lib import dynamic_config # noqa: E402
settings_file = os.path.join(os.path.dirname(dynamic_config.__file__), 'dynamic_settings.py')
include(settings_file)

2
requirements/requirements_git.txt
View File

@@ -5,4 +5,4 @@ git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner
# specifically need https://github.com/robgolding/django-radius/pull/27 # specifically need https://github.com/robgolding/django-radius/pull/27
git+https://github.com/ansible/django-radius.git@develop#egg=django-radius git+https://github.com/ansible/django-radius.git@develop#egg=django-radius
git+https://github.com/ansible/python3-saml.git@devel#egg=python3-saml git+https://github.com/ansible/python3-saml.git@devel#egg=python3-saml
git+https://github.com/ansible/django-ansible-base.git@devel#egg=django-ansible-base[filtering] django-ansible-base @ git+https://github.com/john-westcott-iv/django-ansible-base@app_split#egg=django-ansible-base[rest_filters]