Datasets:

zirui3

/

TSSB-3M-ext

like 0

[ { "sha": "f73758ad7dd5e56d565e64d8c0f741fef8e41f57", "filename": "awx/main/middleware.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/fe9f502e919bfe35b7ed89b523803c0b6cd65250/awx%2Fmain%2Fmiddleware.py", "raw_url": "https://github.com/gconsidine/awx/raw/fe9f502e919bfe35b7ed89b523803c0b6cd65250/awx%2Fmain%2Fmiddleware.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmiddleware.py?ref=fe9f502e919bfe35b7ed89b523803c0b6cd65250", "patch": "@@ -5,7 +5,7 @@\n import threading\n import uuid\n \n-from django.contrib.auth.models import User, AnonymousUser\n+from django.contrib.auth.models import User\n from django.db.models.signals import post_save\n from django.db import IntegrityError\n from django.http import HttpResponseRedirect" } ]

[ { "sha": "c380df5a5643f271ac3dd2d232c6cbd7b58328a4", "filename": "awx/api/license.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/3132d4efeefa95098b18519c5a693a1c6b536a72/awx%2Fapi%2Flicense.py", "raw_url": "https://github.com/gconsidine/awx/raw/3132d4efeefa95098b18519c5a693a1c6b536a72/awx%2Fapi%2Flicense.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Flicense.py?ref=3132d4efeefa95098b18519c5a693a1c6b536a72", "patch": "@@ -16,7 +16,7 @@ def get_license(show_key=False):\n place on this Tower instance.\n \"\"\"\n license_reader = TaskSerializer()\n- return license_reader.from_file(show_key=show_key)\n+ return license_reader.from_database(show_key=show_key)\n \n \n def feature_enabled(name):" } ]

[ { "sha": "064ca78c22523f775159fd6bf400d183d02d91f2", "filename": "awx/plugins/callback/job_event_callback.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/c2875c65ca741cf587378be8c5b57fc6c68f84f5/awx%2Fplugins%2Fcallback%2Fjob_event_callback.py", "raw_url": "https://github.com/gconsidine/awx/raw/c2875c65ca741cf587378be8c5b57fc6c68f84f5/awx%2Fplugins%2Fcallback%2Fjob_event_callback.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fplugins%2Fcallback%2Fjob_event_callback.py?ref=c2875c65ca741cf587378be8c5b57fc6c68f84f5", "patch": "@@ -56,7 +56,7 @@\n prefix='tower.job.event_callback',\n maxudpsize=512)\n else:\n- from statsd import StatsClientBase\n+ from statsd.client import StatsClientBase\n \n class NoStatsClient(StatsClientBase):\n def __init__(self, *args, **kwargs):" } ]

[ { "sha": "ad87506ab2fd6b1de11deb38348de3c725ad88a7", "filename": "awx/main/access.py", "status": "modified", "additions": 8, "deletions": 8, "changes": 16, "blob_url": "https://github.com/gconsidine/awx/blob/a44318f0cdfa706a04b3372db52f2cfb4106d0bf/awx%2Fmain%2Faccess.py", "raw_url": "https://github.com/gconsidine/awx/raw/a44318f0cdfa706a04b3372db52f2cfb4106d0bf/awx%2Fmain%2Faccess.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Faccess.py?ref=a44318f0cdfa706a04b3372db52f2cfb4106d0bf", "patch": "@@ -149,7 +149,7 @@ def can_unattach(self, obj, sub_obj, relationship):\n def check_license(self, add_host=False, feature=None, check_expiration=True):\n reader = TaskSerializer()\n validation_info = reader.from_database()\n- if ('test' in sys.argv or 'jenkins' in sys.argv) and not os.environ.get('SKIP_LICENSE_FIXUP_FOR_TEST', ''):\n+ if ('test' in sys.argv or 'py.test' in sys.argv[0] or 'jenkins' in sys.argv) and not os.environ.get('SKIP_LICENSE_FIXUP_FOR_TEST', ''):\n validation_info['free_instances'] = 99999999\n validation_info['time_remaining'] = 99999999\n validation_info['grace_period_remaining'] = 99999999\n@@ -912,8 +912,8 @@ def get_queryset(self):\n )\n \n return base_qs.filter(\n- Q(id__in=org_admin_ids) | \n- Q(id__in=perm_deploy_ids) | \n+ Q(id__in=org_admin_ids) |\n+ Q(id__in=perm_deploy_ids) |\n Q(id__in=perm_check_ids)\n )\n \n@@ -926,7 +926,7 @@ def can_add(self, data):\n a user can create a job template if they are a superuser, an org admin\n of any org that the project is a member, or if they have user or team\n based permissions tying the project to the inventory source for the\n- given action as well as the 'create' deploy permission. \n+ given action as well as the 'create' deploy permission.\n Users who are able to create deploy jobs can also run normal and check (dry run) jobs.\n '''\n if not data or '_method' in data: # So the browseable API will work?\n@@ -1126,8 +1126,8 @@ def get_queryset(self):\n )\n \n return base_qs.filter(\n- Q(id__in=org_admin_ids) | \n- Q(id__in=perm_deploy_ids) | \n+ Q(id__in=org_admin_ids) |\n+ Q(id__in=perm_deploy_ids) |\n Q(id__in=perm_check_ids)\n )\n \n@@ -1367,9 +1367,9 @@ class UnifiedJobTemplateAccess(BaseAccess):\n projects without SCM configured or inventory sources without a cloud\n source.\n '''\n- \n+\n model = UnifiedJobTemplate\n- \n+\n def get_queryset(self):\n qs = self.model.objects.filter(active=True).distinct()\n project_qs = self.user.get_queryset(Project).filter(scm_type__in=[s[0] for s in Project.SCM_TYPE_CHOICES])" } ]

[ { "sha": "2026f0c410e269766e2d5c371e9cbd07eae2acf7", "filename": "awx/plugins/callback/job_event_callback.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/7ab839c17f9327fe335d53f741c1d48932ce38f3/awx%2Fplugins%2Fcallback%2Fjob_event_callback.py", "raw_url": "https://github.com/gconsidine/awx/raw/7ab839c17f9327fe335d53f741c1d48932ce38f3/awx%2Fplugins%2Fcallback%2Fjob_event_callback.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fplugins%2Fcallback%2Fjob_event_callback.py?ref=7ab839c17f9327fe335d53f741c1d48932ce38f3", "patch": "@@ -212,7 +212,7 @@ def _post_rest_api_event(self, event, event_data):\n \n def _log_event(self, event, **event_data):\n if self.callback_consumer_port:\n- with statsd.timer('zmq_post_event_msg.{}'.format(event)):\n+ with statsd.timer('zmq_post_event_msg.{0}'.format(event)):\n self._post_job_event_queue_msg(event, event_data)\n else:\n self._post_rest_api_event(event, event_data)" } ]

[ { "sha": "bbb63bd359e26f670ad72452f3ca696b2a21b027", "filename": "awx/main/tasks.py", "status": "modified", "additions": 3, "deletions": 3, "changes": 6, "blob_url": "https://github.com/gconsidine/awx/blob/b82bd9404f32c2acbf4c8cbe0ddafd7920b22f68/awx%2Fmain%2Ftasks.py", "raw_url": "https://github.com/gconsidine/awx/raw/b82bd9404f32c2acbf4c8cbe0ddafd7920b22f68/awx%2Fmain%2Ftasks.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftasks.py?ref=b82bd9404f32c2acbf4c8cbe0ddafd7920b22f68", "patch": "@@ -843,7 +843,7 @@ def get_password_prompts(self):\n d[re.compile(r'^PFEXEC password.*:\\s*?$', re.M)] = 'become_password'\n d[re.compile(r'^pfexec password.*:\\s*?$', re.M)] = 'become_password'\n d[re.compile(r'^RUNAS password.*:\\s*?$', re.M)] = 'become_password'\n- d[re.compile(r'^runas password.*:\\s*?$', re.M)] = 'become_password' \n+ d[re.compile(r'^runas password.*:\\s*?$', re.M)] = 'become_password'\n d[re.compile(r'^SSH password:\\s*?$', re.M)] = 'ssh_password'\n d[re.compile(r'^Password:\\s*?$', re.M)] = 'ssh_password'\n d[re.compile(r'^Vault password:\\s*?$', re.M)] = 'vault_password'\n@@ -1219,7 +1219,7 @@ def build_env(self, inventory_update, **kwargs):\n env['GCE_EMAIL'] = passwords.get('source_username', '')\n env['GCE_PROJECT'] = passwords.get('source_project', '')\n env['GCE_PEM_FILE_PATH'] = cloud_credential\n- env['GCE_ZONE'] = inventory_source.source_regions\n+ env['GCE_ZONE'] = inventory_update.source_regions\n elif inventory_update.source == 'openstack':\n env['OS_CLIENT_CONFIG_FILE'] = cloud_credential\n elif inventory_update.source == 'file':\n@@ -1473,7 +1473,7 @@ def get_password_prompts(self):\n d[re.compile(r'^PFEXEC password.*:\\s*?$', re.M)] = 'become_password'\n d[re.compile(r'^pfexec password.*:\\s*?$', re.M)] = 'become_password'\n d[re.compile(r'^RUNAS password.*:\\s*?$', re.M)] = 'become_password'\n- d[re.compile(r'^runas password.*:\\s*?$', re.M)] = 'become_password' \n+ d[re.compile(r'^runas password.*:\\s*?$', re.M)] = 'become_password'\n d[re.compile(r'^SSH password:\\s*?$', re.M)] = 'ssh_password'\n d[re.compile(r'^Password:\\s*?$', re.M)] = 'ssh_password'\n return d" } ]

[ { "sha": "63ecf3a0dd0af4e550f45cabc6452971c4eca748", "filename": "awx/main/models/mixins.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/7d4b54a651f73bb86de009842052564fadc8efe6/awx%2Fmain%2Fmodels%2Fmixins.py", "raw_url": "https://github.com/gconsidine/awx/raw/7d4b54a651f73bb86de009842052564fadc8efe6/awx%2Fmain%2Fmodels%2Fmixins.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Fmixins.py?ref=7d4b54a651f73bb86de009842052564fadc8efe6", "patch": "@@ -8,7 +8,7 @@\n from awx.main.fields import ImplicitResourceField\n \n \n-__all__ = 'ResourceMixin'\n+__all__ = ['ResourceMixin']\n \n class ResourceMixin(models.Model):\n " } ]

[ { "sha": "948e61c00d0c685c2378c966846f85fe2048cb85", "filename": "awx/api/serializers.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/a9bf29d2a7cbf827ed77d52e9a14792e280d95c1/awx%2Fapi%2Fserializers.py", "raw_url": "https://github.com/gconsidine/awx/raw/a9bf29d2a7cbf827ed77d52e9a14792e280d95c1/awx%2Fapi%2Fserializers.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fserializers.py?ref=a9bf29d2a7cbf827ed77d52e9a14792e280d95c1", "patch": "@@ -50,7 +50,7 @@\n logger = logging.getLogger('awx.api.serializers')\n \n # Fields that should be summarized regardless of object type.\n-DEFAULT_SUMMARY_FIELDS = ('name', 'description')# , 'created_by', 'modified_by')#, 'type')\n+DEFAULT_SUMMARY_FIELDS = ('id', 'name', 'description')# , 'created_by', 'modified_by')#, 'type')\n \n # Keys are fields (foreign keys) where, if found on an instance, summary info\n # should be added to the serialized data. Values are a tuple of field names on" } ]

[ { "sha": "d741b583023cf25a209b70dd371623e6daf626da", "filename": "awx/main/tests/functional/commands/test_cleanup_facts.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/44618d49561c314477a3c54a9665ae92fdf72ea8/awx%2Fmain%2Ftests%2Ffunctional%2Fcommands%2Ftest_cleanup_facts.py", "raw_url": "https://github.com/gconsidine/awx/raw/44618d49561c314477a3c54a9665ae92fdf72ea8/awx%2Fmain%2Ftests%2Ffunctional%2Fcommands%2Ftest_cleanup_facts.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Fcommands%2Ftest_cleanup_facts.py?ref=44618d49561c314477a3c54a9665ae92fdf72ea8", "patch": "@@ -71,7 +71,7 @@ def test_cleanup_logic(fact_scans, hosts):\n module = 'ansible'\n \n cleanup_facts = CleanupFacts()\n- deleted_count = cleanup_facts.cleanup(timestamp_middle, granularity, module=module)\n+ cleanup_facts.cleanup(timestamp_middle, granularity, module=module)\n \n \n host_ids = Host.objects.all().values_list('id', flat=True)" } ]

