Adds functionality to add multiple rrules to a schedule and save the form

.github/triage_replies.md

@@ -106,13 +106,6 @@ The Ansible Community is looking at building an EE that corresponds to all of th
 ### Oracle AWX
 We'd be happy to help if you can reproduce this with AWX since we do not have Oracle's Linux Automation Manager. If you need help with this specific version of Oracles Linux Automation Manager you will need to contact your Oracle for support. 
 
-### Community Resolved
-Hi,
-
-We are happy to see that it appears a fix has been provided for your issue, so we will go ahead and close this ticket. Please feel free to reopen if any other problems arise.
-
-<name of community member who helped> thanks so much for taking the time to write a thoughtful and helpful response to this issue!
-
 ### AWX Release
 Subject: Announcing AWX Xa.Ya.za and AWX-Operator Xb.Yb.zb
 

.github/workflows/ci.yml

@@ -1,10 +1,8 @@
 ---
 name: CI
 env:
+  BRANCH: ${{ github.base_ref || 'devel' }}
   LC_ALL: "C.UTF-8" # prevent ERROR: Ansible could not initialize the preferred locale: unsupported locale setting
-  CI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  DEV_DOCKER_TAG_BASE: ghcr.io/${{ github.repository_owner }}
-  COMPOSE_TAG: ${{ github.base_ref || 'devel' }}
 on:
   pull_request:
 jobs:
@@ -20,33 +18,85 @@ jobs:
         tests:
           - name: api-test
             command: /start_tests.sh
+            label: Run API Tests
           - name: api-lint
             command: /var/lib/awx/venv/awx/bin/tox -e linters
+            label: Run API Linters
           - name: api-swagger
             command: /start_tests.sh swagger
+            label: Generate API Reference
           - name: awx-collection
             command: /start_tests.sh test_collection_all
+            label: Run Collection Tests
           - name: api-schema
+            label: Check API Schema
             command: /start_tests.sh detect-schema-change SCHEMA_DIFF_BASE_BRANCH=${{ github.event.pull_request.base.ref }}
           - name: ui-lint
+            label: Run UI Linters
             command: make ui-lint
           - name: ui-test-screens
+            label: Run UI Screens Tests
             command: make ui-test-screens
           - name: ui-test-general
+            label: Run UI General Tests
             command: make ui-test-general
     steps:
       - uses: actions/checkout@v2
 
-      - name: Run check ${{ matrix.tests.name }}
-        run: AWX_DOCKER_CMD='${{ matrix.tests.command }}' make github_ci_runner
+      - name: Get python version from Makefile
+        run: echo py_version=`make PYTHON_VERSION` >> $GITHUB_ENV
 
+      - name: Install python ${{ env.py_version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ env.py_version }}
+
+      - name: Log in to registry
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Pre-pull image to warm build cache
+        run: |
+          docker pull ghcr.io/${{ github.repository_owner }}/awx_devel:${{ env.BRANCH }} || :
+
+      - name: Build image
+        run: |
+          DEV_DOCKER_TAG_BASE=ghcr.io/${{ github.repository_owner }} COMPOSE_TAG=${{ env.BRANCH }} make docker-compose-build
+
+      - name: ${{ matrix.texts.label }}
+        run: |
+          docker run -u $(id -u) --rm -v ${{ github.workspace}}:/awx_devel/:Z \
+            --workdir=/awx_devel ghcr.io/${{ github.repository_owner }}/awx_devel:${{ env.BRANCH }} ${{ matrix.tests.command }}
   dev-env:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
+      - name: Get python version from Makefile
+        run: echo py_version=`make PYTHON_VERSION` >> $GITHUB_ENV
+
+      - name: Install python ${{ env.py_version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ env.py_version }}
+
+      - name: Log in to registry
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Pre-pull image to warm build cache
+        run: |
+          docker pull ghcr.io/${{ github.repository_owner }}/awx_devel:${{ env.BRANCH }} || :
+
+      - name: Build image
+        run: |
+          DEV_DOCKER_TAG_BASE=ghcr.io/${{ github.repository_owner }} COMPOSE_TAG=${{ env.BRANCH }} make docker-compose-build
+
       - name: Run smoke test
-        run: make github_ci_setup && ansible-playbook tools/docker-compose/ansible/smoke-test.yml -v
+        run: |
+          export DEV_DOCKER_TAG_BASE=ghcr.io/${{ github.repository_owner }}
+          export COMPOSE_TAG=${{ env.BRANCH }}
+          ansible-playbook tools/docker-compose/ansible/smoke-test.yml -e repo_dir=$(pwd) -v
 
   awx-operator:
     runs-on: ubuntu-latest

.github/workflows/pr_body_check.yml

@@ -17,9 +17,9 @@ jobs:
         env:
           PR_BODY: ${{ github.event.pull_request.body }}
         run: |
-          echo "$PR_BODY" | grep "Bug, Docs Fix or other nominal change" > Z
-          echo "$PR_BODY" | grep "New or Enhanced Feature" > Y
-          echo "$PR_BODY" | grep "Breaking Change" > X
+          echo $PR_BODY | grep "Bug, Docs Fix or other nominal change" > Z
+          echo $PR_BODY | grep "New or Enhanced Feature" > Y
+          echo $PR_BODY | grep "Breaking Change" > X
           exit 0
         # We exit 0 and set the shell to prevent the returns from the greps from failing this step
         # See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference

.github/workflows/promote.yml

@@ -38,13 +38,9 @@ jobs:
       - name: Build collection and publish to galaxy
         run: |
           COLLECTION_TEMPLATE_VERSION=true COLLECTION_NAMESPACE=${{ env.collection_namespace }} make build_collection
-          if [ "$(curl --head -sw '%{http_code}' https://galaxy.ansible.com/download/${{ env.collection_namespace }}-awx-${{ github.event.release.tag_name }}.tar.gz | tail -1)" == "302" ] ; then \
-              echo "Galaxy release already done"; \
-          else \
-              ansible-galaxy collection publish \
-                --token=${{ secrets.GALAXY_TOKEN }} \
-                awx_collection_build/${{ env.collection_namespace }}-awx-${{ github.event.release.tag_name }}.tar.gz; \
-          fi
+          ansible-galaxy collection publish \
+            --token=${{ secrets.GALAXY_TOKEN }} \
+            awx_collection_build/${{ env.collection_namespace }}-awx-${{ github.event.release.tag_name }}.tar.gz
 
       - name: Set official pypi info
         run: echo pypi_repo=pypi >> $GITHUB_ENV
@@ -56,7 +52,6 @@ jobs:
 
       - name: Build awxkit and upload to pypi
         run: |
-          git reset --hard
           cd awxkit && python3 setup.py bdist_wheel
           twine upload \
             -r ${{ env.pypi_repo }} \
@@ -79,6 +74,4 @@ jobs:
           docker tag ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }} quay.io/${{ github.repository }}:latest
           docker push quay.io/${{ github.repository }}:${{ github.event.release.tag_name }}
           docker push quay.io/${{ github.repository }}:latest
-          docker pull ghcr.io/${{ github.repository_owner }}/awx-ee:${{ github.event.release.tag_name }}
-          docker tag ghcr.io/${{ github.repository_owner }}/awx-ee:${{ github.event.release.tag_name }} quay.io/${{ github.repository_owner }}/awx-ee:${{ github.event.release.tag_name }}
-          docker push quay.io/${{ github.repository_owner }}/awx-ee:${{ github.event.release.tag_name }}
+

.github/workflows/stage.yml

@@ -84,20 +84,6 @@ jobs:
             -e push=yes \
             -e awx_official=yes
 
-      - name: Log in to GHCR
-        run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Log in to Quay
-        run: |
-          echo ${{ secrets.QUAY_TOKEN }} | docker login quay.io -u ${{ secrets.QUAY_USER }} --password-stdin
-
-      - name: tag awx-ee:latest with version input
-        run: |
-          docker pull quay.io/ansible/awx-ee:latest
-          docker tag quay.io/ansible/awx-ee:latest ghcr.io/${{ github.repository_owner }}/awx-ee:${{ github.event.inputs.version }}
-          docker push ghcr.io/${{ github.repository_owner }}/awx-ee:${{ github.event.inputs.version }}
-
       - name: Build and stage awx-operator
         working-directory: awx-operator
         run: |
@@ -117,7 +103,6 @@ jobs:
         env:
           AWX_TEST_IMAGE: ${{ github.repository }}
           AWX_TEST_VERSION: ${{ github.event.inputs.version }}
-          AWX_EE_TEST_IMAGE: ghcr.io/${{ github.repository_owner }}/awx-ee:${{ github.event.inputs.version }}
 
       - name: Create draft release for AWX
         working-directory: awx

Makefile

@@ -65,7 +65,7 @@ I18N_FLAG_FILE = .i18n_built
 	sdist \
 	ui-release ui-devel \
 	VERSION PYTHON_VERSION docker-compose-sources \
-	.git/hooks/pre-commit github_ci_setup github_ci_runner
+	.git/hooks/pre-commit
 
 clean-tmp:
 	rm -rf tmp/
@@ -301,21 +301,6 @@ test:
 	cd awxkit && $(VENV_BASE)/awx/bin/tox -re py3
 	awx-manage check_migrations --dry-run --check  -n 'missing_migration_file'
 
-## Login to Github container image registry, pull image, then build image.
-github_ci_setup:
-	# GITHUB_ACTOR is automatic github actions env var
-	# CI_GITHUB_TOKEN is defined in .github files
-	echo $(CI_GITHUB_TOKEN) | docker login ghcr.io -u $(GITHUB_ACTOR) --password-stdin
-	docker pull $(DEVEL_IMAGE_NAME) || :  # Pre-pull image to warm build cache
-	make docker-compose-build
-
-## Runs AWX_DOCKER_CMD inside a new docker container.
-docker-runner:
-	docker run -u $(shell id -u) --rm -v $(shell pwd):/awx_devel/:Z --workdir=/awx_devel $(DEVEL_IMAGE_NAME) $(AWX_DOCKER_CMD)
-
-## Builds image and runs AWX_DOCKER_CMD in it, mainly for .github checks.
-github_ci_runner: github_ci_setup docker-runner
-
 test_collection:
 	rm -f $(shell ls -d $(VENV_BASE)/awx/lib/python* | head -n 1)/no-global-site-packages.txt
 	if [ "$(VENV_BASE)" ]; then \

awx/__init__.py

@@ -67,6 +67,7 @@ else:
     from django.db import connection
 
 if HAS_DJANGO is True:
+
     # See upgrade blocker note in requirements/README.md
     try:
         names_digest('foo', 'bar', 'baz', length=8)

awx/api/conf.py

@@ -96,15 +96,6 @@ register(
     category=_('Authentication'),
     category_slug='authentication',
 )
-register(
-    'ALLOW_METRICS_FOR_ANONYMOUS_USERS',
-    field_class=fields.BooleanField,
-    default=False,
-    label=_('Allow anonymous users to poll metrics'),
-    help_text=_('If true, anonymous users are allowed to poll metrics.'),
-    category=_('Authentication'),
-    category_slug='authentication',
-)
 
 
 def authentication_validate(serializer, attrs):

awx/api/fields.py

@@ -80,6 +80,7 @@ class VerbatimField(serializers.Field):
 
 
 class OAuth2ProviderField(fields.DictField):
+
     default_error_messages = {'invalid_key_names': _('Invalid key names: {invalid_key_names}')}
     valid_key_names = {'ACCESS_TOKEN_EXPIRE_SECONDS', 'AUTHORIZATION_CODE_EXPIRE_SECONDS', 'REFRESH_TOKEN_EXPIRE_SECONDS'}
     child = fields.IntegerField(min_value=1)

awx/api/filters.py

@@ -160,6 +160,7 @@ class FieldLookupBackend(BaseFilterBackend):
     NO_DUPLICATES_ALLOW_LIST = (CharField, IntegerField, BooleanField, TextField)
 
     def get_fields_from_lookup(self, model, lookup):
+
         if '__' in lookup and lookup.rsplit('__', 1)[-1] in self.SUPPORTED_LOOKUPS:
             path, suffix = lookup.rsplit('__', 1)
         else:

awx/api/generics.py

@@ -135,6 +135,7 @@ def get_default_schema():
 
 
 class APIView(views.APIView):
+
     schema = get_default_schema()
     versioning_class = URLPathVersioning
 
@@ -799,6 +800,7 @@ class RetrieveUpdateDestroyAPIView(RetrieveUpdateAPIView, DestroyAPIView):
 
 
 class ResourceAccessList(ParentMixin, ListAPIView):
+
     serializer_class = ResourceAccessListElementSerializer
     ordering = ('username',)
 
@@ -821,6 +823,7 @@ def trigger_delayed_deep_copy(*args, **kwargs):
 
 
 class CopyAPIView(GenericAPIView):
+
     serializer_class = CopySerializer
     permission_classes = (AllowAny,)
     copy_return_serializer_class = None

awx/api/metadata.py

@@ -128,7 +128,7 @@ class Metadata(metadata.SimpleMetadata):
         # Special handling of notification configuration where the required properties
         # are conditional on the type selected.
         if field.field_name == 'notification_configuration':
-            for notification_type_name, notification_tr_name, notification_type_class in NotificationTemplate.NOTIFICATION_TYPES:
+            for (notification_type_name, notification_tr_name, notification_type_class) in NotificationTemplate.NOTIFICATION_TYPES:
                 field_info[notification_type_name] = notification_type_class.init_parameters
 
         # Special handling of notification messages where the required properties
@@ -138,7 +138,7 @@ class Metadata(metadata.SimpleMetadata):
         except (AttributeError, KeyError):
             view_model = None
         if view_model == NotificationTemplate and field.field_name == 'messages':
-            for notification_type_name, notification_tr_name, notification_type_class in NotificationTemplate.NOTIFICATION_TYPES:
+            for (notification_type_name, notification_tr_name, notification_type_class) in NotificationTemplate.NOTIFICATION_TYPES:
                 field_info[notification_type_name] = notification_type_class.default_messages
 
         # Update type of fields returned...

awx/api/pagination.py

@@ -24,6 +24,7 @@ class DisabledPaginator(DjangoPaginator):
 
 
 class Pagination(pagination.PageNumberPagination):
+
     page_size_query_param = 'page_size'
     max_page_size = settings.MAX_PAGE_SIZE
     count_disabled = False

awx/api/renderers.py

@@ -22,6 +22,7 @@ class SurrogateEncoder(encoders.JSONEncoder):
 
 
 class DefaultJSONRenderer(renderers.JSONRenderer):
+
     encoder_class = SurrogateEncoder
 
 
@@ -94,6 +95,7 @@ class BrowsableAPIRenderer(renderers.BrowsableAPIRenderer):
 
 
 class PlainTextRenderer(renderers.BaseRenderer):
+
     media_type = 'text/plain'
     format = 'txt'
 
@@ -104,15 +106,18 @@ class PlainTextRenderer(renderers.BaseRenderer):
 
 
 class DownloadTextRenderer(PlainTextRenderer):
+
     format = "txt_download"
 
 
 class AnsiTextRenderer(PlainTextRenderer):
+
     media_type = 'text/plain'
     format = 'ansi'
 
 
 class AnsiDownloadRenderer(PlainTextRenderer):
+
     format = "ansi_download"
 
 

awx/api/serializers.py

@@ -200,6 +200,7 @@ def reverse_gfk(content_object, request):
 
 
 class CopySerializer(serializers.Serializer):
+
     name = serializers.CharField()
 
     def validate(self, attrs):