[ { "sha": "822fdc0bcc503c41029d7810ae6c0ef218e86789", "filename": "awx/main/tests/functional/test_rbac_workflow.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/32fe6ea4fa2aa710d2627b6c19c0e25013b72a1d/awx%2Fmain%2Ftests%2Ffunctional%2Ftest_rbac_workflow.py", "raw_url": "https://github.com/gconsidine/awx/raw/32fe6ea4fa2aa710d2627b6c19c0e25013b72a1d/awx%2Fmain%2Ftests%2Ffunctional%2Ftest_rbac_workflow.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Ftest_rbac_workflow.py?ref=32fe6ea4fa2aa710d2627b6c19c0e25013b72a1d", "patch": "@@ -24,7 +24,7 @@ def wfjt_node(wfjt_with_nodes):\n \n @pytest.fixture\n def workflow_job(wfjt):\n- return wfjt.jobs.create(name='test_workflow')\n+ return wfjt.workflow_jobs.create(name='test_workflow')\n \n \n @pytest.mark.django_db" } ]

[ { "sha": "7e95e5abd74822bc13aa0a86aa2d4f434772522c", "filename": "awx/main/models/unified_jobs.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/d882a14d8761f614509443cf8867d5945203eab6/awx%2Fmain%2Fmodels%2Funified_jobs.py", "raw_url": "https://github.com/gconsidine/awx/raw/d882a14d8761f614509443cf8867d5945203eab6/awx%2Fmain%2Fmodels%2Funified_jobs.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Funified_jobs.py?ref=d882a14d8761f614509443cf8867d5945203eab6", "patch": "@@ -801,7 +801,7 @@ def websocket_emit_status(self, status):\n emit_channel_notification('jobs-status_changed', status_data)\n \n if self.spawned_by_workflow:\n- event_serialized['group_name'] = \"workflow_events\"\n+ status_data['group_name'] = \"workflow_events\"\n emit_channel_notification('workflow_events-' + str(self.workflow_job_id), status_data)\n \n " } ]

[ { "sha": "0c8aa8acce4f39687828de9e786985d1562abd0c", "filename": "awx/main/tasks.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/e725b16cd919321d350d2a92532ffcdbf500dfca/awx%2Fmain%2Ftasks.py", "raw_url": "https://github.com/gconsidine/awx/raw/e725b16cd919321d350d2a92532ffcdbf500dfca/awx%2Fmain%2Ftasks.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftasks.py?ref=e725b16cd919321d350d2a92532ffcdbf500dfca", "patch": "@@ -1019,7 +1019,7 @@ def should_use_proot(self, instance, **kwargs):\n \n def pre_run_hook(self, job, **kwargs):\n if job.project and job.project.scm_type:\n- local_project_sync = job.project.create_project_update()\n+ local_project_sync = job.project.create_project_update(launch_type=\"sync\")\n local_project_sync.job_type = 'run'\n local_project_sync.save()\n project_update_task = local_project_sync._get_task_class()" } ]

[ { "sha": "7bc89d657c338dca436dfb7734672f4ef3cdca8d", "filename": "awx/main/models/unified_jobs.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/fbd27e25a6ba9086bee6fa3bb5eefa9a6b778480/awx%2Fmain%2Fmodels%2Funified_jobs.py", "raw_url": "https://github.com/gconsidine/awx/raw/fbd27e25a6ba9086bee6fa3bb5eefa9a6b778480/awx%2Fmain%2Fmodels%2Funified_jobs.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Funified_jobs.py?ref=fbd27e25a6ba9086bee6fa3bb5eefa9a6b778480", "patch": "@@ -675,7 +675,7 @@ def copy_unified_job(self):\n \n fields = unified_jt_class._get_unified_job_field_names() + [parent_field_name]\n unified_job = copy_model_by_class(self, unified_job_class, fields, {})\n- unified_job.job_type = 'relaunch'\n+ unified_job.launch_type = 'relaunch'\n unified_job.save()\n \n # Labels coppied here" } ]