@@ -431,6 +432,7 @@ class BaseSerializer(serializers.ModelSerializer, metaclass=BaseSerializerMetacl
                     continue
                 summary_fields[fk] = OrderedDict()
                 for field in related_fields:
+
                     fval = getattr(fkval, field, None)
 
                     if fval is None and field == 'type':
@@ -928,6 +930,7 @@ class UnifiedJobListSerializer(UnifiedJobSerializer):
 
 
 class UnifiedJobStdoutSerializer(UnifiedJobSerializer):
+
     result_stdout = serializers.SerializerMethodField()
 
     class Meta:
@@ -941,6 +944,7 @@ class UnifiedJobStdoutSerializer(UnifiedJobSerializer):
 
 
 class UserSerializer(BaseSerializer):
+
     password = serializers.CharField(required=False, default='', write_only=True, help_text=_('Write-only field used to change the password.'))
     ldap_dn = serializers.CharField(source='profile.ldap_dn', read_only=True)
     external_account = serializers.SerializerMethodField(help_text=_('Set if the account is managed by an external service'))
@@ -1100,6 +1104,7 @@ class UserActivityStreamSerializer(UserSerializer):
 
 
 class BaseOAuth2TokenSerializer(BaseSerializer):
+
     refresh_token = serializers.SerializerMethodField()
     token = serializers.SerializerMethodField()
     ALLOWED_SCOPES = ['read', 'write']
@@ -1217,6 +1222,7 @@ class UserPersonalTokenSerializer(BaseOAuth2TokenSerializer):
 
 
 class OAuth2ApplicationSerializer(BaseSerializer):
+
     show_capabilities = ['edit', 'delete']
 
     class Meta:
@@ -1451,6 +1457,7 @@ class ExecutionEnvironmentSerializer(BaseSerializer):
 
 
 class ProjectSerializer(UnifiedJobTemplateSerializer, ProjectOptionsSerializer):
+
     status = serializers.ChoiceField(choices=Project.PROJECT_STATUS_CHOICES, read_only=True)
     last_update_failed = serializers.BooleanField(read_only=True)
     last_updated = serializers.DateTimeField(read_only=True)
@@ -1541,6 +1548,7 @@ class ProjectSerializer(UnifiedJobTemplateSerializer, ProjectOptionsSerializer):
 
 
 class ProjectPlaybooksSerializer(ProjectSerializer):
+
     playbooks = serializers.SerializerMethodField(help_text=_('Array of playbooks available within this project.'))
 
     class Meta:
@@ -1558,6 +1566,7 @@ class ProjectPlaybooksSerializer(ProjectSerializer):
 
 
 class ProjectInventoriesSerializer(ProjectSerializer):
+
     inventory_files = serializers.ReadOnlyField(help_text=_('Array of inventory files and directories available within this project, ' 'not comprehensive.'))
 
     class Meta:
@@ -1572,6 +1581,7 @@ class ProjectInventoriesSerializer(ProjectSerializer):
 
 
 class ProjectUpdateViewSerializer(ProjectSerializer):
+
     can_update = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -1601,6 +1611,7 @@ class ProjectUpdateSerializer(UnifiedJobSerializer, ProjectOptionsSerializer):
 
 
 class ProjectUpdateDetailSerializer(ProjectUpdateSerializer):
+
     playbook_counts = serializers.SerializerMethodField(help_text=_('A count of all plays and tasks for the job run.'))
 
     class Meta:
@@ -1623,6 +1634,7 @@ class ProjectUpdateListSerializer(ProjectUpdateSerializer, UnifiedJobListSeriali
 
 
 class ProjectUpdateCancelSerializer(ProjectUpdateSerializer):
+
     can_cancel = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -1960,6 +1972,7 @@ class GroupSerializer(BaseSerializerWithVariables):
 
 
 class GroupTreeSerializer(GroupSerializer):
+
     children = serializers.SerializerMethodField()
 
     class Meta:
@@ -2057,6 +2070,7 @@ class InventorySourceOptionsSerializer(BaseSerializer):
 
 
 class InventorySourceSerializer(UnifiedJobTemplateSerializer, InventorySourceOptionsSerializer):
+
     status = serializers.ChoiceField(choices=InventorySource.INVENTORY_SOURCE_STATUS_CHOICES, read_only=True)
     last_update_failed = serializers.BooleanField(read_only=True)
     last_updated = serializers.DateTimeField(read_only=True)
@@ -2201,6 +2215,7 @@ class InventorySourceSerializer(UnifiedJobTemplateSerializer, InventorySourceOpt
 
 
 class InventorySourceUpdateSerializer(InventorySourceSerializer):
+
     can_update = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -2217,6 +2232,7 @@ class InventorySourceUpdateSerializer(InventorySourceSerializer):
 
 
 class InventoryUpdateSerializer(UnifiedJobSerializer, InventorySourceOptionsSerializer):
+
     custom_virtualenv = serializers.ReadOnlyField()
 
     class Meta:
@@ -2257,6 +2273,7 @@ class InventoryUpdateSerializer(UnifiedJobSerializer, InventorySourceOptionsSeri
 
 
 class InventoryUpdateDetailSerializer(InventoryUpdateSerializer):
+
     source_project = serializers.SerializerMethodField(help_text=_('The project used for this job.'), method_name='get_source_project_id')
 
     class Meta:
@@ -2307,6 +2324,7 @@ class InventoryUpdateListSerializer(InventoryUpdateSerializer, UnifiedJobListSer
 
 
 class InventoryUpdateCancelSerializer(InventoryUpdateSerializer):
+
     can_cancel = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -2664,6 +2682,7 @@ class CredentialSerializer(BaseSerializer):
 
 
 class CredentialSerializerCreate(CredentialSerializer):
+
     user = serializers.PrimaryKeyRelatedField(
         queryset=User.objects.all(),
         required=False,
@@ -3018,6 +3037,7 @@ class JobTemplateWithSpecSerializer(JobTemplateSerializer):
 
 
 class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
+
     passwords_needed_to_start = serializers.ReadOnlyField()
     artifacts = serializers.SerializerMethodField()
 
@@ -3100,6 +3120,7 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
 
 
 class JobDetailSerializer(JobSerializer):
+
     playbook_counts = serializers.SerializerMethodField(help_text=_('A count of all plays and tasks for the job run.'))
     custom_virtualenv = serializers.ReadOnlyField()
 
@@ -3117,6 +3138,7 @@ class JobDetailSerializer(JobSerializer):
 
 
 class JobCancelSerializer(BaseSerializer):
+
     can_cancel = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -3125,6 +3147,7 @@ class JobCancelSerializer(BaseSerializer):
 
 
 class JobRelaunchSerializer(BaseSerializer):
+
     passwords_needed_to_start = serializers.SerializerMethodField()
     retry_counts = serializers.SerializerMethodField()
     hosts = serializers.ChoiceField(
@@ -3184,6 +3207,7 @@ class JobRelaunchSerializer(BaseSerializer):
 
 
 class JobCreateScheduleSerializer(LabelsListMixin, BaseSerializer):
+
     can_schedule = serializers.SerializerMethodField()
     prompts = serializers.SerializerMethodField()
 
@@ -3309,6 +3333,7 @@ class AdHocCommandDetailSerializer(AdHocCommandSerializer):
 
 
 class AdHocCommandCancelSerializer(AdHocCommandSerializer):
+
     can_cancel = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -3347,6 +3372,7 @@ class SystemJobTemplateSerializer(UnifiedJobTemplateSerializer):
 
 
 class SystemJobSerializer(UnifiedJobSerializer):
+
     result_stdout = serializers.SerializerMethodField()
 
     class Meta:
@@ -3373,6 +3399,7 @@ class SystemJobSerializer(UnifiedJobSerializer):
 
 
 class SystemJobCancelSerializer(SystemJobSerializer):
+
     can_cancel = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -3537,6 +3564,7 @@ class WorkflowJobListSerializer(WorkflowJobSerializer, UnifiedJobListSerializer)
 
 
 class WorkflowJobCancelSerializer(WorkflowJobSerializer):
+
     can_cancel = serializers.BooleanField(read_only=True)
 
     class Meta:
@@ -3550,6 +3578,7 @@ class WorkflowApprovalViewSerializer(UnifiedJobSerializer):
 
 
 class WorkflowApprovalSerializer(UnifiedJobSerializer):
+
     can_approve_or_deny = serializers.SerializerMethodField()
     approval_expiration = serializers.SerializerMethodField()
     timed_out = serializers.ReadOnlyField()
@@ -3944,6 +3973,7 @@ class JobHostSummarySerializer(BaseSerializer):
 
 
 class JobEventSerializer(BaseSerializer):
+
     event_display = serializers.CharField(source='get_event_display2', read_only=True)
     event_level = serializers.IntegerField(read_only=True)
 
@@ -4039,6 +4069,7 @@ class ProjectUpdateEventSerializer(JobEventSerializer):
 
 
 class AdHocCommandEventSerializer(BaseSerializer):
+
     event_display = serializers.CharField(source='get_event_display', read_only=True)
 
     class Meta:
@@ -4320,6 +4351,7 @@ class JobLaunchSerializer(BaseSerializer):
 
 
 class WorkflowJobLaunchSerializer(BaseSerializer):
+
     can_start_without_user_input = serializers.BooleanField(read_only=True)
     defaults = serializers.SerializerMethodField()
     variables_needed_to_start = serializers.ReadOnlyField()
@@ -4376,6 +4408,7 @@ class WorkflowJobLaunchSerializer(BaseSerializer):
         return False
 
     def get_defaults(self, obj):
+
         defaults_dict = {}
         for field_name in WorkflowJobTemplate.get_ask_mapping().keys():
             if field_name == 'inventory':
@@ -4392,6 +4425,7 @@ class WorkflowJobLaunchSerializer(BaseSerializer):
         return dict(name=obj.name, id=obj.id, description=obj.description)
 
     def validate(self, attrs):
+
         template = self.instance
 
         accepted, rejected, errors = template._accept_or_ignore_job_kwargs(**attrs)
@@ -4632,6 +4666,7 @@ class NotificationTemplateSerializer(BaseSerializer):
 
 
 class NotificationSerializer(BaseSerializer):
+
     body = serializers.SerializerMethodField(help_text=_('Notification body'))
 
     class Meta:
@@ -5003,6 +5038,7 @@ class InstanceHealthCheckSerializer(BaseSerializer):
 
 
 class InstanceGroupSerializer(BaseSerializer):
+
     show_capabilities = ['edit', 'delete']
     capacity = serializers.SerializerMethodField()
     consumed_capacity = serializers.SerializerMethodField()
@@ -5189,6 +5225,7 @@ class InstanceGroupSerializer(BaseSerializer):
 
 
 class ActivityStreamSerializer(BaseSerializer):
+
     changes = serializers.SerializerMethodField()
     object_association = serializers.SerializerMethodField(help_text=_("When present, shows the field name of the role or relationship that changed."))
     object_type = serializers.SerializerMethodField(help_text=_("When present, shows the model on which the role or relationship was defined."))

awx/api/validators.py

@@ -33,6 +33,7 @@ class HostnameRegexValidator(RegexValidator):
         return f"regex={self.regex}, message={self.message}, code={self.code}, inverse_match={self.inverse_match}, flags={self.flags}"
 
     def __validate(self, value):
+
         if ' ' in value:
             return False, ValidationError("whitespaces in hostnames are illegal")
 

awx/api/views/instance_install_bundle.py

@@ -25,7 +25,6 @@ from rest_framework import status
 # Red Hat has an OID namespace (RHANANA). Receptor has its own designation under that.
 RECEPTOR_OID = "1.3.6.1.4.1.2312.19.1"
 
-
 # generate install bundle for the instance
 # install bundle directory structure
 # ├── install_receptor.yml (playbook)
@@ -41,6 +40,7 @@ RECEPTOR_OID = "1.3.6.1.4.1.2312.19.1"
 # │   └── work-public-key.pem
 # └── requirements.yml
 class InstanceInstallBundle(GenericAPIView):
+
     name = _('Install Bundle')
     model = models.Instance
     serializer_class = serializers.InstanceSerializer

awx/api/views/inventory.py

@@ -46,6 +46,7 @@ logger = logging.getLogger('awx.api.views.organization')
 
 
 class InventoryUpdateEventsList(SubListAPIView):
+
     model = InventoryUpdateEvent
     serializer_class = InventoryUpdateEventSerializer
     parent_model = InventoryUpdate
@@ -65,11 +66,13 @@ class InventoryUpdateEventsList(SubListAPIView):
 
 
 class InventoryList(ListCreateAPIView):
+
     model = Inventory
     serializer_class = InventorySerializer
 
 
 class InventoryDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPIView):
+
     model = Inventory
     serializer_class = InventorySerializer
 
@@ -95,6 +98,7 @@ class InventoryDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPIVie
 
 
 class InventoryActivityStreamList(SubListAPIView):
+
     model = ActivityStream
     serializer_class = ActivityStreamSerializer
     parent_model = Inventory
@@ -109,6 +113,7 @@ class InventoryActivityStreamList(SubListAPIView):
 
 
 class InventoryInstanceGroupsList(SubListAttachDetachAPIView):
+
     model = InstanceGroup
     serializer_class = InstanceGroupSerializer
     parent_model = Inventory
@@ -116,11 +121,13 @@ class InventoryInstanceGroupsList(SubListAttachDetachAPIView):
 
 
 class InventoryAccessList(ResourceAccessList):
+
     model = User  # needs to be User for AccessLists's
     parent_model = Inventory
 
 
 class InventoryObjectRolesList(SubListAPIView):
+
     model = Role
     serializer_class = RoleSerializer
     parent_model = Inventory
@@ -133,6 +140,7 @@ class InventoryObjectRolesList(SubListAPIView):
 
 
 class InventoryJobTemplateList(SubListAPIView):
+
     model = JobTemplate
     serializer_class = JobTemplateSerializer
     parent_model = Inventory
@@ -146,9 +154,11 @@ class InventoryJobTemplateList(SubListAPIView):
 
 
 class InventoryLabelList(LabelSubListCreateAttachDetachView):
+
     parent_model = Inventory
 
 
 class InventoryCopy(CopyAPIView):
+
     model = Inventory
     copy_return_serializer_class = InventorySerializer

awx/api/views/labels.py

@@ -59,11 +59,13 @@ class LabelSubListCreateAttachDetachView(SubListCreateAttachDetachAPIView):
 
 
 class LabelDetail(RetrieveUpdateAPIView):
+
     model = Label
     serializer_class = LabelSerializer
 
 
 class LabelList(ListCreateAPIView):
+
     name = _("Labels")
     model = Label
     serializer_class = LabelSerializer

awx/api/views/mesh_visualizer.py

@@ -10,11 +10,13 @@ from awx.main.models import InstanceLink, Instance
 
 
 class MeshVisualizer(APIView):
+
     name = _("Mesh Visualizer")
     permission_classes = (IsSystemAdminOrAuditor,)
     swagger_topic = "System Configuration"
 
     def get(self, request, format=None):
+
         data = {
             'nodes': InstanceNodeSerializer(Instance.objects.all(), many=True).data,
             'links': InstanceLinkSerializer(InstanceLink.objects.select_related('target', 'source'), many=True).data,

awx/api/views/metrics.py

@@ -5,11 +5,9 @@
 import logging
 
 # Django
-from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
 # Django REST Framework
-from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 from rest_framework.exceptions import PermissionDenied
 
@@ -27,19 +25,15 @@ logger = logging.getLogger('awx.analytics')
 
 
 class MetricsView(APIView):
+
     name = _('Metrics')
     swagger_topic = 'Metrics'
 
     renderer_classes = [renderers.PlainTextRenderer, renderers.PrometheusJSONRenderer, renderers.BrowsableAPIRenderer]
 
-    def initialize_request(self, request, *args, **kwargs):
-        if settings.ALLOW_METRICS_FOR_ANONYMOUS_USERS:
-            self.permission_classes = (AllowAny,)
-        return super(APIView, self).initialize_request(request, *args, **kwargs)
-
     def get(self, request):
         '''Show Metrics Details'''
-        if settings.ALLOW_METRICS_FOR_ANONYMOUS_USERS or request.user.is_superuser or request.user.is_system_auditor:
+        if request.user.is_superuser or request.user.is_system_auditor:
             metrics_to_show = ''
             if not request.query_params.get('subsystemonly', "0") == "1":
                 metrics_to_show += metrics().decode('UTF-8')

awx/api/views/organization.py

@@ -58,6 +58,7 @@ logger = logging.getLogger('awx.api.views.organization')
 
 
 class OrganizationList(OrganizationCountsMixin, ListCreateAPIView):
+
     model = Organization
     serializer_class = OrganizationSerializer
 
@@ -69,6 +70,7 @@ class OrganizationList(OrganizationCountsMixin, ListCreateAPIView):
 
 
 class OrganizationDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPIView):
+
     model = Organization
     serializer_class = OrganizationSerializer
 
@@ -104,6 +106,7 @@ class OrganizationDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPI
 
 
 class OrganizationInventoriesList(SubListAPIView):
+
     model = Inventory
     serializer_class = InventorySerializer
     parent_model = Organization
@@ -111,6 +114,7 @@ class OrganizationInventoriesList(SubListAPIView):
 
 
 class OrganizationUsersList(BaseUsersList):
+
     model = User
     serializer_class = UserSerializer
     parent_model = Organization
@@ -119,6 +123,7 @@ class OrganizationUsersList(BaseUsersList):
 
 
 class OrganizationAdminsList(BaseUsersList):
+
     model = User
     serializer_class = UserSerializer
     parent_model = Organization
@@ -127,6 +132,7 @@ class OrganizationAdminsList(BaseUsersList):
 
 
 class OrganizationProjectsList(SubListCreateAPIView):
+
     model = Project
     serializer_class = ProjectSerializer
     parent_model = Organization
@@ -134,6 +140,7 @@ class OrganizationProjectsList(SubListCreateAPIView):
 
 
 class OrganizationExecutionEnvironmentsList(SubListCreateAttachDetachAPIView):
+
     model = ExecutionEnvironment
     serializer_class = ExecutionEnvironmentSerializer
     parent_model = Organization
@@ -143,6 +150,7 @@ class OrganizationExecutionEnvironmentsList(SubListCreateAttachDetachAPIView):
 
 
 class OrganizationJobTemplatesList(SubListCreateAPIView):
+
     model = JobTemplate
     serializer_class = JobTemplateSerializer
     parent_model = Organization
@@ -150,6 +158,7 @@ class OrganizationJobTemplatesList(SubListCreateAPIView):
 
 
 class OrganizationWorkflowJobTemplatesList(SubListCreateAPIView):
+
     model = WorkflowJobTemplate
     serializer_class = WorkflowJobTemplateSerializer
     parent_model = Organization
@@ -157,6 +166,7 @@ class OrganizationWorkflowJobTemplatesList(SubListCreateAPIView):
 
 
 class OrganizationTeamsList(SubListCreateAttachDetachAPIView):
+
     model = Team
     serializer_class = TeamSerializer
     parent_model = Organization
@@ -165,6 +175,7 @@ class OrganizationTeamsList(SubListCreateAttachDetachAPIView):
 
 
 class OrganizationActivityStreamList(SubListAPIView):
+
     model = ActivityStream
     serializer_class = ActivityStreamSerializer
     parent_model = Organization
@@ -173,6 +184,7 @@ class OrganizationActivityStreamList(SubListAPIView):
 
 
 class OrganizationNotificationTemplatesList(SubListCreateAttachDetachAPIView):
+
     model = NotificationTemplate
     serializer_class = NotificationTemplateSerializer
     parent_model = Organization
@@ -181,28 +193,34 @@ class OrganizationNotificationTemplatesList(SubListCreateAttachDetachAPIView):
 
 
 class OrganizationNotificationTemplatesAnyList(SubListCreateAttachDetachAPIView):
+
     model = NotificationTemplate
     serializer_class = NotificationTemplateSerializer
     parent_model = Organization
 
 
 class OrganizationNotificationTemplatesStartedList(OrganizationNotificationTemplatesAnyList):
+
     relationship = 'notification_templates_started'
 
 
 class OrganizationNotificationTemplatesErrorList(OrganizationNotificationTemplatesAnyList):
+
     relationship = 'notification_templates_error'
 
 
 class OrganizationNotificationTemplatesSuccessList(OrganizationNotificationTemplatesAnyList):
+
     relationship = 'notification_templates_success'
 
 
 class OrganizationNotificationTemplatesApprovalList(OrganizationNotificationTemplatesAnyList):
+
     relationship = 'notification_templates_approvals'
 
 
 class OrganizationInstanceGroupsList(SubListAttachDetachAPIView):
+
     model = InstanceGroup
     serializer_class = InstanceGroupSerializer
     parent_model = Organization
@@ -210,6 +228,7 @@ class OrganizationInstanceGroupsList(SubListAttachDetachAPIView):
 
 
 class OrganizationGalaxyCredentialsList(SubListAttachDetachAPIView):
+
     model = Credential
     serializer_class = CredentialSerializer
     parent_model = Organization
@@ -221,11 +240,13 @@ class OrganizationGalaxyCredentialsList(SubListAttachDetachAPIView):
 
 
 class OrganizationAccessList(ResourceAccessList):
+
     model = User  # needs to be User for AccessLists's
     parent_model = Organization
 
 
 class OrganizationObjectRolesList(SubListAPIView):
+
     model = Role
     serializer_class = RoleSerializer
     parent_model = Organization

awx/api/views/root.py

@@ -36,6 +36,7 @@ logger = logging.getLogger('awx.api.views.root')
 
 
 class ApiRootView(APIView):
+
     permission_classes = (AllowAny,)
     name = _('REST API')
     versioning_class = None
@@ -58,6 +59,7 @@ class ApiRootView(APIView):
 
 
 class ApiOAuthAuthorizationRootView(APIView):
+
     permission_classes = (AllowAny,)
     name = _("API OAuth 2 Authorization Root")
     versioning_class = None
@@ -72,6 +74,7 @@ class ApiOAuthAuthorizationRootView(APIView):
 
 
 class ApiVersionRootView(APIView):
+
     permission_classes = (AllowAny,)
     swagger_topic = 'Versioning'
 
@@ -169,6 +172,7 @@ class ApiV2PingView(APIView):
 
 
 class ApiV2SubscriptionView(APIView):
+
     permission_classes = (IsAuthenticated,)
     name = _('Subscriptions')
     swagger_topic = 'System Configuration'
@@ -208,6 +212,7 @@ class ApiV2SubscriptionView(APIView):
 
 
 class ApiV2AttachView(APIView):
+
     permission_classes = (IsAuthenticated,)
     name = _('Attach Subscription')
     swagger_topic = 'System Configuration'
@@ -225,6 +230,7 @@ class ApiV2AttachView(APIView):
         user = getattr(settings, 'SUBSCRIPTIONS_USERNAME', None)
         pw = getattr(settings, 'SUBSCRIPTIONS_PASSWORD', None)
         if pool_id and user and pw:
+
             data = request.data.copy()
             try:
                 with set_environ(**settings.AWX_TASK_ENV):
@@ -252,6 +258,7 @@ class ApiV2AttachView(APIView):
 
 
 class ApiV2ConfigView(APIView):
+
     permission_classes = (IsAuthenticated,)
     name = _('Configuration')
     swagger_topic = 'System Configuration'

awx/conf/apps.py

@@ -8,6 +8,7 @@ from django.utils.translation import gettext_lazy as _
 
 
 class ConfConfig(AppConfig):
+
     name = 'awx.conf'
     verbose_name = _('Configuration')
 
@@ -15,6 +16,7 @@ class ConfConfig(AppConfig):
         self.module.autodiscover()
 
         if not set(sys.argv) & {'migrate', 'check_migrations'}:
+
             from .settings import SettingsWrapper
 
             SettingsWrapper.initialize()

awx/conf/fields.py

@@ -47,6 +47,7 @@ class IntegerField(IntegerField):
 
 
 class StringListField(ListField):
+
     child = CharField()
 
     def to_representation(self, value):
@@ -56,6 +57,7 @@ class StringListField(ListField):
 
 
 class StringListBooleanField(ListField):
+
     default_error_messages = {'type_error': _('Expected None, True, False, a string or list of strings but got {input_type} instead.')}
     child = CharField()
 
@@ -94,6 +96,7 @@ class StringListBooleanField(ListField):
 
 
 class StringListPathField(StringListField):
+
     default_error_messages = {'type_error': _('Expected list of strings but got {input_type} instead.'), 'path_error': _('{path} is not a valid path choice.')}
 
     def to_internal_value(self, paths):
@@ -123,6 +126,7 @@ class StringListIsolatedPathField(StringListField):
     }
 
     def to_internal_value(self, paths):
+
         if isinstance(paths, (list, tuple)):
             for p in paths:
                 if not isinstance(p, str):

awx/conf/migrations/0001_initial.py

@@ -8,6 +8,7 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
+
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
 
     operations = [

awx/conf/migrations/0002_v310_copy_tower_settings.py

@@ -48,6 +48,7 @@ def revert_tower_settings(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [('conf', '0001_initial'), ('main', '0004_squashed_v310_release')]
 
     run_before = [('main', '0005_squashed_v310_v313_updates')]

awx/conf/migrations/0003_v310_JSONField_changes.py

@@ -7,6 +7,7 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
+
     dependencies = [('conf', '0002_v310_copy_tower_settings')]
 
     operations = [migrations.AlterField(model_name='setting', name='value', field=awx.main.fields.JSONBlob(null=True))]

awx/conf/migrations/0004_v320_reencrypt.py

@@ -5,6 +5,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [('conf', '0003_v310_JSONField_changes')]
 
     operations = [

awx/conf/migrations/0005_v330_rename_two_session_settings.py

@@ -15,6 +15,7 @@ def reverse_copy_session_settings(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [('conf', '0004_v320_reencrypt')]
 
     operations = [migrations.RunPython(copy_session_settings, reverse_copy_session_settings)]

awx/conf/migrations/0006_v331_ldap_group_type.py

@@ -8,6 +8,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [('conf', '0005_v330_rename_two_session_settings')]
 
     operations = [migrations.RunPython(fill_ldap_group_type_params)]

awx/conf/migrations/0007_v380_rename_more_settings.py

@@ -9,6 +9,7 @@ def copy_allowed_ips(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [('conf', '0006_v331_ldap_group_type')]
 
     operations = [migrations.RunPython(copy_allowed_ips)]

awx/conf/migrations/0008_subscriptions.py

@@ -14,6 +14,7 @@ def _noop(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [('conf', '0007_v380_rename_more_settings')]
 
     operations = [migrations.RunPython(clear_old_license, _noop), migrations.RunPython(prefill_rh_credentials, _noop)]

awx/conf/migrations/0009_rename_proot_settings.py

@@ -10,6 +10,7 @@ def rename_proot_settings(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [('conf', '0008_subscriptions')]
 
     operations = [migrations.RunPython(rename_proot_settings)]

awx/conf/migrations/_rename_setting.py

@@ -10,6 +10,7 @@ __all__ = ['rename_setting']
 
 
 def rename_setting(apps, schema_editor, old_key, new_key):
+
     old_setting = None
     Setting = apps.get_model('conf', 'Setting')
     if Setting.objects.filter(key=new_key).exists() or hasattr(settings, new_key):

awx/conf/models.py

@@ -17,6 +17,7 @@ __all__ = ['Setting']
 
 
 class Setting(CreatedModifiedModel):
+
     key = models.CharField(max_length=255)
     value = JSONBlob(null=True)
     user = prevent_search(models.ForeignKey('auth.User', related_name='settings', default=None, null=True, editable=False, on_delete=models.CASCADE))

awx/conf/settings.py

@@ -104,6 +104,7 @@ def filter_sensitive(registry, key, value):
 
 
 class TransientSetting(object):
+
     __slots__ = ('pk', 'value')
 
     def __init__(self, pk, value):

awx/conf/tests/unit/test_fields.py

@@ -5,6 +5,7 @@ from awx.conf.fields import StringListBooleanField, StringListPathField, ListTup
 
 
 class TestStringListBooleanField:
+
     FIELD_VALUES = [
         ("hello", "hello"),
         (("a", "b"), ["a", "b"]),
@@ -52,6 +53,7 @@ class TestStringListBooleanField:
 
 
 class TestListTuplesField:
+
     FIELD_VALUES = [([('a', 'b'), ('abc', '123')], [("a", "b"), ("abc", "123")])]
 
     FIELD_VALUES_INVALID = [("abc", type("abc")), ([('a', 'b', 'c'), ('abc', '123', '456')], type(('a',))), (['a', 'b'], type('a')), (123, type(123))]
@@ -71,6 +73,7 @@ class TestListTuplesField:
 
 
 class TestStringListPathField:
+
     FIELD_VALUES = [
         ((".", "..", "/"), [".", "..", "/"]),
         (("/home",), ["/home"]),

awx/conf/views.py

@@ -36,6 +36,7 @@ SettingCategory = collections.namedtuple('SettingCategory', ('url', 'slug', 'nam
 
 
 class SettingCategoryList(ListAPIView):
+
     model = Setting  # Not exactly, but needed for the view.
     serializer_class = SettingCategorySerializer
     filter_backends = []
@@ -57,6 +58,7 @@ class SettingCategoryList(ListAPIView):
 
 
 class SettingSingletonDetail(RetrieveUpdateDestroyAPIView):
+
     model = Setting  # Not exactly, but needed for the view.
     serializer_class = SettingSingletonSerializer
     filter_backends = []
@@ -144,6 +146,7 @@ class SettingSingletonDetail(RetrieveUpdateDestroyAPIView):
 
 
 class SettingLoggingTest(GenericAPIView):
+
     name = _('Logging Connectivity Test')
     model = Setting
     serializer_class = SettingSingletonSerializer

awx/main/access.py

@@ -561,6 +561,7 @@ class NotificationAttachMixin(BaseAccess):
 
 
 class InstanceAccess(BaseAccess):
+
     model = Instance
     prefetch_related = ('rampart_groups',)
 
@@ -578,6 +579,7 @@ class InstanceAccess(BaseAccess):
         return super(InstanceAccess, self).can_unattach(obj, sub_obj, relationship, relationship, data=data)
 
     def can_add(self, data):
+
         return self.user.is_superuser
 
     def can_change(self, obj, data):
@@ -588,6 +590,7 @@ class InstanceAccess(BaseAccess):
 
 
 class InstanceGroupAccess(BaseAccess):
+
     model = InstanceGroup
     prefetch_related = ('instances',)
 
@@ -1027,9 +1030,7 @@ class GroupAccess(BaseAccess):
         return Group.objects.filter(inventory__in=Inventory.accessible_pk_qs(self.user, 'read_role'))
 
     def can_add(self, data):
-        if not data:  # So the browseable API will work
-            return Inventory.accessible_objects(self.user, 'admin_role').exists()
-        if 'inventory' not in data:
+        if not data or 'inventory' not in data:
             return False
         # Checks for admin or change permission on inventory.
         return self.check_related('inventory', Inventory, data)
@@ -2351,6 +2352,7 @@ class JobEventAccess(BaseAccess):
 
 
 class UnpartitionedJobEventAccess(JobEventAccess):
+
     model = UnpartitionedJobEvent
 
 

awx/main/apps.py

@@ -3,5 +3,6 @@ from django.utils.translation import gettext_lazy as _
 
 
 class MainConfig(AppConfig):
+
     name = 'awx.main'
     verbose_name = _('Main')

awx/main/credential_plugins/conjur.py

@@ -68,11 +68,7 @@ def conjur_backend(**kwargs):
     with CertFiles(cacert) as cert:
         # https://www.conjur.org/api.html#authentication-authenticate-post
         auth_kwargs['verify'] = cert
-        try:
-            resp = requests.post(urljoin(url, '/'.join(['authn', account, username, 'authenticate'])), **auth_kwargs)
-            resp.raise_for_status()
-        except requests.exceptions.HTTPError:
-            resp = requests.post(urljoin(url, '/'.join(['api', 'authn', account, username, 'authenticate'])), **auth_kwargs)
+        resp = requests.post(urljoin(url, '/'.join(['api', 'authn', account, username, 'authenticate'])), **auth_kwargs)
     raise_for_status(resp)
     token = resp.content.decode('utf-8')
 
@@ -82,20 +78,14 @@ def conjur_backend(**kwargs):
     }
 
     # https://www.conjur.org/api.html#secrets-retrieve-a-secret-get
-    path = urljoin(url, '/'.join(['secrets', account, 'variable', secret_path]))
-    path_conjurcloud = urljoin(url, '/'.join(['api', 'secrets', account, 'variable', secret_path]))
+    path = urljoin(url, '/'.join(['api', 'secrets', account, 'variable', secret_path]))
     if version:
         ver = "version={}".format(version)
         path = '?'.join([path, ver])
-        path_conjurcloud = '?'.join([path_conjurcloud, ver])
 
     with CertFiles(cacert) as cert:
         lookup_kwargs['verify'] = cert
-        try:
-            resp = requests.get(path, timeout=30, **lookup_kwargs)
-            resp.raise_for_status()
-        except requests.exceptions.HTTPError:
-            resp = requests.get(path_conjurcloud, timeout=30, **lookup_kwargs)
+        resp = requests.get(path, timeout=30, **lookup_kwargs)
     raise_for_status(resp)
     return resp.text
 

awx/main/credential_plugins/hashivault.py

@@ -1,7 +1,6 @@
 import copy
 import os
 import pathlib
-import time
 from urllib.parse import urljoin
 
 from .plugin import CredentialPlugin, CertFiles, raise_for_status
@@ -248,15 +247,7 @@ def kv_backend(**kwargs):
     request_url = urljoin(url, '/'.join(['v1'] + path_segments)).rstrip('/')
     with CertFiles(cacert) as cert:
         request_kwargs['verify'] = cert
-        request_retries = 0
-        while request_retries < 5:
-            response = sess.get(request_url, **request_kwargs)
-            # https://developer.hashicorp.com/vault/docs/enterprise/consistency
-            if response.status_code == 412:
-                request_retries += 1
-                time.sleep(1)
-            else:
-                break
+        response = sess.get(request_url, **request_kwargs)
     raise_for_status(response)
 
     json = response.json()
@@ -298,15 +289,8 @@ def ssh_backend(**kwargs):
 
     with CertFiles(cacert) as cert:
         request_kwargs['verify'] = cert
-        request_retries = 0
-        while request_retries < 5:
-            resp = sess.post(request_url, **request_kwargs)
-            # https://developer.hashicorp.com/vault/docs/enterprise/consistency
-            if resp.status_code == 412:
-                request_retries += 1
-                time.sleep(1)
-            else:
-                break
+        resp = sess.post(request_url, **request_kwargs)
+
     raise_for_status(resp)
     return resp.json()['data']['signed_key']
 

awx/main/dispatch/control.py

@@ -14,6 +14,7 @@ logger = logging.getLogger('awx.main.dispatch')
 
 
 class Control(object):
+
     services = ('dispatcher', 'callback_receiver')
     result = None
 

awx/main/dispatch/pool.py

@@ -192,6 +192,7 @@ class PoolWorker(object):
 
 
 class StatefulPoolWorker(PoolWorker):
+
     track_managed_tasks = True
 
 

awx/main/dispatch/publish.py

@@ -66,6 +66,7 @@ class task:
         bind_kwargs = self.bind_kwargs
 
         class PublisherMixin(object):
+
             queue = None
 
             @classmethod

awx/main/dispatch/worker/base.py

@@ -40,6 +40,7 @@ class WorkerSignalHandler:
 
 
 class AWXConsumerBase(object):
+
     last_stats = time.time()
 
     def __init__(self, name, worker, queues=[], pool=None):

awx/main/dispatch/worker/callback.py

@@ -3,12 +3,14 @@ import logging
 import os
 import signal
 import time
+import traceback
 import datetime
 
 from django.conf import settings
 from django.utils.functional import cached_property
 from django.utils.timezone import now as tz_now
-from django.db import transaction, connection as django_connection
+from django.db import DatabaseError, OperationalError, transaction, connection as django_connection
+from django.db.utils import InterfaceError, InternalError
 from django_guid import set_guid
 
 import psutil
@@ -62,7 +64,6 @@ class CallbackBrokerWorker(BaseWorker):
     """
 
     MAX_RETRIES = 2
-    INDIVIDUAL_EVENT_RETRIES = 3
     last_stats = time.time()
     last_flush = time.time()
     total = 0
@@ -154,8 +155,6 @@ class CallbackBrokerWorker(BaseWorker):
             metrics_events_missing_created = 0
             metrics_total_job_event_processing_seconds = datetime.timedelta(seconds=0)
             for cls, events in self.buff.items():
-                if not events:
-                    continue
                 logger.debug(f'{cls.__name__}.objects.bulk_create({len(events)})')
                 for e in events:
                     e.modified = now  # this can be set before created because now is set above on line 149
@@ -165,48 +164,38 @@ class CallbackBrokerWorker(BaseWorker):
                     else:  # only calculate the seconds if the created time already has been set
                         metrics_total_job_event_processing_seconds += e.modified - e.created
                 metrics_duration_to_save = time.perf_counter()
-                saved_events = []
                 try:
                     cls.objects.bulk_create(events)
                     metrics_bulk_events_saved += len(events)
-                    saved_events = events
-                    self.buff[cls] = []
                 except Exception as exc:
-                    # If the database is flaking, let ensure_connection throw a general exception
-                    # will be caught by the outer loop, which goes into a proper sleep and retry loop
-                    django_connection.ensure_connection()
-                    logger.warning(f'Error in events bulk_create, will try indiviually, error: {str(exc)}')
+                    logger.warning(f'Error in events bulk_create, will try indiviually up to 5 errors, error {str(exc)}')
                     # if an exception occurs, we should re-attempt to save the
                     # events one-by-one, because something in the list is
                     # broken/stale
+                    consecutive_errors = 0
+                    events_saved = 0
                     metrics_events_batch_save_errors += 1
-                    for e in events.copy():
+                    for e in events:
                         try:
                             e.save()
-                            metrics_singular_events_saved += 1
-                            events.remove(e)
-                            saved_events.append(e)  # Importantly, remove successfully saved events from the buffer
+                            events_saved += 1
+                            consecutive_errors = 0
                         except Exception as exc_indv:
-                            retry_count = getattr(e, '_retry_count', 0) + 1
-                            e._retry_count = retry_count
-
-                            # special sanitization logic for postgres treatment of NUL 0x00 char
-                            if (retry_count == 1) and isinstance(exc_indv, ValueError) and ("\x00" in e.stdout):
-                                e.stdout = e.stdout.replace("\x00", "")
-
-                            if retry_count >= self.INDIVIDUAL_EVENT_RETRIES:
-                                logger.error(f'Hit max retries ({retry_count}) saving individual Event error: {str(exc_indv)}\ndata:\n{e.__dict__}')
-                                events.remove(e)
-                            else:
-                                logger.info(f'Database Error Saving individual Event uuid={e.uuid} try={retry_count}, error: {str(exc_indv)}')
-
+                            consecutive_errors += 1
+                            logger.info(f'Database Error Saving individual Job Event, error {str(exc_indv)}')
+                        if consecutive_errors >= 5:
+                            raise
+                    metrics_singular_events_saved += events_saved
+                    if events_saved == 0:
+                        raise
                 metrics_duration_to_save = time.perf_counter() - metrics_duration_to_save
-                for e in saved_events:
+                for e in events:
                     if not getattr(e, '_skip_websocket_message', False):
                         metrics_events_broadcast += 1
                         emit_event_detail(e)
                     if getattr(e, '_notification_trigger_event', False):
                         job_stats_wrapup(getattr(e, e.JOB_REFERENCE), event=e)
+            self.buff = {}
             self.last_flush = time.time()
             # only update metrics if we saved events
             if (metrics_bulk_events_saved + metrics_singular_events_saved) > 0:
@@ -278,16 +267,20 @@ class CallbackBrokerWorker(BaseWorker):
                 try:
                     self.flush(force=flush)
                     break
-                except Exception as exc:
-                    # Aside form bugs, exceptions here are assumed to be due to database flake
+                except (OperationalError, InterfaceError, InternalError) as exc:
                     if retries >= self.MAX_RETRIES:
                         logger.exception('Worker could not re-establish database connectivity, giving up on one or more events.')
-                        self.buff = {}
                         return
                     delay = 60 * retries
                     logger.warning(f'Database Error Flushing Job Events, retry #{retries + 1} in {delay} seconds: {str(exc)}')
                     django_connection.close()
                     time.sleep(delay)
                     retries += 1
-        except Exception:
-            logger.exception(f'Callback Task Processor Raised Unexpected Exception processing event data:\n{body}')
+                except DatabaseError:
+                    logger.exception('Database Error Flushing Job Events')
+                    django_connection.close()
+                    break
+        except Exception as exc:
+            tb = traceback.format_exc()
+            logger.error('Callback Task Processor Raised Exception: %r', exc)
+            logger.error('Detail: {}'.format(tb))

awx/main/fields.py

@@ -232,6 +232,7 @@ class ImplicitRoleField(models.ForeignKey):
             field_names = [field_names]
 
         for field_name in field_names:
+
             if field_name.startswith('singleton:'):
                 continue
 
@@ -243,6 +244,7 @@ class ImplicitRoleField(models.ForeignKey):
             field = getattr(cls, field_name, None)
 
             if field and type(field) is ReverseManyToOneDescriptor or type(field) is ManyToManyDescriptor:
+
                 if '.' in field_attr:
                     raise Exception('Referencing deep roles through ManyToMany fields is unsupported.')
 
@@ -627,6 +629,7 @@ class CredentialInputField(JSONSchemaField):
         # `ssh_key_unlock` requirements are very specific and can't be
         # represented without complicated JSON schema
         if model_instance.credential_type.managed is True and 'ssh_key_unlock' in defined_fields:
+
             # in order to properly test the necessity of `ssh_key_unlock`, we
             # need to know the real value of `ssh_key_data`; for a payload like:
             # {
@@ -788,8 +791,7 @@ class CredentialTypeInjectorField(JSONSchemaField):
                     'type': 'object',
                     'patternProperties': {
                         # http://docs.ansible.com/ansible/playbooks_variables.html#what-makes-a-valid-variable-name
-                        # plus, add ability to template
-                        r'^[a-zA-Z_\{\}]+[a-zA-Z0-9_\{\}]*$': {"anyOf": [{'type': 'string'}, {'type': 'array'}, {'$ref': '#/properties/extra_vars'}]}
+                        '^[a-zA-Z_]+[a-zA-Z0-9_]*$': {'type': 'string'},
                     },
                     'additionalProperties': False,
                 },
@@ -856,44 +858,27 @@ class CredentialTypeInjectorField(JSONSchemaField):
                 template_name = template_name.split('.')[1]
                 setattr(valid_namespace['tower'].filename, template_name, 'EXAMPLE_FILENAME')
 
-        def validate_template_string(type_, key, tmpl):
-            try:
-                sandbox.ImmutableSandboxedEnvironment(undefined=StrictUndefined).from_string(tmpl).render(valid_namespace)
-            except UndefinedError as e:
-                raise django_exceptions.ValidationError(
-                    _('{sub_key} uses an undefined field ({error_msg})').format(sub_key=key, error_msg=e),
-                    code='invalid',
-                    params={'value': value},
-                )
-            except SecurityError as e:
-                raise django_exceptions.ValidationError(_('Encountered unsafe code execution: {}').format(e))
-            except TemplateSyntaxError as e:
-                raise django_exceptions.ValidationError(
-                    _('Syntax error rendering template for {sub_key} inside of {type} ({error_msg})').format(sub_key=key, type=type_, error_msg=e),
-                    code='invalid',
-                    params={'value': value},
-                )
-
-        def validate_extra_vars(key, node):
-            if isinstance(node, dict):
-                for k, v in node.items():
-                    validate_template_string("extra_vars", 'a key' if key is None else key, k)
-                    validate_extra_vars(k if key is None else "{key}.{k}".format(key=key, k=k), v)
-            elif isinstance(node, list):
-                for i, x in enumerate(node):
-                    validate_extra_vars("{key}[{i}]".format(key=key, i=i), x)
-            else:
-                validate_template_string("extra_vars", key, node)
-
         for type_, injector in value.items():
             if type_ == 'env':
                 for key in injector.keys():
                     self.validate_env_var_allowed(key)
-            if type_ == 'extra_vars':
-                validate_extra_vars(None, injector)
-            else:
-                for key, tmpl in injector.items():
-                    validate_template_string(type_, key, tmpl)
+            for key, tmpl in injector.items():
+                try:
+                    sandbox.ImmutableSandboxedEnvironment(undefined=StrictUndefined).from_string(tmpl).render(valid_namespace)
+                except UndefinedError as e:
+                    raise django_exceptions.ValidationError(
+                        _('{sub_key} uses an undefined field ({error_msg})').format(sub_key=key, error_msg=e),
+                        code='invalid',
+                        params={'value': value},
+                    )
+                except SecurityError as e:
+                    raise django_exceptions.ValidationError(_('Encountered unsafe code execution: {}').format(e))
+                except TemplateSyntaxError as e:
+                    raise django_exceptions.ValidationError(
+                        _('Syntax error rendering template for {sub_key} inside of {type} ({error_msg})').format(sub_key=key, type=type_, error_msg=e),
+                        code='invalid',
+                        params={'value': value},
+                    )
 
 
 class AskForField(models.BooleanField):

awx/main/management/commands/check_db.py

@@ -9,6 +9,7 @@ class Command(BaseCommand):
     """Checks connection to the database, and prints out connection info if not connected"""
 
     def handle(self, *args, **options):
+
         with connection.cursor() as cursor:
             cursor.execute("SELECT version()")
             version = str(cursor.fetchone()[0])

awx/main/management/commands/cleanup_jobs.py

@@ -82,6 +82,7 @@ class DeleteMeta:
         part_drop = {}
 
         for pk, status, created in self.jobs_qs:
+
             part_key = partition_table_name(self.job_class, created)
             if status in ['pending', 'waiting', 'running']:
                 part_drop[part_key] = False

awx/main/management/commands/create_oauth2_token.py

@@ -17,6 +17,7 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         if not options['user']:
+
             raise CommandError('Username not supplied. Usage: awx-manage create_oauth2_token --user=username.')
         try:
             user = User.objects.get(username=options['user'])

awx/main/management/commands/enable_local_authentication.py

@@ -1,35 +0,0 @@
-from django.core.management.base import BaseCommand, CommandError
-from django.conf import settings
-
-
-class Command(BaseCommand):
-    """enable or disable authentication system"""
-
-    def add_arguments(self, parser):
-        """
-        This adds the --enable --disable functionalities to the command using mutally_exclusive to avoid situations in which users pass both flags
-        """
-        group = parser.add_mutually_exclusive_group()
-        group.add_argument('--enable', dest='enable', action='store_true', help='Pass --enable to enable local authentication')
-        group.add_argument('--disable', dest='disable', action='store_true', help='Pass --disable to disable local authentication')
-
-    def _enable_disable_auth(self, enable, disable):
-        """
-        this method allows the disabling or enabling of local authenication based on the argument passed into the parser
-        if no arguments throw a command error, if --enable set the DISABLE_LOCAL_AUTH to False
-        if --disable it's set to True. Realizing that the flag is counterintuitive to what is expected.
-        """
-
-        if enable:
-            settings.DISABLE_LOCAL_AUTH = False
-            print("Setting has changed to {} allowing local authentication".format(settings.DISABLE_LOCAL_AUTH))
-
-        elif disable:
-            settings.DISABLE_LOCAL_AUTH = True
-            print("Setting has changed to {} disallowing local authentication".format(settings.DISABLE_LOCAL_AUTH))
-
-        else:
-            raise CommandError('Please pass --enable flag to allow local auth or --disable flag to disable local auth')
-
-    def handle(self, **options):
-        self._enable_disable_auth(options.get('enable'), options.get('disable'))

awx/main/management/commands/export_custom_scripts.py

@@ -10,6 +10,7 @@ from django.utils.text import slugify
 
 
 class Command(BaseCommand):
+
     help = 'Export custom inventory scripts into a tarfile.'
 
     def add_arguments(self, parser):
@@ -20,6 +21,7 @@ class Command(BaseCommand):
 
         with tempfile.TemporaryDirectory() as tmpdirname:
             with tarfile.open(tar_filename, "w") as tar:
+
                 for cis in CustomInventoryScript.objects.all():
                     # naming convention similar to project paths
                     slug_name = slugify(str(cis.name)).replace(u'-', u'_')

awx/main/management/commands/host_metric.py

@@ -6,6 +6,7 @@ import json
 
 
 class Command(BaseCommand):
+
     help = 'This is for offline licensing usage'
 
     def add_arguments(self, parser):

awx/main/management/commands/inventory_import.py

@@ -934,6 +934,7 @@ class Command(BaseCommand):
         # (even though inventory_import.Command.handle -- which calls
         # perform_update -- has its own lock, inventory_ID_import)
         with advisory_lock('inventory_{}_perform_update'.format(self.inventory.id)):
+
             try:
                 self.check_license()
             except PermissionDenied as e:

awx/main/management/commands/list_instances.py

@@ -6,6 +6,7 @@ from django.core.management.base import BaseCommand
 
 
 class Ungrouped(object):
+
     name = 'ungrouped'
     policy_instance_percentage = None
     policy_instance_minimum = None

awx/main/management/commands/remove_from_queue.py

@@ -7,6 +7,7 @@ from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):
+
     help = (
         "Remove an instance (specified by --hostname) from the specified queue (instance group).\n"
         "In order remove the queue, use the `unregister_queue` command."

awx/main/management/commands/replay_job_events.py

@@ -28,6 +28,7 @@ class JobStatusLifeCycle:
 
 
 class ReplayJobEvents(JobStatusLifeCycle):
+
     recording_start = None
     replay_start = None
 
@@ -189,6 +190,7 @@ class ReplayJobEvents(JobStatusLifeCycle):
 
 
 class Command(BaseCommand):
+
     help = 'Replay job events over websockets ordered by created on date.'
 
     def _parse_slice_range(self, slice_arg):

awx/main/management/commands/setup_managed_credential_types.py

@@ -7,6 +7,7 @@ from awx.main.models import CredentialType
 
 
 class Command(BaseCommand):
+
     help = 'Load default managed credential types.'
 
     def handle(self, *args, **options):

awx/main/management/commands/unregister_queue.py

@@ -10,6 +10,7 @@ from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):
+
     help = (
         "Remove specified queue (instance group) from database.\n"
         "Instances inside of queue will continue to exist, \n"

awx/main/middleware.py

@@ -38,6 +38,7 @@ class SettingsCacheMiddleware(MiddlewareMixin):
 
 
 class TimingMiddleware(threading.local, MiddlewareMixin):
+
     dest = '/var/log/tower/profile'
 
     def __init__(self, *args, **kwargs):

awx/main/migrations/0001_initial.py

@@ -14,6 +14,7 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('taggit', '0002_auto_20150616_2121'),
         ('contenttypes', '0002_remove_content_type_name'),

awx/main/migrations/0004_squashed_v310_release.py

@@ -12,6 +12,7 @@ from ._squashed_30 import SQUASHED_30
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0003_squashed_v300_v303_updates'),
     ]

awx/main/migrations/0005_squashed_v310_v313_updates.py

@@ -7,6 +7,7 @@ from ._squashed_31 import SQUASHED_31
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0004_squashed_v310_release'),
     ]

awx/main/migrations/0006_v320_release.py

@@ -26,6 +26,7 @@ def replaces():
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0005_squashed_v310_v313_updates'),
     ]

awx/main/migrations/0007_v320_data_migrations.py

@@ -7,6 +7,7 @@ from awx.main.migrations import ActivityStreamDisabledMigration
 
 
 class Migration(ActivityStreamDisabledMigration):
+
     dependencies = [
         ('main', '0006_v320_release'),
     ]

awx/main/migrations/0008_v320_drop_v1_credential_fields.py

@@ -11,6 +11,7 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0007_v320_data_migrations'),
     ]

awx/main/migrations/0009_v322_add_setting_field_for_activity_stream.py

@@ -7,6 +7,7 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0008_v320_drop_v1_credential_fields'),
     ]

awx/main/migrations/0010_v322_add_ovirt4_tower_inventory.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0009_v322_add_setting_field_for_activity_stream'),
     ]

awx/main/migrations/0011_v322_encrypt_survey_passwords.py

@@ -5,6 +5,7 @@ from awx.main.migrations import ActivityStreamDisabledMigration
 
 
 class Migration(ActivityStreamDisabledMigration):
+
     dependencies = [
         ('main', '0010_v322_add_ovirt4_tower_inventory'),
     ]

awx/main/migrations/0012_v322_update_cred_types.py

@@ -5,6 +5,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0011_v322_encrypt_survey_passwords'),
     ]

awx/main/migrations/0013_v330_multi_credential.py

@@ -9,6 +9,7 @@ from awx.main.migrations._multi_cred import migrate_to_multi_cred, migrate_back_
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0012_v322_update_cred_types'),
     ]

awx/main/migrations/0014_v330_saved_launchtime_configs.py

@@ -11,6 +11,7 @@ from awx.main.migrations._scan_jobs import remove_scan_type_nodes
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0013_v330_multi_credential'),
     ]

awx/main/migrations/0015_v330_blank_start_args.py

@@ -7,6 +7,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0014_v330_saved_launchtime_configs'),
     ]

awx/main/migrations/0016_v330_non_blank_workflow.py

@@ -7,6 +7,7 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0015_v330_blank_start_args'),
     ]

awx/main/migrations/0017_v330_move_deprecated_stdout.py

@@ -6,6 +6,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0016_v330_non_blank_workflow'),
     ]

awx/main/migrations/0018_v330_add_additional_stdout_events.py

@@ -9,6 +9,7 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0017_v330_move_deprecated_stdout'),
     ]

awx/main/migrations/0019_v330_custom_virtualenv.py

@@ -6,6 +6,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0018_v330_add_additional_stdout_events'),
     ]

awx/main/migrations/0020_v330_instancegroup_policies.py

@@ -8,6 +8,7 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0019_v330_custom_virtualenv'),
     ]

awx/main/migrations/0021_v330_declare_new_rbac_roles.py

@@ -8,6 +8,7 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0020_v330_instancegroup_policies'),
     ]

awx/main/migrations/0022_v330_create_new_rbac_roles.py

@@ -8,6 +8,7 @@ from awx.main.migrations import _migration_utils as migration_utils
 
 
 class Migration(ActivityStreamDisabledMigration):
+
     dependencies = [
         ('main', '0021_v330_declare_new_rbac_roles'),
     ]

awx/main/migrations/0023_v330_inventory_multicred.py

@@ -9,6 +9,7 @@ from awx.main.migrations._multi_cred import migrate_inventory_source_cred, migra
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0022_v330_create_new_rbac_roles'),
     ]

awx/main/migrations/0024_v330_create_user_session_membership.py

@@ -8,6 +8,7 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('sessions', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),

awx/main/migrations/0025_v330_add_oauth_activity_stream_registrar.py

@@ -10,6 +10,7 @@ import re
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0024_v330_create_user_session_membership'),
     ]

awx/main/migrations/0026_v330_delete_authtoken.py

@@ -8,6 +8,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0025_v330_add_oauth_activity_stream_registrar'),
     ]

awx/main/migrations/0027_v330_emitted_events.py

@@ -6,6 +6,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0026_v330_delete_authtoken'),
     ]

awx/main/migrations/0028_v330_add_tower_verify.py

@@ -8,6 +8,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0027_v330_emitted_events'),
     ]

awx/main/migrations/0030_v330_modify_application.py

@@ -7,6 +7,7 @@ import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0028_v330_add_tower_verify'),
     ]

awx/main/migrations/0031_v330_encrypt_oauth2_secret.py

@@ -8,6 +8,7 @@ import oauth2_provider.generators
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0030_v330_modify_application'),
     ]

awx/main/migrations/0032_v330_polymorphic_delete.py

@@ -7,6 +7,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0031_v330_encrypt_oauth2_secret'),
     ]

awx/main/migrations/0033_v330_oauth_help_text.py

@@ -12,6 +12,7 @@ import oauth2_provider.generators
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0032_v330_polymorphic_delete'),
     ]

awx/main/migrations/0034_v330_delete_user_role.py

@@ -10,6 +10,7 @@ from awx.main.migrations import _migration_utils as migration_utils
 
 
 class Migration(ActivityStreamDisabledMigration):
+
     dependencies = [
         ('main', '0033_v330_oauth_help_text'),
     ]

awx/main/migrations/0035_v330_more_oauth2_help_text.py

@@ -8,6 +8,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0034_v330_delete_user_role'),
     ]

awx/main/migrations/0036_v330_credtype_remove_become_methods.py

@@ -8,6 +8,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0035_v330_more_oauth2_help_text'),
     ]

awx/main/migrations/0037_v330_remove_legacy_fact_cleanup.py

@@ -8,6 +8,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0036_v330_credtype_remove_become_methods'),
     ]

awx/main/migrations/0038_v330_add_deleted_activitystream_actor.py

@@ -8,6 +8,7 @@ import awx.main.fields
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0037_v330_remove_legacy_fact_cleanup'),
     ]

awx/main/migrations/0039_v330_custom_venv_help_text.py

@@ -6,6 +6,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0038_v330_add_deleted_activitystream_actor'),
     ]

awx/main/migrations/0040_v330_unifiedjob_controller_node.py

@@ -6,6 +6,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('main', '0039_v330_custom_venv_help_text'),
     ]