[ { "sha": "734d1159b61b1e6c8f422cfdf4d29416c18fd6b3", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/4295ab3e4a78357b7c11e9c1a194bff79425aec6/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/4295ab3e4a78357b7c11e9c1a194bff79425aec6/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=4295ab3e4a78357b7c11e9c1a194bff79425aec6", "patch": "@@ -534,7 +534,7 @@ def get(self, request):\n saml_backend_data = dict(backend_data.items())\n saml_backend_data['login_url'] = '%s?idp=%s' % (login_url, idp)\n full_backend_name = '%s:%s' % (name, idp)\n- if err_backend == full_backend_name and err_message:\n+ if (err_backend == full_backend_name or err_backend == name) and err_message:\n saml_backend_data['error'] = err_message\n data[full_backend_name] = saml_backend_data\n else:" } ]

[ { "sha": "b5a5b326efb8f4e644d0166cf3f779f062db5e76", "filename": "awx/api/serializers.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/e5278e2291bb0db8b1b911dc298a5a2e125d049c/awx%2Fapi%2Fserializers.py", "raw_url": "https://github.com/gconsidine/awx/raw/e5278e2291bb0db8b1b911dc298a5a2e125d049c/awx%2Fapi%2Fserializers.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fserializers.py?ref=e5278e2291bb0db8b1b911dc298a5a2e125d049c", "patch": "@@ -2420,7 +2420,7 @@ def get_related(self, obj):\n res['failure_nodes'] = reverse('api:workflow_job_node_failure_nodes_list', args=(obj.pk,))\n res['always_nodes'] = reverse('api:workflow_job_node_always_nodes_list', args=(obj.pk,))\n if obj.job:\n- res['job'] = reverse('api:job_detail', args=(obj.job.pk,))\n+ res['job'] = obj.job.get_absolute_url()\n if obj.workflow_job:\n res['workflow_job'] = reverse('api:workflow_job_detail', args=(obj.workflow_job.pk,))\n return res" } ]

[ { "sha": "fbb9c8fb736c9f6a5f81d11729368fb004ed7a67", "filename": "awx/settings/defaults.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/93ce2a5dfd1f9e030d6bfcc1edcec6f04d579213/awx%2Fsettings%2Fdefaults.py", "raw_url": "https://github.com/gconsidine/awx/raw/93ce2a5dfd1f9e030d6bfcc1edcec6f04d579213/awx%2Fsettings%2Fdefaults.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fsettings%2Fdefaults.py?ref=93ce2a5dfd1f9e030d6bfcc1edcec6f04d579213", "patch": "@@ -538,7 +538,7 @@ def IS_TESTING(argv=None):\n \n # Enable bubblewrap support for running jobs (playbook runs only).\n # Note: This setting may be overridden by database settings.\n-AWX_PROOT_ENABLED = False\n+AWX_PROOT_ENABLED = True\n \n # Command/path to bubblewrap.\n AWX_PROOT_CMD = 'bwrap'" } ]

[ { "sha": "f6f7a3aae316ebef6bf0c098d662e30e4b3366aa", "filename": "awx/api/serializers.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/ec9065bc2f45d5c0022b6aeffa6a6bc4cb96ac57/awx%2Fapi%2Fserializers.py", "raw_url": "https://github.com/gconsidine/awx/raw/ec9065bc2f45d5c0022b6aeffa6a6bc4cb96ac57/awx%2Fapi%2Fserializers.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fserializers.py?ref=ec9065bc2f45d5c0022b6aeffa6a6bc4cb96ac57", "patch": "@@ -81,7 +81,7 @@\n 'credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'),\n 'cloud_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'),\n 'network_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'net'),\n- 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'started', 'finished'),\n+ 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'elapsed'),\n 'job_template': DEFAULT_SUMMARY_FIELDS,\n 'schedule': DEFAULT_SUMMARY_FIELDS + ('next_run',),\n 'unified_job_template': DEFAULT_SUMMARY_FIELDS + ('unified_job_type',)," } ]

[ { "sha": "7ae97fe76baa772923d29357a717eef99459f51d", "filename": "awx/main/tests/unit/test_network_credential.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/e69f6726d0ed72eaa49cf14751cda6e03d3d4cb8/awx%2Fmain%2Ftests%2Funit%2Ftest_network_credential.py", "raw_url": "https://github.com/gconsidine/awx/raw/e69f6726d0ed72eaa49cf14751cda6e03d3d4cb8/awx%2Fmain%2Ftests%2Funit%2Ftest_network_credential.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Funit%2Ftest_network_credential.py?ref=e69f6726d0ed72eaa49cf14751cda6e03d3d4cb8", "patch": "@@ -77,7 +77,7 @@ def test_net_cred_ssh_agent(mocker, get_ssh_version):\n mocker.patch.object(run_job, 'post_run_hook', return_value=None)\n \n run_job.run(mock_job.id)\n- assert run_job.update_model.call_count == 3\n+ assert run_job.update_model.call_count == 4\n \n job_args = run_job.update_model.call_args_list[1][1].get('job_args')\n assert 'ssh-add' in job_args" } ]

[ { "sha": "63128635abda26fb38002c1f5d4cbc6f4688caeb", "filename": "awx/main/tasks.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/ef1f77bf8e9fe4f72b9ff7e84cf35fce59417aa1/awx%2Fmain%2Ftasks.py", "raw_url": "https://github.com/gconsidine/awx/raw/ef1f77bf8e9fe4f72b9ff7e84cf35fce59417aa1/awx%2Fmain%2Ftasks.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftasks.py?ref=ef1f77bf8e9fe4f72b9ff7e84cf35fce59417aa1", "patch": "@@ -1057,7 +1057,7 @@ def pre_run_hook(self, job, **kwargs):\n project_update_task = local_project_sync._get_task_class()\n try:\n project_update_task().run(local_project_sync.id)\n- job = self.update_model(job.pk, scm_revision=project.scm_revision)\n+ job = self.update_model(job.pk, scm_revision=job.project.scm_revision)\n except Exception:\n job = self.update_model(job.pk, status='failed',\n job_explanation=('Previous Task Failed: {\"job_type\": \"%s\", \"job_name\": \"%s\", \"job_id\": \"%s\"}' % " } ]

[ { "sha": "e15084a681a6a3aeecbc0815c07e440b51560c04", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/60ea0bdf928208da260216bd80d0b35eaeae29c0/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/60ea0bdf928208da260216bd80d0b35eaeae29c0/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=60ea0bdf928208da260216bd80d0b35eaeae29c0", "patch": "@@ -603,7 +603,7 @@ def post(self, request):\n return Response({'token': token.key, 'expires': token.expires}, headers=headers)\n if 'username' in request.data:\n logger.warning(smart_text(u\"Login failed for user {}\".format(request.data['username'])),\n- user=dict(actor=request.data['username']))\n+ extra=dict(actor=request.data['username']))\n return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)\n \n " } ]

[ { "sha": "eec91af831103679ee82cd55bdf2d937c863d689", "filename": "awx/api/serializers.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/e45201aa8796273a68add08fd6f30b0d85bc7484/awx%2Fapi%2Fserializers.py", "raw_url": "https://github.com/gconsidine/awx/raw/e45201aa8796273a68add08fd6f30b0d85bc7484/awx%2Fapi%2Fserializers.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fserializers.py?ref=e45201aa8796273a68add08fd6f30b0d85bc7484", "patch": "@@ -76,7 +76,7 @@\n 'total_groups',\n 'groups_with_active_failures',\n 'has_inventory_sources'),\n- 'project': DEFAULT_SUMMARY_FIELDS + ('status',),\n+ 'project': DEFAULT_SUMMARY_FIELDS + ('status', 'scm_type'),\n 'project_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',),\n 'credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'),\n 'cloud_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud')," } ]

[ { "sha": "70ac423098354776577640058e9a8927050f5080", "filename": "awx/main/access.py", "status": "modified", "additions": 2, "deletions": 2, "changes": 4, "blob_url": "https://github.com/gconsidine/awx/blob/7acb89ff4a006fa5e15a91b4697d0551c74912aa/awx%2Fmain%2Faccess.py", "raw_url": "https://github.com/gconsidine/awx/raw/7acb89ff4a006fa5e15a91b4697d0551c74912aa/awx%2Fmain%2Faccess.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Faccess.py?ref=7acb89ff4a006fa5e15a91b4697d0551c74912aa", "patch": "@@ -1671,8 +1671,8 @@ def can_readd(self, obj):\n if not node_access.can_add({'reference_obj': node}):\n wj_add_perm = False\n if not wj_add_perm and self.save_messages:\n- self.messages['workflow_job_template'] = ('Template has been modified since job was launched, '\n- 'and you do not have permission to its resources.')\n+ self.messages['workflow_job_template'] = _('Template has been modified since job was launched, '\n+ 'and you do not have permission to its resources.')\n return wj_add_perm\n \n def can_cancel(self, obj):" } ]

[ { "sha": "7336da2f088293ec513b4d8dc4ac4839a075b3ee", "filename": "awx/lib/tower_display_callback/module.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/974fe1d2445752b67b3ddd087abd481ba98e58f4/awx%2Flib%2Ftower_display_callback%2Fmodule.py", "raw_url": "https://github.com/gconsidine/awx/raw/974fe1d2445752b67b3ddd087abd481ba98e58f4/awx%2Flib%2Ftower_display_callback%2Fmodule.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Flib%2Ftower_display_callback%2Fmodule.py?ref=974fe1d2445752b67b3ddd087abd481ba98e58f4", "patch": "@@ -328,7 +328,7 @@ def v2_playbook_on_stats(self, stats):\n ok=stats.ok,\n processed=stats.processed,\n skipped=stats.skipped,\n- artifact_data=stats.custom.get('_run', {})\n+ artifact_data=stats.custom.get('_run', {}) if hasattr(stats, 'custom') else {}\n )\n \n with self.capture_event_data('playbook_on_stats', **event_data):" } ]

[ { "sha": "112bdcfc76f018f194a003a9a0d94d67522e3adf", "filename": "awx/main/models/workflow.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/f2d8800c35fc8ef9b267562af126d2958e224a15/awx%2Fmain%2Fmodels%2Fworkflow.py", "raw_url": "https://github.com/gconsidine/awx/raw/f2d8800c35fc8ef9b267562af126d2958e224a15/awx%2Fmain%2Fmodels%2Fworkflow.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Fworkflow.py?ref=f2d8800c35fc8ef9b267562af126d2958e224a15", "patch": "@@ -429,7 +429,7 @@ def node_templates_missing(self):\n \n def node_prompts_rejected(self):\n node_list = []\n- for node in self.workflow_job_template_nodes.select_related('unified_job_template').all():\n+ for node in self.workflow_job_template_nodes.prefetch_related('unified_job_template').all():\n node_prompts_warnings = node.get_prompts_warnings()\n if node_prompts_warnings:\n node_list.append(node.pk)" } ]

[ { "sha": "9f1585c072ba917e52c57184397880772e9fc45a", "filename": "awx/settings/defaults.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/df249eda2eda69b047c462679320db9e6878e749/awx%2Fsettings%2Fdefaults.py", "raw_url": "https://github.com/gconsidine/awx/raw/df249eda2eda69b047c462679320db9e6878e749/awx%2Fsettings%2Fdefaults.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fsettings%2Fdefaults.py?ref=df249eda2eda69b047c462679320db9e6878e749", "patch": "@@ -165,7 +165,7 @@ def IS_TESTING(argv=None):\n \n JOB_EVENT_WORKERS = 4\n \n-JOB_EVENT_MAX_QUEUE_SIZE = 5000\n+JOB_EVENT_MAX_QUEUE_SIZE = 10000\n \n # Disallow sending session cookies over insecure connections\n SESSION_COOKIE_SECURE = True" } ]

[ { "sha": "57ede93ded33c67eaa44ded5d5dbe11453655951", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/df9bb829fcfd1b23a15147c1a8503fb03915389d/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/df9bb829fcfd1b23a15147c1a8503fb03915389d/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=df9bb829fcfd1b23a15147c1a8503fb03915389d", "patch": "@@ -2421,7 +2421,7 @@ def get(self, request, *args, **kwargs):\n raise LicenseForbids(_('Your license does not allow '\n 'adding surveys.'))\n survey_spec = obj.survey_spec\n- for pos, field in enumerate(survey_spec['spec']):\n+ for pos, field in enumerate(survey_spec.get('spec', [])):\n if field.get('type') == 'password':\n if 'default' in field and field['default']:\n field['default'] = '$encrypted$'" } ]

[ { "sha": "d23843a5fe08a10a146c4dc95f85ddc6aa3b41d9", "filename": "awx/main/migrations/0034_v310_release.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/710702dffe879069eb52bb358f355f88f5dc4239/awx%2Fmain%2Fmigrations%2F0034_v310_release.py", "raw_url": "https://github.com/gconsidine/awx/raw/710702dffe879069eb52bb358f355f88f5dc4239/awx%2Fmain%2Fmigrations%2F0034_v310_release.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmigrations%2F0034_v310_release.py?ref=710702dffe879069eb52bb358f355f88f5dc4239", "patch": "@@ -62,7 +62,7 @@ class Migration(migrations.Migration):\n migrations.AlterField(\n model_name='unifiedjob',\n name='launch_type',\n- field=models.CharField(default=b'manual', max_length=20, editable=False, choices=[(b'manual', 'Manual'), (b'relaunch', 'Relaunch'), (b'callback', 'Callback'), (b'scheduled', 'Scheduled'), (b'dependency', 'Dependency'), (b'workflow', 'Workflow')]),\n+ field=models.CharField(default=b'manual', max_length=20, editable=False, choices=[(b'manual', 'Manual'), (b'relaunch', 'Relaunch'), (b'callback', 'Callback'), (b'scheduled', 'Scheduled'), (b'dependency', 'Dependency'), (b'workflow', 'Workflow'), (b'sync', 'Sync')]),\n ),\n migrations.CreateModel(\n name='WorkflowJob'," } ]

[ { "sha": "5d95296e8e07d903f82483e0eab6437f95bd8e84", "filename": "awx/sso/fields.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/f347bc5ae40b4c1448fbb96c7f99e44fda9358b5/awx%2Fsso%2Ffields.py", "raw_url": "https://github.com/gconsidine/awx/raw/f347bc5ae40b4c1448fbb96c7f99e44fda9358b5/awx%2Fsso%2Ffields.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fsso%2Ffields.py?ref=f347bc5ae40b4c1448fbb96c7f99e44fda9358b5", "patch": "@@ -390,7 +390,7 @@ def to_representation(self, value):\n child_field = self.child_fields.get(k, None)\n if child_field:\n value[k] = child_field.to_representation(v)\n- elif allow_unknown_keys:\n+ elif self.allow_unknown_keys:\n value[k] = v\n return value\n " } ]

[ { "sha": "952377c112b59102ca63e4b9f5e01db48be0a820", "filename": "awx/main/models/mixins.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/755e408cd9beacef9223123162a58d2fc7fe41a3/awx%2Fmain%2Fmodels%2Fmixins.py", "raw_url": "https://github.com/gconsidine/awx/raw/755e408cd9beacef9223123162a58d2fc7fe41a3/awx%2Fmain%2Fmodels%2Fmixins.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Fmixins.py?ref=755e408cd9beacef9223123162a58d2fc7fe41a3", "patch": "@@ -130,7 +130,7 @@ def _update_unified_job_kwargs(self, **kwargs):\n default = survey_element.get('default')\n variable_key = survey_element.get('variable')\n if survey_element.get('type') == 'password':\n- if variable_key in kwargs_extra_vars:\n+ if variable_key in kwargs_extra_vars and default:\n kw_value = kwargs_extra_vars[variable_key]\n if kw_value.startswith('$encrypted$') and kw_value != default:\n kwargs_extra_vars[variable_key] = default" } ]

[ { "sha": "72348873e596c6fa0ab364ce58b18b484e504b93", "filename": "awx/main/tasks.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/587a843acdd1d3dfecb66a3b18aae3ac435cf85c/awx%2Fmain%2Ftasks.py", "raw_url": "https://github.com/gconsidine/awx/raw/587a843acdd1d3dfecb66a3b18aae3ac435cf85c/awx%2Fmain%2Ftasks.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftasks.py?ref=587a843acdd1d3dfecb66a3b18aae3ac435cf85c", "patch": "@@ -874,7 +874,7 @@ def build_env(self, job, **kwargs):\n cp_dir = os.path.join(kwargs['private_data_dir'], 'cp')\n if not os.path.exists(cp_dir):\n os.mkdir(cp_dir, 0700)\n- env['ANSIBLE_SSH_CONTROL_PATH'] = os.path.join(cp_dir, 'ansible-ssh-%%h-%%p-%%r')\n+ env['ANSIBLE_SSH_CONTROL_PATH'] = os.path.join(cp_dir, '%%h%%p%%r')\n \n # Allow the inventory script to include host variables inline via ['_meta']['hostvars'].\n env['INVENTORY_HOSTVARS'] = str(True)" } ]

[ { "sha": "adf43d4bb9e712b3087d0f3b69d5a07b1a9cf096", "filename": "awx/main/tests/unit/isolated/test_expect.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/6d201c44d97a46ee6627a596c9d6bea0bffa6306/awx%2Fmain%2Ftests%2Funit%2Fisolated%2Ftest_expect.py", "raw_url": "https://github.com/gconsidine/awx/raw/6d201c44d97a46ee6627a596c9d6bea0bffa6306/awx%2Fmain%2Ftests%2Funit%2Fisolated%2Ftest_expect.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Funit%2Fisolated%2Ftest_expect.py?ref=6d201c44d97a46ee6627a596c9d6bea0bffa6306", "patch": "@@ -272,7 +272,7 @@ def _synchronize_job_artifacts(args, cwd, env, buff, **kw):\n '-e', '{\"src\": \"%s\"}' % private_data_dir,\n '-vvvvv'\n ],\n- '/tower_devel/awx/playbooks', mgr.management_env, mock.ANY,\n+ '/awx_devel/awx/playbooks', mgr.management_env, mock.ANY,\n cancelled_callback=None,\n idle_timeout=0,\n job_timeout=0," } ]

[ { "sha": "dd94ae4e2650716ac69e129e8c341832fd120025", "filename": "awx/api/serializers.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/83dca62e161b18a9ad97ccf9edee9d02985e41ca/awx%2Fapi%2Fserializers.py", "raw_url": "https://github.com/gconsidine/awx/raw/83dca62e161b18a9ad97ccf9edee9d02985e41ca/awx%2Fapi%2Fserializers.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fserializers.py?ref=83dca62e161b18a9ad97ccf9edee9d02985e41ca", "patch": "@@ -91,7 +91,7 @@\n 'project_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',),\n 'credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'),\n 'vault_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'),\n- 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'elapsed'),\n+ 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'elapsed', 'job_type'),\n 'job_template': DEFAULT_SUMMARY_FIELDS,\n 'workflow_job_template': DEFAULT_SUMMARY_FIELDS,\n 'workflow_job': DEFAULT_SUMMARY_FIELDS," } ]

[ { "sha": "b6f6e86230c729663efcd7cd3486bd1af858e9c1", "filename": "awx/api/serializers.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/24d173c74f09c728f4c67782a18b402ea60fb860/awx%2Fapi%2Fserializers.py", "raw_url": "https://github.com/gconsidine/awx/raw/24d173c74f09c728f4c67782a18b402ea60fb860/awx%2Fapi%2Fserializers.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fserializers.py?ref=24d173c74f09c728f4c67782a18b402ea60fb860", "patch": "@@ -91,7 +91,7 @@\n 'project_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',),\n 'credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'),\n 'vault_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'),\n- 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'elapsed', 'job_type'),\n+ 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'elapsed'),\n 'job_template': DEFAULT_SUMMARY_FIELDS,\n 'workflow_job_template': DEFAULT_SUMMARY_FIELDS,\n 'workflow_job': DEFAULT_SUMMARY_FIELDS," } ]

[ { "sha": "154caffca574e56b9f82e732340c1cc45af6e523", "filename": "setup.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/f13c56e3d96697b9b521d896089fba94679dd8aa/setup.py", "raw_url": "https://github.com/gconsidine/awx/raw/f13c56e3d96697b9b521d896089fba94679dd8aa/setup.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/setup.py?ref=f13c56e3d96697b9b521d896089fba94679dd8aa", "patch": "@@ -16,7 +16,7 @@\n homedir = \"/var/lib/awx\"\n bindir = \"/usr/bin\"\n sharedir = \"/usr/share/awx\"\n-docdir = \"/usr/share/doc/ansible-awx\"\n+docdir = \"/usr/share/doc/awx\"\n \n \n def get_version():" } ]

[ { "sha": "ec2ef9e5d7e2e692e5ec11ae3180fcbd32dc0af0", "filename": "awx/main/tasks.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/4b830e117612d6d73192e531caa7de8e138b009e/awx%2Fmain%2Ftasks.py", "raw_url": "https://github.com/gconsidine/awx/raw/4b830e117612d6d73192e531caa7de8e138b009e/awx%2Fmain%2Ftasks.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftasks.py?ref=4b830e117612d6d73192e531caa7de8e138b009e", "patch": "@@ -992,7 +992,7 @@ def build_env(self, job, **kwargs):\n env['ANSIBLE_LIBRARY'] = self.get_path_to('..', 'plugins', 'library')\n env['ANSIBLE_CACHE_PLUGINS'] = self.get_path_to('..', 'plugins', 'fact_caching')\n env['ANSIBLE_CACHE_PLUGIN'] = \"awx\"\n- env['ANSIBLE_FACT_CACHE_TIMEOUT'] = str(settings.ANSIBLE_FACT_CACHE_TIMEOUT)\n+ env['ANSIBLE_CACHE_PLUGIN_TIMEOUT'] = str(settings.ANSIBLE_FACT_CACHE_TIMEOUT)\n env['ANSIBLE_CACHE_PLUGIN_CONNECTION'] = settings.CACHES['default']['LOCATION'] if 'LOCATION' in settings.CACHES['default'] else ''\n if job.project:\n env['PROJECT_REVISION'] = job.project.scm_revision" } ]

[ { "sha": "055ab4c9c11305b44d00bc34620f62851342b9d0", "filename": "awx/main/models/unified_jobs.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/61aa7c1ad7f15e0fc2413b685d56f0b24bf59568/awx%2Fmain%2Fmodels%2Funified_jobs.py", "raw_url": "https://github.com/gconsidine/awx/raw/61aa7c1ad7f15e0fc2413b685d56f0b24bf59568/awx%2Fmain%2Fmodels%2Funified_jobs.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Funified_jobs.py?ref=61aa7c1ad7f15e0fc2413b685d56f0b24bf59568", "patch": "@@ -806,7 +806,7 @@ def result_stdout_size(self):\n try:\n return os.stat(self.result_stdout_file).st_size\n except:\n- return 0\n+ return len(self.result_stdout)\n \n def _result_stdout_raw_limited(self, start_line=0, end_line=None, redact_sensitive=True, escape_ascii=False):\n return_buffer = u\"\"" } ]

[ { "sha": "577d8615a109ec2b8cf1af341966b61ffaa4222d", "filename": "awx/main/models/inventory.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/4e2f075fa6dad22dccd35e97a3b697a451527c55/awx%2Fmain%2Fmodels%2Finventory.py", "raw_url": "https://github.com/gconsidine/awx/raw/4e2f075fa6dad22dccd35e97a3b697a451527c55/awx%2Fmain%2Fmodels%2Finventory.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Finventory.py?ref=4e2f075fa6dad22dccd35e97a3b697a451527c55", "patch": "@@ -1400,7 +1400,7 @@ def clean_update_on_project_update(self):\n Q(inventory=self.inventory,\n update_on_project_update=True, source='scm') & \n ~Q(id=self.id)).exists():\n- raise ValidationError(_(\"More than one SCM-based inventory source with update on project update on per-inventory not allowed.\"))\n+ raise ValidationError(_(\"More than one SCM-based inventory source with update on project update per-inventory not allowed.\"))\n return self.update_on_project_update\n \n def clean_update_on_launch(self):" } ]

[ { "sha": "8f6f6a6f222704074fa1d20eb9adb5f22270b5ad", "filename": "awx/main/tests/functional/api/test_inventory.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/5f4d033836e4ac82f8a959ac9e33fe2e1ad3b00c/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_inventory.py", "raw_url": "https://github.com/gconsidine/awx/raw/5f4d033836e4ac82f8a959ac9e33fe2e1ad3b00c/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_inventory.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_inventory.py?ref=5f4d033836e4ac82f8a959ac9e33fe2e1ad3b00c", "patch": "@@ -405,7 +405,7 @@ def test_two_update_on_project_update_inv_src_prohibited(self, patch, scm_invent\n admin_user, expect=400)\n content = json.loads(res.content)\n assert content['update_on_project_update'] == [\"More than one SCM-based inventory source with update on project update \"\n- \"on per-inventory not allowed.\"]\n+ \"per-inventory not allowed.\"]\n \n def test_adding_inv_src_without_proj_access_prohibited(self, post, project, inventory, rando):\n inventory.admin_role.members.add(rando)" } ]

[ { "sha": "0fa57424f4edaaae075594fe02b9f635c1c8a031", "filename": "awx/main/management/commands/create_default_org.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/e23539e69b3f01288e439c683d4e9c528a5dd482/awx%2Fmain%2Fmanagement%2Fcommands%2Fcreate_default_org.py", "raw_url": "https://github.com/gconsidine/awx/raw/e23539e69b3f01288e439c683d4e9c528a5dd482/awx%2Fmain%2Fmanagement%2Fcommands%2Fcreate_default_org.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmanagement%2Fcommands%2Fcreate_default_org.py?ref=e23539e69b3f01288e439c683d4e9c528a5dd482", "patch": "@@ -23,5 +23,5 @@ def handle(self, *args, **kwargs):\n except IndexError:\n superuser = None\n with impersonate(superuser):\n- org = Organization.objects.create(name='Default')\n+ Organization.objects.create(name='Default')\n print('Default organization added.')" } ]

[ { "sha": "9b697653faffcd4a5c89593d96b76cc614fd2f8e", "filename": "setup.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/c6c80447a643f48fbdb1afbe0ff593d4368db7dd/setup.py", "raw_url": "https://github.com/gconsidine/awx/raw/c6c80447a643f48fbdb1afbe0ff593d4368db7dd/setup.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/setup.py?ref=c6c80447a643f48fbdb1afbe0ff593d4368db7dd", "patch": "@@ -129,7 +129,7 @@ def proc_data_files(data_files):\n \"tools/munin_monitors/redis_alive\",\n \"tools/munin_monitors/socketio_alive\",\n \"tools/munin_monitors/taskmanager_alive\",\n- \"tools/munin_monitors/mongo_cocnn\",\n+ \"tools/munin_monitors/mongo_conn\",\n \"tools/munin_monitors/mongo_docs\",\n \"tools/munin_monitors/mongo_mem\",\n \"tools/munin_monitors/mongo_ops\"])," } ]

[ { "sha": "78656619238b982f9496f073dea11eda8c419f4b", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/81611b44f66bbffaf4f060f78c0d517063b7035c/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/81611b44f66bbffaf4f060f78c0d517063b7035c/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=81611b44f66bbffaf4f060f78c0d517063b7035c", "patch": "@@ -568,7 +568,7 @@ class InstanceGroupUnifiedJobsList(SubListAPIView):\n model = UnifiedJob\n serializer_class = UnifiedJobSerializer\n parent_model = InstanceGroup\n- relationship = \"instance_group\"\n+ relationship = \"unifiedjob_set\"\n new_in_320 = True\n \n " } ]

[ { "sha": "01165191f0d639c5ca9435d7849f4fd09e3fb5d4", "filename": "awx/main/access.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/1ba71acf07e3b657b0f9d217b510213f74862b68/awx%2Fmain%2Faccess.py", "raw_url": "https://github.com/gconsidine/awx/raw/1ba71acf07e3b657b0f9d217b510213f74862b68/awx%2Fmain%2Faccess.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Faccess.py?ref=1ba71acf07e3b657b0f9d217b510213f74862b68", "patch": "@@ -1307,7 +1307,7 @@ def can_attach(self, obj, sub_obj, relationship, data, skip_sub_obj_read_check=F\n def can_unattach(self, obj, sub_obj, relationship, *args, **kwargs):\n if relationship == \"instance_groups\":\n return self.can_attach(obj, sub_obj, relationship, *args, **kwargs)\n- return super(InventoryAccess, self).can_attach(obj, sub_obj, relationship, *args, **kwargs)\n+ return super(JobTemplateAccess, self).can_attach(obj, sub_obj, relationship, *args, **kwargs)\n \n \n " } ]

[ { "sha": "b34607bf3e5bce7d657ffe7ec157825ce1f68331", "filename": "awx/main/scheduler/__init__.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/901c77bcfbefe23b69a3035feced5759ad5cf92b/awx%2Fmain%2Fscheduler%2F__init__.py", "raw_url": "https://github.com/gconsidine/awx/raw/901c77bcfbefe23b69a3035feced5759ad5cf92b/awx%2Fmain%2Fscheduler%2F__init__.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fscheduler%2F__init__.py?ref=901c77bcfbefe23b69a3035feced5759ad5cf92b", "patch": "@@ -239,7 +239,7 @@ def create_project_update(self, task):\n return project_task\n \n def create_inventory_update(self, task, inventory_source_task):\n- inventory_task = InventorySource.objects.get(id=inventory_source_task.id).create_inventory_update(launch_type='inventory_taskendency')\n+ inventory_task = InventorySource.objects.get(id=inventory_source_task.id).create_inventory_update(launch_type='dependency')\n \n inventory_task.created = task.created - timedelta(seconds=2)\n inventory_task.status = 'pending'" } ]

[ { "sha": "1dd42fcfd9e0621cbfcc4727a739902a3ff20cfd", "filename": "awx/sso/backends.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/309452775952a23e4e0defb33ee1d5bfd2171bb7/awx%2Fsso%2Fbackends.py", "raw_url": "https://github.com/gconsidine/awx/raw/309452775952a23e4e0defb33ee1d5bfd2171bb7/awx%2Fsso%2Fbackends.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fsso%2Fbackends.py?ref=309452775952a23e4e0defb33ee1d5bfd2171bb7", "patch": "@@ -194,7 +194,7 @@ def authenticate(self, username, password):\n timeout=django_settings.TACACSPLUS_SESSION_TIMEOUT,\n ).authenticate(\n username.encode('utf-8'), password.encode('utf-8'),\n- tacacs_plus.TAC_PLUS_AUTHEN_TYPES[django_settings.TACACSPLUS_AUTH_PROTOCOL],\n+ authen_type=tacacs_plus.TAC_PLUS_AUTHEN_TYPES[django_settings.TACACSPLUS_AUTH_PROTOCOL],\n )\n except Exception as e:\n logger.exception(\"TACACS+ Authentication Error: %s\" % (e.message,))" } ]

[ { "sha": "2acd970c158630ca8c53754081d2e6eca12c01c6", "filename": "awx/main/validators.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/9445fed340912c96c6d1035c7b3b23d0fc4578cc/awx%2Fmain%2Fvalidators.py", "raw_url": "https://github.com/gconsidine/awx/raw/9445fed340912c96c6d1035c7b3b23d0fc4578cc/awx%2Fmain%2Fvalidators.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fvalidators.py?ref=9445fed340912c96c6d1035c7b3b23d0fc4578cc", "patch": "@@ -57,7 +57,7 @@ def validate_pem(data, min_keys=0, max_keys=None, min_certs=0, max_certs=None):\n while data:\n match = pem_obj_re.match(data)\n if not match:\n- raise ValidationError(_('Invalid certificate or key: %r...') % data[:100])\n+ raise ValidationError(_('Invalid certificate or key: %s...') % data[:100])\n data = match.group(4).lstrip()\n \n # Check PEM object type, check key type if private key." } ]

[ { "sha": "1cd93182f9720f6239df0fc9470d4ec4f0f0e7d4", "filename": "awx/main/tests/functional/api/test_inventory.py", "status": "modified", "additions": 3, "deletions": 3, "changes": 6, "blob_url": "https://github.com/gconsidine/awx/blob/ad95917db6689a4ff8bd4478f51dde88fa7b67e1/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_inventory.py", "raw_url": "https://github.com/gconsidine/awx/raw/ad95917db6689a4ff8bd4478f51dde88fa7b67e1/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_inventory.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_inventory.py?ref=ad95917db6689a4ff8bd4478f51dde88fa7b67e1", "patch": "@@ -59,7 +59,7 @@ def test_async_inventory_duplicate_deletion_prevention(delete, get, inventory, a\n \n resp = delete(reverse('api:inventory_detail', kwargs={'pk': inventory.id}), alice)\n assert resp.status_code == 400\n- assert resp.data['error'] == 'Inventory is already being deleted.'\n+ assert resp.data['error'] == 'Inventory is already pending deletion.'\n \n \n @pytest.mark.parametrize('order_by', ('script', '-script', 'script,pk', '-script,pk'))\n@@ -314,12 +314,12 @@ def test_no_post_in_options(self, options, scm_inventory, admin_user):\n @pytest.mark.django_db\n class TestInsightsCredential:\n def test_insights_credential(self, patch, insights_inventory, admin_user, insights_credential):\n- patch(insights_inventory.get_absolute_url(), \n+ patch(insights_inventory.get_absolute_url(),\n {'insights_credential': insights_credential.id}, admin_user,\n expect=200)\n \n def test_non_insights_credential(self, patch, insights_inventory, admin_user, scm_credential):\n- patch(insights_inventory.get_absolute_url(), \n+ patch(insights_inventory.get_absolute_url(),\n {'insights_credential': scm_credential.id}, admin_user,\n expect=400)\n " } ]

[ { "sha": "b7b5ca80738507d87cc36c042889d0e952abb3ec", "filename": "awx/main/models/unified_jobs.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/668bce8212f5b45360a31f9cbd1928db16a35283/awx%2Fmain%2Fmodels%2Funified_jobs.py", "raw_url": "https://github.com/gconsidine/awx/raw/668bce8212f5b45360a31f9cbd1928db16a35283/awx%2Fmain%2Fmodels%2Funified_jobs.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Funified_jobs.py?ref=668bce8212f5b45360a31f9cbd1928db16a35283", "patch": "@@ -712,7 +712,7 @@ def save(self, *args, **kwargs):\n result = super(UnifiedJob, self).save(*args, **kwargs)\n \n # If status changed, update the parent instance.\n- if self.status != status_before:\n+ if self.status != status_before and self.status != 'pending':\n self._update_parent_instance()\n \n # Done." } ]

[ { "sha": "35a531fe86196def9fccfcff737a97a35fb253d3", "filename": "awx/main/tests/functional/commands/test_cleanup_facts.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/e04c4e30d8e036f68168408762fc4cd57e6c6723/awx%2Fmain%2Ftests%2Ffunctional%2Fcommands%2Ftest_cleanup_facts.py", "raw_url": "https://github.com/gconsidine/awx/raw/e04c4e30d8e036f68168408762fc4cd57e6c6723/awx%2Fmain%2Ftests%2Ffunctional%2Fcommands%2Ftest_cleanup_facts.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Fcommands%2Ftest_cleanup_facts.py?ref=e04c4e30d8e036f68168408762fc4cd57e6c6723", "patch": "@@ -108,7 +108,7 @@ def test_system_tracking_feature_disabled(mocker):\n cmd = Command()\n with pytest.raises(CommandError) as err:\n cmd.handle(None)\n- assert 'The System Tracking feature is not enabled for your Tower instance' in err.value\n+ assert 'The System Tracking feature is not enabled for your instance' in err.value\n \n \n @mock.patch('awx.main.management.commands.cleanup_facts.feature_enabled', new=mock_feature_enabled)" } ]

[ { "sha": "35543151745d33019ff8584baec0fbc59a63ec94", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/0a339ed05c968df18eaffd0d74f383ee1a20ecdd/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/0a339ed05c968df18eaffd0d74f383ee1a20ecdd/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=0a339ed05c968df18eaffd0d74f383ee1a20ecdd", "patch": "@@ -2218,7 +2218,7 @@ def create(self, request, *args, **kwargs):\n parent_group = Group.objects.get(id=self.kwargs['pk'])\n # Inject parent group inventory ID into new host data.\n request.data['inventory'] = parent_group.inventory_id\n- existing_hosts = Host.objects.filter(inventory=parent_group.inventory, name=request.data['name'])\n+ existing_hosts = Host.objects.filter(inventory=parent_group.inventory, name=request.data.get('name', ''))\n if existing_hosts.count() > 0 and ('variables' not in request.data or\n request.data['variables'] == '' or\n request.data['variables'] == '{}' or" } ]

[ { "sha": "e9a4f00c91d7f4b818ec7011ca8603dff29cb18a", "filename": "awx/main/models/unified_jobs.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/7a795b86816e816f52ae25d1cb539f88fe72d898/awx%2Fmain%2Fmodels%2Funified_jobs.py", "raw_url": "https://github.com/gconsidine/awx/raw/7a795b86816e816f52ae25d1cb539f88fe72d898/awx%2Fmain%2Fmodels%2Funified_jobs.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Funified_jobs.py?ref=7a795b86816e816f52ae25d1cb539f88fe72d898", "patch": "@@ -713,7 +713,7 @@ def save(self, *args, **kwargs):\n result = super(UnifiedJob, self).save(*args, **kwargs)\n \n # If status changed, update the parent instance.\n- if self.status != status_before:\n+ if self.status != status_before and self.status != 'pending':\n self._update_parent_instance()\n \n # Done." } ]

[ { "sha": "4536e4a307709e8b6c86f427e745df9aa52ab4b5", "filename": "awx/main/models/projects.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/c1998e378df35ccc4f233ffc25fcadb335338c3c/awx%2Fmain%2Fmodels%2Fprojects.py", "raw_url": "https://github.com/gconsidine/awx/raw/c1998e378df35ccc4f233ffc25fcadb335338c3c/awx%2Fmain%2Fmodels%2Fprojects.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Fprojects.py?ref=c1998e378df35ccc4f233ffc25fcadb335338c3c", "patch": "@@ -473,7 +473,7 @@ def websocket_emit_data(self):\n \n @property\n def task_impact(self):\n- return 20\n+ return 0 if self.job_type == 'run' else 20\n \n @property\n def result_stdout(self):" } ]

[ { "sha": "4e6c0a66ee3a8145f223642ab7a2cd6d86dba75a", "filename": "awx/main/management/commands/inventory_import.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/450baf2e8d56b213750c4ed278e6f58bf7be6975/awx%2Fmain%2Fmanagement%2Fcommands%2Finventory_import.py", "raw_url": "https://github.com/gconsidine/awx/raw/450baf2e8d56b213750c4ed278e6f58bf7be6975/awx%2Fmain%2Fmanagement%2Fcommands%2Finventory_import.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmanagement%2Fcommands%2Finventory_import.py?ref=450baf2e8d56b213750c4ed278e6f58bf7be6975", "patch": "@@ -852,7 +852,7 @@ def check_license(self):\n if license_info.get('license_key', 'UNLICENSED') == 'UNLICENSED':\n logger.error(LICENSE_NON_EXISTANT_MESSAGE)\n raise CommandError('No license found!')\n- elif license_info('license_type', 'UNLICENSED') == 'open':\n+ elif license_info.get('license_type', 'UNLICENSED') == 'open':\n return\n available_instances = license_info.get('available_instances', 0)\n free_instances = license_info.get('free_instances', 0)" } ]

[ { "sha": "3fd2edc1fa2217441363d5b1c5b4dd612fc832fd", "filename": "awx/plugins/library/scan_packages.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/5cbdadc3e8338f26fd7c061c269f0360016fa0a3/awx%2Fplugins%2Flibrary%2Fscan_packages.py", "raw_url": "https://github.com/gconsidine/awx/raw/5cbdadc3e8338f26fd7c061c269f0360016fa0a3/awx%2Fplugins%2Flibrary%2Fscan_packages.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fplugins%2Flibrary%2Fscan_packages.py?ref=5cbdadc3e8338f26fd7c061c269f0360016fa0a3", "patch": "@@ -74,7 +74,7 @@ def rpm_package_list():\n def deb_package_list():\n import apt\n apt_cache = apt.Cache()\n- installed_packages = []\n+ installed_packages = {}\n apt_installed_packages = [pk for pk in apt_cache.keys() if apt_cache[pk].is_installed]\n for package in apt_installed_packages:\n ac_pkg = apt_cache[package].installed" } ]

[ { "sha": "d290228056f0a4a80b8983c48d12a755f3427008", "filename": "awx/conf/tests/unit/test_settings.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/4cc58a221b888449f4e1ce89de2f3c7d8fe249b5/awx%2Fconf%2Ftests%2Funit%2Ftest_settings.py", "raw_url": "https://github.com/gconsidine/awx/raw/4cc58a221b888449f4e1ce89de2f3c7d8fe249b5/awx%2Fconf%2Ftests%2Funit%2Ftest_settings.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fconf%2Ftests%2Funit%2Ftest_settings.py?ref=4cc58a221b888449f4e1ce89de2f3c7d8fe249b5", "patch": "@@ -264,7 +264,7 @@ def test_setting_from_db_with_unicode(settings, mocker, encrypted):\n # this simulates a bug in python-memcached; see https://github.com/linsomniac/python-memcached/issues/79\n value = six.u('Iñtërnâtiônàlizætiøn').encode('utf-8')\n \n- setting_from_db = mocker.Mock(key='AWX_SOME_SETTING', value=value)\n+ setting_from_db = mocker.Mock(id=1, key='AWX_SOME_SETTING', value=value)\n mocks = mocker.Mock(**{\n 'order_by.return_value': mocker.Mock(**{\n '__iter__': lambda self: iter([setting_from_db])," } ]

[ { "sha": "3b9ac1b06320a5b96f08e2d841e00dbdda6aceab", "filename": "awx/sso/conf.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/50b4002280175b55388e81db116a85aadbf14b7a/awx%2Fsso%2Fconf.py", "raw_url": "https://github.com/gconsidine/awx/raw/50b4002280175b55388e81db116a85aadbf14b7a/awx%2Fsso%2Fconf.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fsso%2Fconf.py?ref=50b4002280175b55388e81db116a85aadbf14b7a", "patch": "@@ -286,7 +286,7 @@ def __call__(self):\n label=_('LDAP Group Type'),\n help_text=_('The group type may need to be changed based on the type of the '\n 'LDAP server. Values are listed at: '\n- 'http://pythonhosted.org/django-auth-ldap/groups.html#types-of-groups'),\n+ 'https://django-auth-ldap.readthedocs.io/en/stable/groups.html#types-of-groups'),\n category=_('LDAP'),\n category_slug='ldap',\n feature_required='ldap'," } ]

[ { "sha": "265531443ff066f62ee44f9292c7bff4aa148cf9", "filename": "awx/main/expect/isolated_manager.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/2818bb5833cefb4c6f33e1b809f748d3012dc1c9/awx%2Fmain%2Fexpect%2Fisolated_manager.py", "raw_url": "https://github.com/gconsidine/awx/raw/2818bb5833cefb4c6f33e1b809f748d3012dc1c9/awx%2Fmain%2Fexpect%2Fisolated_manager.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fexpect%2Fisolated_manager.py?ref=2818bb5833cefb4c6f33e1b809f748d3012dc1c9", "patch": "@@ -430,7 +430,7 @@ def health_check(cls, instance_qs, awx_application_version):\n except (KeyError, IndexError):\n task_result = {}\n if 'capacity' in task_result:\n- cls.update_capacity(instance, awx_application_version)\n+ cls.update_capacity(instance, task_result, awx_application_version)\n elif instance.capacity == 0:\n logger.debug('Isolated instance {} previously marked as lost, could not re-join.'.format(\n instance.hostname))" } ]

[ { "sha": "5ed0385018ddcbb2741becead411dbcd0c86793b", "filename": "awx/sso/backends.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/f2f42c2c8a840d19c6e1c92d59af57c88fc78065/awx%2Fsso%2Fbackends.py", "raw_url": "https://github.com/gconsidine/awx/raw/f2f42c2c8a840d19c6e1c92d59af57c88fc78065/awx%2Fsso%2Fbackends.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fsso%2Fbackends.py?ref=f2f42c2c8a840d19c6e1c92d59af57c88fc78065", "patch": "@@ -307,7 +307,7 @@ def _update_m2m_from_groups(user, ldap_user, rel, opts, remove=True):\n should_add = True\n if should_add:\n rel.add(user)\n- elif remove:\n+ elif remove and user in rel.all():\n rel.remove(user)\n \n " } ]

[ { "sha": "dd1086a4267d7d0941f53b1e974fbac576687c9c", "filename": "awx/sso/validators.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/7a21a4578129ddc3797cf387d73a5f3551036269/awx%2Fsso%2Fvalidators.py", "raw_url": "https://github.com/gconsidine/awx/raw/7a21a4578129ddc3797cf387d73a5f3551036269/awx%2Fsso%2Fvalidators.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fsso%2Fvalidators.py?ref=7a21a4578129ddc3797cf387d73a5f3551036269", "patch": "@@ -22,7 +22,7 @@ def validate_ldap_dn(value, with_user=False):\n else:\n dn_value = value\n try:\n- ldap.dn.str2dn(dn_value)\n+ ldap.dn.str2dn(dn_value.encode('utf-8'))\n except ldap.DECODING_ERROR:\n raise ValidationError(_('Invalid DN: %s') % value)\n " } ]

[ { "sha": "da3bddc5e42f9422b63adfe6cc084b41aa2fc648", "filename": "awx/main/tests/unit/test_task_manager.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/798d27c2cbbb3a37ecc2438c785ee6f2891cd3e1/awx%2Fmain%2Ftests%2Funit%2Ftest_task_manager.py", "raw_url": "https://github.com/gconsidine/awx/raw/798d27c2cbbb3a37ecc2438c785ee6f2891cd3e1/awx%2Fmain%2Ftests%2Funit%2Ftest_task_manager.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Funit%2Ftest_task_manager.py?ref=798d27c2cbbb3a37ecc2438c785ee6f2891cd3e1", "patch": "@@ -52,7 +52,7 @@ def test_save_failed(self, logger_mock, get_running_tasks, *args):\n logger_mock.error.assert_called_once_with(\"Task job 2 (failed) DB error in marking failed. Job possibly deleted.\")\n \n @mock.patch.object(InstanceGroup.objects, 'prefetch_related', return_value=[])\n- @mock.patch('awx.main.scheduler.task_manager.inspect')\n+ @mock.patch('awx.main.scheduler.task_manager.Inspect')\n def test_multiple_active_instances_sanity_check(self, inspect_mock, *args):\n class MockInspector:\n pass" } ]

[ { "sha": "5fdf1ae78973f8e9e245a92fbae2304eb206a914", "filename": "awx/main/access.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/a880f47925d57b4ff319893efd66447a20937626/awx%2Fmain%2Faccess.py", "raw_url": "https://github.com/gconsidine/awx/raw/a880f47925d57b4ff319893efd66447a20937626/awx%2Fmain%2Faccess.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Faccess.py?ref=a880f47925d57b4ff319893efd66447a20937626", "patch": "@@ -883,7 +883,7 @@ class InventoryUpdateAccess(BaseAccess):\n prefetch_related = ('unified_job_template', 'instance_group',)\n \n def filtered_queryset(self):\n- return qs.filter(inventory_source__inventory__in=Inventory.accessible_pk_qs(self.user, 'read_role'))\n+ return self.model.objects.filter(inventory_source__inventory__in=Inventory.accessible_pk_qs(self.user, 'read_role'))\n \n def can_cancel(self, obj):\n if not obj.can_cancel:" } ]

[ { "sha": "732bcca9f78e6534b496504eb71fc4e2a9f08aaa", "filename": "tools/sosreport/tower.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/febfcf709dc2c3248a9ae86ddcb749745448ab6a/tools%2Fsosreport%2Ftower.py", "raw_url": "https://github.com/gconsidine/awx/raw/febfcf709dc2c3248a9ae86ddcb749745448ab6a/tools%2Fsosreport%2Ftower.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/tools%2Fsosreport%2Ftower.py?ref=febfcf709dc2c3248a9ae86ddcb749745448ab6a", "patch": "@@ -8,7 +8,7 @@\n \"ansible --version\", # ansible core version\n \"awx-manage --version\", # tower version\n \"supervisorctl status\", # tower process status\n- \"/var/lib/awx/venv/tower/bin/pip freeze\", # pip package list\n+ \"/var/lib/awx/venv/awx/bin/pip freeze\", # pip package list\n \"/var/lib/awx/venv/ansible/bin/pip freeze\", # pip package list\n \"tree -d /var/lib/awx\", # show me the dirs\n \"ls -ll /var/lib/awx\", # check permissions" } ]

[ { "sha": "c553b08853deaf474d005988b1d5e47bd858a1b8", "filename": "awx/lib/tower_display_callback/module.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/2621f48189519fe94edefac60ef9bceaf6892ad6/awx%2Flib%2Ftower_display_callback%2Fmodule.py", "raw_url": "https://github.com/gconsidine/awx/raw/2621f48189519fe94edefac60ef9bceaf6892ad6/awx%2Flib%2Ftower_display_callback%2Fmodule.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Flib%2Ftower_display_callback%2Fmodule.py?ref=2621f48189519fe94edefac60ef9bceaf6892ad6", "patch": "@@ -182,7 +182,7 @@ def v2_playbook_on_vars_prompt(self, varname, private=True, prompt=None,\n \n def v2_playbook_on_include(self, included_file):\n event_data = dict(\n- included_file=included_file,\n+ included_file=included_file._filename if included_file is not None else None,\n )\n with self.capture_event_data('playbook_on_include', **event_data):\n super(BaseCallbackModule, self).v2_playbook_on_include(included_file)" } ]

[ { "sha": "8b1c0786a1f13c8a0e95452da826f73a550cc420", "filename": "awx/conf/settings.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/5943193b78dff5f61268f2f2f1bbc69adf898a49/awx%2Fconf%2Fsettings.py", "raw_url": "https://github.com/gconsidine/awx/raw/5943193b78dff5f61268f2f2f1bbc69adf898a49/awx%2Fconf%2Fsettings.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fconf%2Fsettings.py?ref=5943193b78dff5f61268f2f2f1bbc69adf898a49", "patch": "@@ -203,7 +203,7 @@ def _preload_cache(self):\n except AttributeError:\n file_default = None\n if file_default != init_default and file_default is not None:\n- logger.warning('Setting %s has been marked read-only!', key)\n+ logger.debug('Setting %s has been marked read-only!', key)\n self.registry._registry[key]['read_only'] = True\n self.registry._registry[key]['defined_in_file'] = True\n self.__dict__['_awx_conf_init_readonly'] = True" } ]

[ { "sha": "13d80ae937b24577156b9610da5dceba11b46e8b", "filename": "awx/conf/fields.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/8d643dc4596eb81c5d6b4b78d05468d8ae71884f/awx%2Fconf%2Ffields.py", "raw_url": "https://github.com/gconsidine/awx/raw/8d643dc4596eb81c5d6b4b78d05468d8ae71884f/awx%2Fconf%2Ffields.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fconf%2Ffields.py?ref=8d643dc4596eb81c5d6b4b78d05468d8ae71884f", "patch": "@@ -52,7 +52,7 @@ def run_validators(self, value):\n if url_parts.hostname and '.' not in url_parts.hostname:\n netloc = '{}.local'.format(url_parts.hostname)\n if url_parts.port:\n- netloc = '{}:{}'.format(netloc, port)\n+ netloc = '{}:{}'.format(netloc, url_parts.port)\n if url_parts.username:\n if url_parts.password:\n netloc = '{}:{}@{}' % (url_parts.username, url_parts.password, netloc)" } ]

[ { "sha": "97a90428cefdaae91e8195a8601fda799defbd52", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/cae8950723dbcde382fb5be300fc9c0d71c99cf1/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/cae8950723dbcde382fb5be300fc9c0d71c99cf1/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=cae8950723dbcde382fb5be300fc9c0d71c99cf1", "patch": "@@ -518,7 +518,7 @@ class AuthView(APIView):\n def get(self, request):\n data = OrderedDict()\n err_backend, err_message = request.session.get('social_auth_error', (None, None))\n- auth_backends = load_backends(settings.AUTHENTICATION_BACKENDS).items()\n+ auth_backends = load_backends(settings.AUTHENTICATION_BACKENDS, force_load=True).items()\n # Return auth backends in consistent order: Google, GitHub, SAML.\n auth_backends.sort(key=lambda x: 'g' if x[0] == 'google-oauth2' else x[0])\n for name, backend in auth_backends:" } ]

[ { "sha": "33cff82049954e0ed0316a459dd548677f8c3032", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/e36cd17c161c21c744bd4654f605e2b47cd702a5/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/e36cd17c161c21c744bd4654f605e2b47cd702a5/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=e36cd17c161c21c744bd4654f605e2b47cd702a5", "patch": "@@ -2487,7 +2487,7 @@ def post(self, request, *args, **kwargs):\n return Response(dict(error=_(\"'required' missing from survey question %s.\") % str(idx)), status=status.HTTP_400_BAD_REQUEST)\n \n if survey_item[\"type\"] == \"password\":\n- if \"default\" in survey_item and survey_item[\"default\"].startswith('$encrypted$'):\n+ if survey_item.get(\"default\") and survey_item[\"default\"].startswith('$encrypted$'):\n old_spec = obj.survey_spec\n for old_item in old_spec['spec']:\n if old_item['variable'] == survey_item['variable']:" } ]

[ { "sha": "a48ca3ad2373f711490ffcf527b10e54c8a6a1ea", "filename": "awx/main/scheduler/__init__.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/08825a1f4998a38473ba8b6775bdd9f8dcdd7d99/awx%2Fmain%2Fscheduler%2F__init__.py", "raw_url": "https://github.com/gconsidine/awx/raw/08825a1f4998a38473ba8b6775bdd9f8dcdd7d99/awx%2Fmain%2Fscheduler%2F__init__.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fscheduler%2F__init__.py?ref=08825a1f4998a38473ba8b6775bdd9f8dcdd7d99", "patch": "@@ -373,7 +373,7 @@ def process_celery_tasks(self, active_tasks, all_running_sorted_tasks):\n # list of task id's from celery and now.\n # Note: This is an actual fix, not a reduction in the time \n # window that this can happen.\n- if task_obj.status is not 'running':\n+ if task_obj.status != 'running':\n continue\n task_obj.status = 'failed'\n task_obj.job_explanation += ' '.join((" } ]

[ { "sha": "ce4c9bc5bd538edff81246166caab9047651c0ea", "filename": "awx/main/tasks.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/1a946d51c13131103561c97c076f628589cdae69/awx%2Fmain%2Ftasks.py", "raw_url": "https://github.com/gconsidine/awx/raw/1a946d51c13131103561c97c076f628589cdae69/awx%2Fmain%2Ftasks.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftasks.py?ref=1a946d51c13131103561c97c076f628589cdae69", "patch": "@@ -1218,7 +1218,7 @@ def build_args(self, project_update, **kwargs):\n 'scm_url': scm_url,\n 'scm_branch': scm_branch,\n 'scm_clean': project_update.scm_clean,\n- 'scm_delete_on_update': project_update.scm_delete_on_update,\n+ 'scm_delete_on_update': project_update.scm_delete_on_update if project_update.job_type == 'sync' else False,\n 'scm_full_checkout': True if project_update.job_type == 'run' else False,\n 'scm_revision_output': self.revision_path\n })" } ]

[ { "sha": "584e6ce0bbd20783d9dd8d5c7ca6c0788f91ab52", "filename": "awx/main/tasks.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/98daaece73f27d064631a39b3768ee2925299ef1/awx%2Fmain%2Ftasks.py", "raw_url": "https://github.com/gconsidine/awx/raw/98daaece73f27d064631a39b3768ee2925299ef1/awx%2Fmain%2Ftasks.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftasks.py?ref=98daaece73f27d064631a39b3768ee2925299ef1", "patch": "@@ -1218,7 +1218,7 @@ def build_args(self, project_update, **kwargs):\n 'scm_url': scm_url,\n 'scm_branch': scm_branch,\n 'scm_clean': project_update.scm_clean,\n- 'scm_delete_on_update': project_update.scm_delete_on_update if project_update.job_type == 'sync' else False,\n+ 'scm_delete_on_update': project_update.scm_delete_on_update if project_update.job_type == 'check' else False,\n 'scm_full_checkout': True if project_update.job_type == 'run' else False,\n 'scm_revision_output': self.revision_path\n })" } ]

[ { "sha": "098b84f639988d8f87a2b14f883d90a16b89e7aa", "filename": "awx/main/conf.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/54bcdccdab8a0a85ec54bc205008508967b3c882/awx%2Fmain%2Fconf.py", "raw_url": "https://github.com/gconsidine/awx/raw/54bcdccdab8a0a85ec54bc205008508967b3c882/awx%2Fmain%2Fconf.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fconf.py?ref=54bcdccdab8a0a85ec54bc205008508967b3c882", "patch": "@@ -322,5 +322,5 @@ def _load_default_license_from_file():\n help_text=_('Useful to uniquely identify Tower instances.'),\n category=_('Logging'),\n category_slug='logging',\n- default=None,\n+ default='',\n )" } ]

[ { "sha": "bf60e5b77cd30b51dd0f9df9d75f5d57e3b3735b", "filename": "awx/main/models/projects.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/50ccd1b003c05081bb80a269ffe98b512c911f1a/awx%2Fmain%2Fmodels%2Fprojects.py", "raw_url": "https://github.com/gconsidine/awx/raw/50ccd1b003c05081bb80a269ffe98b512c911f1a/awx%2Fmain%2Fmodels%2Fprojects.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Fprojects.py?ref=50ccd1b003c05081bb80a269ffe98b512c911f1a", "patch": "@@ -142,7 +142,7 @@ def clean_credential(self):\n cred = self.credential\n if cred:\n if cred.kind != 'scm':\n- raise ValidationError(_(\"Credential kind must be either 'scm'.\"))\n+ raise ValidationError(_(\"Credential kind must be 'scm'.\"))\n try:\n if self.scm_type == 'insights':\n self.scm_url = settings.INSIGHTS_URL_BASE" } ]

[ { "sha": "7432dbbdcdbd19687d4774cf6fdd01208d31c718", "filename": "awx/main/tests/functional/core/test_licenses.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/47a894a3396f6ce66e4e741a8035e9273dff244f/awx%2Fmain%2Ftests%2Ffunctional%2Fcore%2Ftest_licenses.py", "raw_url": "https://github.com/gconsidine/awx/raw/47a894a3396f6ce66e4e741a8035e9273dff244f/awx%2Fmain%2Ftests%2Ffunctional%2Fcore%2Ftest_licenses.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Fcore%2Ftest_licenses.py?ref=47a894a3396f6ce66e4e741a8035e9273dff244f", "patch": "@@ -100,7 +100,7 @@ def test_cloudforms_license(mocker):\n task_enhancer = TaskEnhancer()\n vdata = task_enhancer.validate_enhancements()\n assert vdata['compliant'] is True\n- assert vdata['subscription_name'] == \"Cloudforms License\"\n+ assert vdata['subscription_name'] == \"Red Hat CloudForms License\"\n assert vdata['available_instances'] == 9999999\n assert vdata['license_type'] == 'enterprise'\n assert vdata['features']['ha'] is True" } ]

[ { "sha": "e8b11a337388ab8eb28ebbdb50f0acfa6987d369", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/34b697ce17a988c469d3850e4f05e4be13897e51/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/34b697ce17a988c469d3850e4f05e4be13897e51/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=34b697ce17a988c469d3850e4f05e4be13897e51", "patch": "@@ -1120,7 +1120,7 @@ class ProjectSchedulesList(SubListCreateAPIView):\n class ProjectScmInventorySources(SubListCreateAPIView):\n \n view_name = _(\"Project SCM Inventory Sources\")\n- model = Inventory\n+ model = InventorySource\n serializer_class = InventorySourceSerializer\n parent_model = Project\n relationship = 'scm_inventory_sources'" } ]

[ { "sha": "a046f02b377bec8f7d331626518f841adf767708", "filename": "awx/main/utils/formatters.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/95b09795a8d6998b7cfe157110a97bea50161e01/awx%2Fmain%2Futils%2Fformatters.py", "raw_url": "https://github.com/gconsidine/awx/raw/95b09795a8d6998b7cfe157110a97bea50161e01/awx%2Fmain%2Futils%2Fformatters.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Futils%2Fformatters.py?ref=95b09795a8d6998b7cfe157110a97bea50161e01", "patch": "@@ -25,7 +25,7 @@ def __init__(self, **kwargs):\n self.host_id = settings_module.CLUSTER_HOST_ID\n if hasattr(settings_module, 'LOG_AGGREGATOR_TOWER_UUID'):\n self.tower_uuid = settings_module.LOG_AGGREGATOR_TOWER_UUID\n- self.message_type = settings_module.LOG_AGGREGATOR_TYPE\n+ self.message_type = getattr(settings_module, 'LOG_AGGREGATOR_TYPE', 'other')\n return ret\n \n def reformat_data_for_log(self, raw_data, kind=None):" } ]

[ { "sha": "041d67ee90a2cd9e9cb6e896fd65135a4e498a29", "filename": "core/main.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/ihatevim/aetherbot/blob/36e94de95f8d72b806450a726c6187a81005b3dc/core%2Fmain.py", "raw_url": "https://github.com/ihatevim/aetherbot/raw/36e94de95f8d72b806450a726c6187a81005b3dc/core%2Fmain.py", "contents_url": "https://api.github.com/repos/ihatevim/aetherbot/contents/core%2Fmain.py?ref=36e94de95f8d72b806450a726c6187a81005b3dc", "patch": "@@ -157,7 +157,7 @@ def main(conn, out):\n prefix = r'^(?:[' + commandprefix + ']|'\n \n command_re = prefix + inp.conn.nick\n- command_re += r'[:]+\\s+)(\\w+)(?:$|\\s+)(.*)'\n+ command_re += r'[,;:]+\\s+)(\\w+)(?:$|\\s+)(.*)'\n \n m = re.match(command_re, inp.lastparam)\n " } ]

[ { "sha": "96f2302e0d3db258bb29c40ab3af53fbf9f85c23", "filename": "core/config.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/ihatevim/aetherbot/blob/d453dfefb79363dd3ca2bbdad904fcbca86305a1/core%2Fconfig.py", "raw_url": "https://github.com/ihatevim/aetherbot/raw/d453dfefb79363dd3ca2bbdad904fcbca86305a1/core%2Fconfig.py", "contents_url": "https://api.github.com/repos/ihatevim/aetherbot/contents/core%2Fconfig.py?ref=d453dfefb79363dd3ca2bbdad904fcbca86305a1", "patch": "@@ -43,7 +43,7 @@ def save(conf):\n },\n \"wrapper\":\n {\n- \"backend\": \"screen\"\n+ \"backend\": \"daemon\"\n },\n \"censored_strings\":\n [" } ]

[ { "sha": "e1d5328b995ea70b65d5b01402f2fe940f0fe4dc", "filename": "plugins/urlparse.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/ihatevim/aetherbot/blob/0f2206f68f044d90bb820f9b1f1ec610fea5df31/plugins%2Furlparse.py", "raw_url": "https://github.com/ihatevim/aetherbot/raw/0f2206f68f044d90bb820f9b1f1ec610fea5df31/plugins%2Furlparse.py", "contents_url": "https://api.github.com/repos/ihatevim/aetherbot/contents/plugins%2Furlparse.py?ref=0f2206f68f044d90bb820f9b1f1ec610fea5df31", "patch": "@@ -18,7 +18,7 @@ def parse(match):\n except:\n return \"fail\"\n \n-@hook.regex(r'([a-zA-Z]://|www\\.)?[^ ]+(\\.[a-z]+)+')\n+@hook.regex(r'(^[^\\.])([a-zA-Z]://|www\\.)?[^ ]+(\\.[a-z]+)\\/(.*)')\n def urlparser(match, say=None):\n url = urlnorm.normalize(match.group().encode('utf-8'))\n if url[:7] != \"http://\":" } ]

[ { "sha": "d894d51cf4f7dc18b9b38131b539814470699d5e", "filename": "plugins/admin.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/ihatevim/aetherbot/blob/75c17d5723ba0267e17ceaf3860a03c9c04bb744/plugins%2Fadmin.py", "raw_url": "https://github.com/ihatevim/aetherbot/raw/75c17d5723ba0267e17ceaf3860a03c9c04bb744/plugins%2Fadmin.py", "contents_url": "https://api.github.com/repos/ihatevim/aetherbot/contents/plugins%2Fadmin.py?ref=75c17d5723ba0267e17ceaf3860a03c9c04bb744", "patch": "@@ -14,7 +14,7 @@ def admins(inp, bot=None):\n return \", \".join(admins)\n \n \n-@hook.command(autohelp=False, adminOnly=True)\n+@hook.command(autohelp=False, adminonly=True)\n def stop(inp, input=None, db=None, notice=None):\n \".stop [reason] -- Kills the bot with [reason] as its quit message.\"\n if inp:" } ]

[ { "sha": "68d1d895f49df00ad55663d45b2af1f3789ed880", "filename": "plugins/fmylife.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/ihatevim/aetherbot/blob/d65f1557405c26c0d8fcb25e1c29eb80b962e10c/plugins%2Ffmylife.py", "raw_url": "https://github.com/ihatevim/aetherbot/raw/d65f1557405c26c0d8fcb25e1c29eb80b962e10c/plugins%2Ffmylife.py", "contents_url": "https://api.github.com/repos/ihatevim/aetherbot/contents/plugins%2Ffmylife.py?ref=d65f1557405c26c0d8fcb25e1c29eb80b962e10c", "patch": "@@ -18,7 +18,7 @@ def refresh_cache():\n \n for e in soup.findAll('div', {'class': 'post article'}):\n id = int(e['id'])\n- text = e.find('p', text=True)\n+ text = ''.join(e.find('p').findAll(text=True))\n fml_cache[id] = text\n \n # do an initial refresh of the cache" } ]

[ { "sha": "395328855dcd7538265ad94c14e0d6fa5fc9a748", "filename": "plugins/misc.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/ihatevim/aetherbot/blob/d717292c135c9919ea4abf0b6ee227a5a293e93a/plugins%2Fmisc.py", "raw_url": "https://github.com/ihatevim/aetherbot/raw/d717292c135c9919ea4abf0b6ee227a5a293e93a/plugins%2Fmisc.py", "contents_url": "https://api.github.com/repos/ihatevim/aetherbot/contents/plugins%2Fmisc.py?ref=d717292c135c9919ea4abf0b6ee227a5a293e93a", "patch": "@@ -65,7 +65,7 @@ def onjoin(paraml, conn=None, bot=None):\n # system info command\n @hook.command(autohelp=False)\n def system(inp):\n- \".system -- retrieves information about the host system\"\n+ \".system -- Retrieves information about the host system.\"\n python_version = platform.python_version()\n os = platform.platform(aliased=True)\n cpu = platform.machine()" } ]

[ { "sha": "dcd6c4e6df3db5e8840359e49ae40d019da14c49", "filename": "plugins/admin.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/ihatevim/aetherbot/blob/0e6840b0a8a52e185618daa4f2cf1619c928076a/plugins%2Fadmin.py", "raw_url": "https://github.com/ihatevim/aetherbot/raw/0e6840b0a8a52e185618daa4f2cf1619c928076a/plugins%2Fadmin.py", "contents_url": "https://api.github.com/repos/ihatevim/aetherbot/contents/plugins%2Fadmin.py?ref=0e6840b0a8a52e185618daa4f2cf1619c928076a", "patch": "@@ -155,7 +155,7 @@ def me(inp, conn=None, chan=None, notice=None):\n for x in split[0:]:\n message = message + x + \" \"\n message = message[:-1]\n- out = \"PRIVMSG %s :\\x01ACTION %s\\x01\" % (input.chan, message)\n+ out = \"PRIVMSG %s :\\x01ACTION %s\\x01\" % (chan, message)\n conn.send(out)\n \n " } ]

[ { "sha": "f49ced9761da2818fddcd4571655c6636245aa4a", "filename": "wechat_jump_auto.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/Suhesong/wechat_jump_game/blob/a5cb10aa192e9092721b93f4320ff555f9af55ed/wechat_jump_auto.py", "raw_url": "https://github.com/Suhesong/wechat_jump_game/raw/a5cb10aa192e9092721b93f4320ff555f9af55ed/wechat_jump_auto.py", "contents_url": "https://api.github.com/repos/Suhesong/wechat_jump_game/contents/wechat_jump_auto.py?ref=a5cb10aa192e9092721b93f4320ff555f9af55ed", "patch": "@@ -199,7 +199,7 @@ def find_piece_and_board(im):\n board_x_sum = 0\n board_x_c = 0\n \n- for j in range(board_x_start, board_x_end):\n+ for j in range(int(board_x_start), int(board_x_end)):\n pixel = im_pixel[j,i]\n # 修掉脑袋比下一个小格子还高的情况的 bug\n if abs(j - piece_x) < piece_body_width:" } ]

[ { "sha": "19bedbf81019b66461cbf7f47ce8e29b8f94491f", "filename": "src/receding_controller.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/MattDerry/receding_planar_sys/blob/c65c1ed91aaddedd8c9f4dae6ba1dd9e20e480bd/src%2Freceding_controller.py", "raw_url": "https://github.com/MattDerry/receding_planar_sys/raw/c65c1ed91aaddedd8c9f4dae6ba1dd9e20e480bd/src%2Freceding_controller.py", "contents_url": "https://api.github.com/repos/MattDerry/receding_planar_sys/contents/src%2Freceding_controller.py?ref=c65c1ed91aaddedd8c9f4dae6ba1dd9e20e480bd", "patch": "@@ -297,7 +297,7 @@ def meascb(self, data):\n rospy.logwarn(\"Received an error from optimizer!\")\n # publish optimization summary:\n od = OptimizationData(**optdat)\n- od.index = self.call_count\n+ od.index = self.callback_count\n od.time = ttmp[0]\n self.opt_pub.publish(od)\n # store data:" } ]

[ { "sha": "73d145be985c5e691c480430fa3503c85c0ef8bc", "filename": "src/python/wgne/scripts/wgne_metrics_driver.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/wk1984/pcmdi_metrics/blob/5ecc90285954e0f8befd77d366e0cb43746ee23f/src%2Fpython%2Fwgne%2Fscripts%2Fwgne_metrics_driver.py", "raw_url": "https://github.com/wk1984/pcmdi_metrics/raw/5ecc90285954e0f8befd77d366e0cb43746ee23f/src%2Fpython%2Fwgne%2Fscripts%2Fwgne_metrics_driver.py", "contents_url": "https://api.github.com/repos/wk1984/pcmdi_metrics/contents/src%2Fpython%2Fwgne%2Fscripts%2Fwgne_metrics_driver.py?ref=5ecc90285954e0f8befd77d366e0cb43746ee23f", "patch": "@@ -18,7 +18,7 @@\n regions_values = {\"land\":100.,\"ocean\":0.,\"lnd\":100.,\"ocn\":0.}\n \n #Load the obs dictionary\n-obs_dic = json.loads(open(os.path.join(sys.prefix,\"share\",\"wgne\",\"obs_info_dictionary.json\")).read())\n+obs_dic = json.loads(open(os.path.join(metrics.__path__[0],\"..\",\"..\",\"..\",\"..\",\"share\",\"wgne\",\"obs_info_dictionary.json\")).read())\n \n class DUP(object):\n def __init__(self,outfile):" } ]

[ { "sha": "ddc4fe0716554c1864f94794d0fc8fbc35122795", "filename": "awx/main/access.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/f6ebf80ebaaf5d6f04e9469093155297f085a286/awx%2Fmain%2Faccess.py", "raw_url": "https://github.com/gconsidine/awx/raw/f6ebf80ebaaf5d6f04e9469093155297f085a286/awx%2Fmain%2Faccess.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Faccess.py?ref=f6ebf80ebaaf5d6f04e9469093155297f085a286", "patch": "@@ -439,7 +439,7 @@ class GroupAccess(BaseAccess):\n model = Group\n \n def get_queryset(self):\n- qs = self.model.accessible_objects(self.user, 'read_role')\n+ qs = Group.objects.filter(inventory__in=Inventory.accessible_objects(self.user, 'read_role'))\n qs = qs.select_related('created_by', 'modified_by', 'inventory')\n return qs.prefetch_related('parents', 'children', 'inventory_source').all()\n " } ]

[ { "sha": "f171146c09248607ee6cca9d9683a2b0dd6f406c", "filename": "awx/main/signals.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/3697ddc2d0ba6d1c6a0997ac6e71c18035267c1b/awx%2Fmain%2Fsignals.py", "raw_url": "https://github.com/gconsidine/awx/raw/3697ddc2d0ba6d1c6a0997ac6e71c18035267c1b/awx%2Fmain%2Fsignals.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fsignals.py?ref=3697ddc2d0ba6d1c6a0997ac6e71c18035267c1b", "patch": "@@ -167,7 +167,7 @@ def rbac_activity_stream(instance, sender, **kwargs):\n elif sender.__name__ == 'Role_parents':\n role = kwargs['model'].objects.filter(pk__in=kwargs['pk_set']).first()\n # don't record implicit creation / parents\n- if role.content_type is not None:\n+ if role is not None and role.content_type is not None:\n parent = role.content_type.name + \".\" + role.role_field\n # Get the list of implicit parents that were defined at the class level.\n # We have to take this list from the class property to avoid including parents" } ]

[ { "sha": "e5494edbeae1238056ebdc67fcbeaa669167a8b1", "filename": "awx/main/tests/functional/test_notifications.py", "status": "modified", "additions": 2, "deletions": 2, "changes": 4, "blob_url": "https://github.com/gconsidine/awx/blob/80b044580d4344bdcaf6cccf7d4a8e4f3fa43214/awx%2Fmain%2Ftests%2Ffunctional%2Ftest_notifications.py", "raw_url": "https://github.com/gconsidine/awx/raw/80b044580d4344bdcaf6cccf7d4a8e4f3fa43214/awx%2Fmain%2Ftests%2Ffunctional%2Ftest_notifications.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Ftest_notifications.py?ref=80b044580d4344bdcaf6cccf7d4a8e4f3fa43214", "patch": "@@ -117,8 +117,8 @@ def test_notification_template_invalid_notification_type(patch, notification_tem\n def test_disallow_delete_when_notifications_pending(delete, user, notification_template):\n u = user('superuser', True)\n url = reverse('api:notification_template_detail', args=(notification_template.id,))\n- n = Notification.objects.create(notification_template=notification_template,\n- status='pending')\n+ Notification.objects.create(notification_template=notification_template,\n+ status='pending')\n response = delete(url, user=u)\n assert response.status_code == 405\n " } ]

[ { "sha": "59f7adb745d7031170ac34bc7f225658f8f4584f", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/8ad505c9cc498e6878a68376346684aa10d1669d/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/8ad505c9cc498e6878a68376346684aa10d1669d/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=8ad505c9cc498e6878a68376346684aa10d1669d", "patch": "@@ -3462,7 +3462,7 @@ def delete(self, request, *args, **kwargs):\n if obj.notifications.filter(status='pending').exists():\n return Response({\"error\": \"Delete not allowed while there are pending notifications\"},\n status=status.HTTP_405_METHOD_NOT_ALLOWED)\n- return resp\n+ return super(NotificationTemplateDetail, self).delete(request, *args, **kwargs)\n \n class NotificationTemplateTest(GenericAPIView):\n " } ]

[ { "sha": "633c60c1750649c59347a16c90b3e1b013fcde42", "filename": "awx/main/models/rbac.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/e818daa74f4ca9004176024c7ac042a570a7f10f/awx%2Fmain%2Fmodels%2Frbac.py", "raw_url": "https://github.com/gconsidine/awx/raw/e818daa74f4ca9004176024c7ac042a570a7f10f/awx%2Fmain%2Fmodels%2Frbac.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmodels%2Frbac.py?ref=e818daa74f4ca9004176024c7ac042a570a7f10f", "patch": "@@ -75,7 +75,7 @@ def wrapper(*args, **kwargs):\n if user in sys_admin or user in sys_audit:\n if len(args) == 2:\n return args[1]\n- return user.roles.all()\n+ return Roles.objects.all()\n return func(*args, **kwargs)\n return wrapper\n " } ]

[ { "sha": "076f368631f9aea8b80b68e322c609befa98159b", "filename": "awx/main/tests/functional/conftest.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/5df846eb0a60d38471bf354f86a47670ec4b87ff/awx%2Fmain%2Ftests%2Ffunctional%2Fconftest.py", "raw_url": "https://github.com/gconsidine/awx/raw/5df846eb0a60d38471bf354f86a47670ec4b87ff/awx%2Fmain%2Ftests%2Ffunctional%2Fconftest.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Fconftest.py?ref=5df846eb0a60d38471bf354f86a47670ec4b87ff", "patch": "@@ -158,7 +158,7 @@ def machine_credential():\n return Credential.objects.create(name='machine-cred', kind='ssh', username='test_user', password='pas4word')\n \n @pytest.fixture\n-def org_credential(organization, credential):\n+def org_credential(organization):\n return Credential.objects.create(kind='aws', name='test-cred', organization=organization)\n \n @pytest.fixture" } ]

[ { "sha": "c122351a3275032c75c58a2b7a8aaf0f88d66d75", "filename": "awx/api/serializers.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/f75eba471ed30d35d09fc680f7bd5b2853c424df/awx%2Fapi%2Fserializers.py", "raw_url": "https://github.com/gconsidine/awx/raw/f75eba471ed30d35d09fc680f7bd5b2853c424df/awx%2Fapi%2Fserializers.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fserializers.py?ref=f75eba471ed30d35d09fc680f7bd5b2853c424df", "patch": "@@ -2429,7 +2429,7 @@ def validate(self, attrs):\n notification_type = self.instance.notification_type\n if not notification_type:\n raise serializers.ValidationError('Missing required fields for Notification Configuration: notification_type')\n- if not 'organization' in attrs:\n+ if 'organization' not in attrs:\n raise serializers.ValidationError(\"Missing 'organization' from required fields\")\n \n notification_class = NotificationTemplate.CLASS_FOR_NOTIFICATION_TYPE[notification_type]" } ]

[ { "sha": "a9a2e805496d66f606f14342ba8a0a6736ddda88", "filename": "awx/api/views.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/25c177cdcd71d78b3decd81577ce11430c48bff9/awx%2Fapi%2Fviews.py", "raw_url": "https://github.com/gconsidine/awx/raw/25c177cdcd71d78b3decd81577ce11430c48bff9/awx%2Fapi%2Fviews.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fapi%2Fviews.py?ref=25c177cdcd71d78b3decd81577ce11430c48bff9", "patch": "@@ -1040,7 +1040,7 @@ def get_queryset(self):\n return qs\n elif parent.credential is None:\n return qs.filter(project=parent)\n- return qs.filter(Q(project=parent) | Q(credential__in=parent.credential))\n+ return qs.filter(Q(project=parent) | Q(credential=parent.credential))\n \n class ProjectNotificationTemplatesAnyList(SubListCreateAttachDetachAPIView):\n " } ]

[ { "sha": "f4d442fbeb629662c77dc17a004ad799f44005f0", "filename": "awx/main/tasks.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/43c5105a577dc0de221f53183c818785a24b3686/awx%2Fmain%2Ftasks.py", "raw_url": "https://github.com/gconsidine/awx/raw/43c5105a577dc0de221f53183c818785a24b3686/awx%2Fmain%2Ftasks.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftasks.py?ref=43c5105a577dc0de221f53183c818785a24b3686", "patch": "@@ -599,7 +599,7 @@ def run_pexpect(self, instance, args, cwd, env, passwords, stdout_handle,\n else:\n child_procs = main_proc.get_children(recursive=True)\n for child_proc in child_procs:\n- os.kill(child_proc.pid, signal.SIGTERM)\n+ os.kill(child_proc.pid, signal.SIGKILL)\n except TypeError:\n os.kill(child.pid, signal.SIGKILL)\n else:" } ]

[ { "sha": "cab2e537310facc32ddd15f122c6a4f6c14bf8a1", "filename": "awx/main/tests/functional/api/test_job_template.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/df1c1ae4738f3ba0e8d3b8bce9e051569bd7b903/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_job_template.py", "raw_url": "https://github.com/gconsidine/awx/raw/df1c1ae4738f3ba0e8d3b8bce9e051569bd7b903/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_job_template.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Ftests%2Ffunctional%2Fapi%2Ftest_job_template.py?ref=df1c1ae4738f3ba0e8d3b8bce9e051569bd7b903", "patch": "@@ -344,6 +344,6 @@ def test_disallow_template_delete_on_running_job(job_template_factory, delete, a\n project='p',\n inventory='i',\n organization='o')\n- j = objects.job_template.create_unified_job()\n+ objects.job_template.create_unified_job()\n delete_response = delete(reverse('api:job_template_detail', args=[objects.job_template.pk]), user=admin_user)\n assert delete_response.status_code == 409" } ]

[ { "sha": "4f479b954f08f04618b5a7c0754a8e9948aadbc7", "filename": "awx/sso/backends.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/62562afd0d7b0ce14d18da25617a6057cdb5ec8f/awx%2Fsso%2Fbackends.py", "raw_url": "https://github.com/gconsidine/awx/raw/62562afd0d7b0ce14d18da25617a6057cdb5ec8f/awx%2Fsso%2Fbackends.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fsso%2Fbackends.py?ref=62562afd0d7b0ce14d18da25617a6057cdb5ec8f", "patch": "@@ -239,7 +239,7 @@ def on_populate_user(sender, **kwargs):\n team, created = Team.objects.get_or_create(name=team_name, organization=org)\n users_opts = team_opts.get('users', None)\n remove = bool(team_opts.get('remove', True))\n- _update_m2m_from_groups(user, ldap_user, team.member_role.users, users_opts,\n+ _update_m2m_from_groups(user, ldap_user, team.member_role.members, users_opts,\n remove)\n \n # Update user profile to store LDAP DN." } ]

[ { "sha": "b60ac65691c965f61c370b7b2ba5bdeeee76ac2c", "filename": "awx/main/migrations/_rbac.py", "status": "modified", "additions": 1, "deletions": 1, "changes": 2, "blob_url": "https://github.com/gconsidine/awx/blob/94052c2b2b1756c4c7e8d4753d45bbf5b1753b94/awx%2Fmain%2Fmigrations%2F_rbac.py", "raw_url": "https://github.com/gconsidine/awx/raw/94052c2b2b1756c4c7e8d4753d45bbf5b1753b94/awx%2Fmain%2Fmigrations%2F_rbac.py", "contents_url": "https://api.github.com/repos/gconsidine/awx/contents/awx%2Fmain%2Fmigrations%2F_rbac.py?ref=94052c2b2b1756c4c7e8d4753d45bbf5b1753b94", "patch": "@@ -159,7 +159,7 @@ def migrate_credential(apps, schema_editor):\n InventorySource = apps.get_model('main', 'InventorySource')\n \n for cred in Credential.objects.iterator():\n- results = [x for x in JobTemplate.objects.filter(Q(credential=cred) | Q(cloud_credential=cred)).all()] + \\\n+ results = [x for x in JobTemplate.objects.filter(Q(credential=cred) | Q(cloud_credential=cred), inventory__isnull=False).all()] + \\\n [x for x in InventorySource.objects.filter(credential=cred).all()]\n if cred.deprecated_team is not None and results:\n if len(results) == 1:" } ]