From b042beeef76d20dc78ac6ee46c78ea6c4504d2e5 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 19 Apr 2018 18:15:35 -0400 Subject: [PATCH 01/33] update instance groups to only be running jobs --- awx/ui/client/features/jobs/jobs.strings.js | 1 + awx/ui/client/features/jobs/jobsList.controller.js | 4 ++++ awx/ui/client/features/jobs/jobsList.view.html | 2 +- awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js | 3 ++- awx/ui/client/lib/components/list/list.directive.js | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/features/jobs/jobs.strings.js b/awx/ui/client/features/jobs/jobs.strings.js index 703b771219..a902cc4109 100644 --- a/awx/ui/client/features/jobs/jobs.strings.js +++ b/awx/ui/client/features/jobs/jobs.strings.js @@ -13,6 +13,7 @@ function JobsStrings (BaseString) { ROW_ITEM_LABEL_INVENTORY: t.s('Inventory'), ROW_ITEM_LABEL_PROJECT: t.s('Project'), ROW_ITEM_LABEL_CREDENTIALS: t.s('Credentials'), + NO_RUNNING: t.s('There are no running jobs.') }; } diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index d64e1870a5..6715c84e99 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -44,6 +44,10 @@ function ListJobsController ( }); }); + if ($state.includes('instanceGroups')) { + vm.emptyListReason = strings.get('list.NO_RUNNING'); + } + vm.jobTypes = mapChoices(unifiedJob .options('actions.GET.type.choices')); diff --git a/awx/ui/client/features/jobs/jobsList.view.html b/awx/ui/client/features/jobs/jobsList.view.html index e9325b18f1..5a01cf4f28 100644 --- a/awx/ui/client/features/jobs/jobsList.view.html +++ b/awx/ui/client/features/jobs/jobsList.view.html @@ -12,7 +12,7 @@ query-set="querySet"> - +
diff --git a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js index fe86b78774..7bfda756bc 100644 --- a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js +++ b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js @@ -16,7 +16,8 @@ export default { job_search: { value: { page_size: '10', - order_by: '-finished' + order_by: '-id', + status: 'running' }, dynamic: true } diff --git a/awx/ui/client/lib/components/list/list.directive.js b/awx/ui/client/lib/components/list/list.directive.js index 6ff88e506f..7c6a1c1adc 100644 --- a/awx/ui/client/lib/components/list/list.directive.js +++ b/awx/ui/client/lib/components/list/list.directive.js @@ -20,6 +20,7 @@ function atList () { templateUrl, scope: { results: '=', + emptyListReason: '@' }, link: atListLink, controller: AtListController, From 3f509d5ae8218f58dcbdd73b8683f157bd17ffa6 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 19 Apr 2018 18:27:15 -0400 Subject: [PATCH 02/33] fix new tab in router --- .../lib/components/layout/side-nav-item.directive.js | 8 ++------ .../lib/components/layout/side-nav-item.partial.html | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/awx/ui/client/lib/components/layout/side-nav-item.directive.js b/awx/ui/client/lib/components/layout/side-nav-item.directive.js index ab52d74964..d4b11bf716 100644 --- a/awx/ui/client/lib/components/layout/side-nav-item.directive.js +++ b/awx/ui/client/lib/components/layout/side-nav-item.directive.js @@ -4,7 +4,7 @@ function atSideNavItemLink (scope, element, attrs, ctrl) { [scope.navVm, scope.layoutVm] = ctrl; } -function AtSideNavItemController ($state, $scope, strings) { +function AtSideNavItemController ($scope, strings) { const vm = this || {}; $scope.$watch('layoutVm.currentState', current => { @@ -21,10 +21,6 @@ function AtSideNavItemController ($state, $scope, strings) { } }); - vm.go = () => { - $state.go($scope.route, {}, { reload: true }); - }; - vm.tooltip = { popover: { text: strings.get(`layout.${$scope.name}`), @@ -36,7 +32,7 @@ function AtSideNavItemController ($state, $scope, strings) { }; } -AtSideNavItemController.$inject = ['$state', '$scope', 'ComponentsStrings']; +AtSideNavItemController.$inject = ['$scope', 'ComponentsStrings']; function atSideNavItem () { return { diff --git a/awx/ui/client/lib/components/layout/side-nav-item.partial.html b/awx/ui/client/lib/components/layout/side-nav-item.partial.html index cea8489b5c..ca8ff13812 100644 --- a/awx/ui/client/lib/components/layout/side-nav-item.partial.html +++ b/awx/ui/client/lib/components/layout/side-nav-item.partial.html @@ -1,4 +1,4 @@ -
@@ -7,4 +7,4 @@ {{ layoutVm.getString(name) }} -
+ From ee137b8b4d7b4959901ec77cd7949630cab75991 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 20 Apr 2018 16:00:57 -0400 Subject: [PATCH 03/33] fix open in new tab for credentials and inventory scripts --- awx/ui/client/src/credential-types/main.js | 25 +++++++++++++++----- awx/ui/client/src/inventory-scripts/main.js | 26 ++++++++++++++++----- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/awx/ui/client/src/credential-types/main.js b/awx/ui/client/src/credential-types/main.js index 0f2ce9f186..0ba1ccff24 100644 --- a/awx/ui/client/src/credential-types/main.js +++ b/awx/ui/client/src/credential-types/main.js @@ -25,10 +25,8 @@ angular.module('credentialTypes', [ function($stateProvider, stateDefinitionsProvider) { let stateDefinitions = stateDefinitionsProvider.$get(); - $stateProvider.state({ - name: 'credentialTypes.**', - url: '/credential_type', - lazyLoad: () => stateDefinitions.generateTree({ + function generateStateTree() { + let credentialTypesTree = stateDefinitions.generateTree({ parent: 'credentialTypes', modes: ['add', 'edit'], list: 'CredentialTypesList', @@ -45,7 +43,22 @@ angular.module('credentialTypes', [ ncyBreadcrumb: { label: N_('CREDENTIAL TYPES') } - }) - }); + }); + return Promise.all([ + credentialTypesTree + ]).then((generated) => { + return { + states: _.reduce(generated, (result, definition) => { + return result.concat(definition.states); + }, []) + }; + }); + } + let stateTree = { + name: 'credentialTypes.**', + url: '/credential_types', + lazyLoad: () => generateStateTree() + }; + $stateProvider.state(stateTree); } ]); diff --git a/awx/ui/client/src/inventory-scripts/main.js b/awx/ui/client/src/inventory-scripts/main.js index 4854878bca..bc57686d0b 100644 --- a/awx/ui/client/src/inventory-scripts/main.js +++ b/awx/ui/client/src/inventory-scripts/main.js @@ -25,10 +25,8 @@ angular.module('inventoryScripts', [ function($stateProvider, stateDefinitionsProvider) { let stateDefinitions = stateDefinitionsProvider.$get(); - $stateProvider.state({ - name: 'inventoryScripts.**', - url: '/inventory_script', - lazyLoad: () => stateDefinitions.generateTree({ + function generateStateTree() { + let inventoryScriptTree = stateDefinitions.generateTree({ parent: 'inventoryScripts', modes: ['add', 'edit'], list: 'InventoryScriptsList', @@ -66,7 +64,23 @@ angular.module('inventoryScripts', [ ncyBreadcrumb: { label: N_('INVENTORY SCRIPTS') } - }) - }); + }); + + return Promise.all([ + inventoryScriptTree + ]).then((generated) => { + return { + states: _.reduce(generated, (result, definition) => { + return result.concat(definition.states); + }, []) + }; + }); + } + let stateTree = { + name: 'inventoryScripts.**', + url: '/inventory_scripts', + lazyLoad: () => generateStateTree() + }; + $stateProvider.state(stateTree); } ]); From 8fa98d0d542ca3e7ca415359a9974ebac8cac7b3 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 20 Apr 2018 11:51:49 -0400 Subject: [PATCH 04/33] Add new credential become methods, inject instead of set in database --- awx/main/constants.py | 1 + awx/main/fields.py | 14 +++++++++++++- ...0035_v330_credtype_remove_become_methods.py | 18 ++++++++++++++++++ awx/main/migrations/_credentialtypes.py | 6 ++++++ awx/main/models/credential/__init__.py | 4 ++-- 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 awx/main/migrations/0035_v330_credtype_remove_become_methods.py diff --git a/awx/main/constants.py b/awx/main/constants.py index edd00569ea..7305a94a34 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -14,6 +14,7 @@ __all__ = [ CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'cloudforms', 'tower') SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom', 'scm',) PRIVILEGE_ESCALATION_METHODS = [ + ('', _('None')), ('enable', _('Enable')), ('doas', _('Doas')), ('sudo', _('Sudo')), ('su', _('Su')), ('pbrun', _('Pbrun')), ('pfexec', _('Pfexec')), ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas'))] ANSI_SGR_PATTERN = re.compile(r'\x1b\[[0-9;]*m') diff --git a/awx/main/fields.py b/awx/main/fields.py index 1a41d711a3..ec9ada6cf8 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -45,6 +45,7 @@ from awx.main.utils.filters import SmartFilter from awx.main.utils.encryption import encrypt_value, decrypt_value, get_encryption_key from awx.main.validators import validate_ssh_private_key from awx.main.models.rbac import batch_role_ancestor_rebuilding, Role +from awx.main.constants import PRIVILEGE_ESCALATION_METHODS from awx.main import utils @@ -649,7 +650,7 @@ class CredentialTypeInputField(JSONSchemaField): 'items': { 'type': 'object', 'properties': { - 'type': {'enum': ['string', 'boolean']}, + 'type': {'enum': ['string', 'boolean', 'become_method']}, 'format': {'enum': ['ssh_private_key']}, 'choices': { 'type': 'array', @@ -710,6 +711,17 @@ class CredentialTypeInputField(JSONSchemaField): # If no type is specified, default to string field['type'] = 'string' + if field['type'] == 'become_method': + if not model_instance.managed_by_tower: + raise django_exceptions.ValidationError( + _('{0} is a reserved type name'.format(field['type'])), + code='invalid', + params={'value': value}, + ) + else: + field['type'] = 'string' + field['choices'] = PRIVILEGE_ESCALATION_METHODS + for key in ('choices', 'multiline', 'format', 'secret',): if key in field and field['type'] != 'string': raise django_exceptions.ValidationError( diff --git a/awx/main/migrations/0035_v330_credtype_remove_become_methods.py b/awx/main/migrations/0035_v330_credtype_remove_become_methods.py new file mode 100644 index 0000000000..130a949ec7 --- /dev/null +++ b/awx/main/migrations/0035_v330_credtype_remove_become_methods.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +# AWX +from awx.main.migrations import _credentialtypes as credentialtypes + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0034_v330_more_oauth2_help_text'), + ] + + operations = [ + migrations.RunPython(credentialtypes.remove_become_methods), + ] diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index bf4128c92e..247ca42a36 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -197,3 +197,9 @@ def add_azure_cloud_environment_field(apps, schema_editor): name='Microsoft Azure Resource Manager') azure_rm_credtype.inputs = CredentialType.defaults.get('azure_rm')().inputs azure_rm_credtype.save() + + +def remove_become_methods(apps, schema_editor): + become_credtype = CredentialType.objects.get(kind='ssh') + become_credtype.inputs = CredentialType.defaults.get('ssh')().inputs + become_credtype.save() diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py index b390043765..b372144512 100644 --- a/awx/main/models/credential/__init__.py +++ b/awx/main/models/credential/__init__.py @@ -165,7 +165,7 @@ class V1Credential(object): max_length=32, blank=True, default='', - choices=[('', _('None'))] + PRIVILEGE_ESCALATION_METHODS, + choices=PRIVILEGE_ESCALATION_METHODS, help_text=_('Privilege escalation method.') ), 'become_username': models.CharField( @@ -516,7 +516,7 @@ class CredentialType(CommonModelNameNotUnique): if field['id'] == field_id: if 'choices' in field: return field['choices'][0] - return {'string': '', 'boolean': False}[field['type']] + return {'string': '', 'boolean': False, 'become_method': ''}[field['type']] @classmethod def default(cls, f): From d6ac9b6e3dd5684a4aa3d98322a6b127f9e1851a Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 20 Apr 2018 13:00:18 -0400 Subject: [PATCH 05/33] Restore previous choices, clean up some minor things --- awx/main/constants.py | 2 +- awx/main/fields.py | 2 +- awx/main/migrations/_credentialtypes.py | 2 +- awx/main/models/credential/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/constants.py b/awx/main/constants.py index 7305a94a34..2ca34a47c5 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -14,7 +14,7 @@ __all__ = [ CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'cloudforms', 'tower') SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom', 'scm',) PRIVILEGE_ESCALATION_METHODS = [ - ('', _('None')), ('enable', _('Enable')), ('doas', _('Doas')), + ('enable', _('Enable')), ('doas', _('Doas')), ('sudo', _('Sudo')), ('su', _('Su')), ('pbrun', _('Pbrun')), ('pfexec', _('Pfexec')), ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas'))] ANSI_SGR_PATTERN = re.compile(r'\x1b\[[0-9;]*m') diff --git a/awx/main/fields.py b/awx/main/fields.py index ec9ada6cf8..d956e3e808 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -714,7 +714,7 @@ class CredentialTypeInputField(JSONSchemaField): if field['type'] == 'become_method': if not model_instance.managed_by_tower: raise django_exceptions.ValidationError( - _('{0} is a reserved type name'.format(field['type'])), + _('become_method is a reserved type name'), code='invalid', params={'value': value}, ) diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index 247ca42a36..6d71776d6b 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -200,6 +200,6 @@ def add_azure_cloud_environment_field(apps, schema_editor): def remove_become_methods(apps, schema_editor): - become_credtype = CredentialType.objects.get(kind='ssh') + become_credtype = CredentialType.objects.get(kind='ssh').first() become_credtype.inputs = CredentialType.defaults.get('ssh')().inputs become_credtype.save() diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py index b372144512..b40b85154d 100644 --- a/awx/main/models/credential/__init__.py +++ b/awx/main/models/credential/__init__.py @@ -165,7 +165,7 @@ class V1Credential(object): max_length=32, blank=True, default='', - choices=PRIVILEGE_ESCALATION_METHODS, + choices=[('', _('None'))] + PRIVILEGE_ESCALATION_METHODS, help_text=_('Privilege escalation method.') ), 'become_username': models.CharField( From 07474d5b21bd12ba2c665651e21b2b31180e3ab8 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 20 Apr 2018 14:37:50 -0400 Subject: [PATCH 06/33] Extend become_method to model field validation as well --- awx/main/constants.py | 1 + awx/main/fields.py | 8 ++++++-- awx/main/models/credential/__init__.py | 8 +++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/awx/main/constants.py b/awx/main/constants.py index 2ca34a47c5..e966d4b72a 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -17,6 +17,7 @@ PRIVILEGE_ESCALATION_METHODS = [ ('enable', _('Enable')), ('doas', _('Doas')), ('sudo', _('Sudo')), ('su', _('Su')), ('pbrun', _('Pbrun')), ('pfexec', _('Pfexec')), ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas'))] +CHOICES_PRIVILEGE_ESCALATION_METHODS = [('', _('None'))] + PRIVILEGE_ESCALATION_METHODS ANSI_SGR_PATTERN = re.compile(r'\x1b\[[0-9;]*m') CAN_CANCEL = ('new', 'pending', 'waiting', 'running') ACTIVE_STATES = CAN_CANCEL diff --git a/awx/main/fields.py b/awx/main/fields.py index d956e3e808..ab039eed58 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -4,6 +4,7 @@ # Python import copy import json +import operator import re import six import urllib @@ -45,7 +46,7 @@ from awx.main.utils.filters import SmartFilter from awx.main.utils.encryption import encrypt_value, decrypt_value, get_encryption_key from awx.main.validators import validate_ssh_private_key from awx.main.models.rbac import batch_role_ancestor_rebuilding, Role -from awx.main.constants import PRIVILEGE_ESCALATION_METHODS +from awx.main.constants import CHOICES_PRIVILEGE_ESCALATION_METHODS from awx.main import utils @@ -507,6 +508,9 @@ class CredentialInputField(JSONSchemaField): properties = {} for field in model_instance.credential_type.inputs.get('fields', []): field = field.copy() + if field['type'] == 'become_method': + field.pop('type') + field['choices'] = map(operator.itemgetter(0), CHOICES_PRIVILEGE_ESCALATION_METHODS) properties[field['id']] = field if field.get('choices', []): field['enum'] = field['choices'][:] @@ -720,7 +724,7 @@ class CredentialTypeInputField(JSONSchemaField): ) else: field['type'] = 'string' - field['choices'] = PRIVILEGE_ESCALATION_METHODS + field['choices'] = CHOICES_PRIVILEGE_ESCALATION_METHODS for key in ('choices', 'multiline', 'format', 'secret',): if key in field and field['type'] != 'string': diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py index b40b85154d..0d988706f8 100644 --- a/awx/main/models/credential/__init__.py +++ b/awx/main/models/credential/__init__.py @@ -4,7 +4,6 @@ from collections import OrderedDict import functools import json import logging -import operator import os import re import stat @@ -22,7 +21,6 @@ from django.utils.encoding import force_text # AWX from awx.api.versioning import reverse -from awx.main.constants import PRIVILEGE_ESCALATION_METHODS from awx.main.fields import (ImplicitRoleField, CredentialInputField, CredentialTypeInputField, CredentialTypeInjectorField) @@ -35,6 +33,7 @@ from awx.main.models.rbac import ( ROLE_SINGLETON_SYSTEM_AUDITOR, ) from awx.main.utils import encrypt_field +from awx.main.constants import CHOICES_PRIVILEGE_ESCALATION_METHODS from . import injectors as builtin_injectors __all__ = ['Credential', 'CredentialType', 'V1Credential', 'build_safe_env'] @@ -165,7 +164,7 @@ class V1Credential(object): max_length=32, blank=True, default='', - choices=[('', _('None'))] + PRIVILEGE_ESCALATION_METHODS, + choices=CHOICES_PRIVILEGE_ESCALATION_METHODS, help_text=_('Privilege escalation method.') ), 'become_username': models.CharField( @@ -708,8 +707,7 @@ def ssh(cls): }, { 'id': 'become_method', 'label': 'Privilege Escalation Method', - 'choices': map(operator.itemgetter(0), - V1Credential.FIELDS['become_method'].choices), + 'type': 'become_method', 'help_text': ('Specify a method for "become" operations. This is ' 'equivalent to specifying the --become-method ' 'Ansible parameter.') From c1a8d8670fb68c75812bf346b5a86a606e1d4ec5 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 20 Apr 2018 15:27:24 -0400 Subject: [PATCH 07/33] Pop the type to be consistent --- awx/main/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/fields.py b/awx/main/fields.py index ab039eed58..44389f3879 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -723,7 +723,7 @@ class CredentialTypeInputField(JSONSchemaField): params={'value': value}, ) else: - field['type'] = 'string' + field.pop('type') field['choices'] = CHOICES_PRIVILEGE_ESCALATION_METHODS for key in ('choices', 'multiline', 'format', 'secret',): From f1b37ff53a5a2174123984f1127e528d39e8acfc Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Mon, 23 Apr 2018 10:19:07 -0400 Subject: [PATCH 08/33] Fix order become methods render and migration query --- awx/api/serializers.py | 11 ++++++++++- awx/main/constants.py | 5 +++-- awx/main/migrations/_credentialtypes.py | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 0c887da968..955abb9b74 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -38,7 +38,13 @@ from rest_framework.utils.serializer_helpers import ReturnList from polymorphic.models import PolymorphicModel # AWX -from awx.main.constants import SCHEDULEABLE_PROVIDERS, ANSI_SGR_PATTERN, ACTIVE_STATES, TOKEN_CENSOR +from awx.main.constants import ( + SCHEDULEABLE_PROVIDERS, + ANSI_SGR_PATTERN, + ACTIVE_STATES, + TOKEN_CENSOR, + CHOICES_PRIVILEGE_ESCALATION_METHODS, +) from awx.main.models import * # noqa from awx.main.models.base import NEW_JOB_TYPE_CHOICES from awx.main.access import get_user_capabilities @@ -2494,6 +2500,9 @@ class CredentialTypeSerializer(BaseSerializer): field['label'] = _(field['label']) if 'help_text' in field: field['help_text'] = _(field['help_text']) + if field['type'] == 'become_method': + field.pop('type') + field['choices'] = map(operator.itemgetter(0), CHOICES_PRIVILEGE_ESCALATION_METHODS) return value def filter_field_metadata(self, fields, method): diff --git a/awx/main/constants.py b/awx/main/constants.py index e966d4b72a..e7c8a943fc 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -14,9 +14,10 @@ __all__ = [ CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'cloudforms', 'tower') SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom', 'scm',) PRIVILEGE_ESCALATION_METHODS = [ - ('enable', _('Enable')), ('doas', _('Doas')), ('sudo', _('Sudo')), ('su', _('Su')), ('pbrun', _('Pbrun')), ('pfexec', _('Pfexec')), - ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas'))] + ('dzdo', _('DZDO')), ('pmrun', _('Pmrun')), ('runas', _('Runas')), + ('enable', _('Enable')), ('doas', _('Doas')), +] CHOICES_PRIVILEGE_ESCALATION_METHODS = [('', _('None'))] + PRIVILEGE_ESCALATION_METHODS ANSI_SGR_PATTERN = re.compile(r'\x1b\[[0-9;]*m') CAN_CANCEL = ('new', 'pending', 'waiting', 'running') diff --git a/awx/main/migrations/_credentialtypes.py b/awx/main/migrations/_credentialtypes.py index 6d71776d6b..fbf812e8c2 100644 --- a/awx/main/migrations/_credentialtypes.py +++ b/awx/main/migrations/_credentialtypes.py @@ -200,6 +200,6 @@ def add_azure_cloud_environment_field(apps, schema_editor): def remove_become_methods(apps, schema_editor): - become_credtype = CredentialType.objects.get(kind='ssh').first() + become_credtype = CredentialType.objects.filter(kind='ssh', managed_by_tower=True).first() become_credtype.inputs = CredentialType.defaults.get('ssh')().inputs become_credtype.save() From 765ad07d9e44d9a8bee612240703a15d8fa04032 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Mon, 23 Apr 2018 10:35:44 -0400 Subject: [PATCH 09/33] Fix migration name/ordering --- awx/api/serializers.py | 1 + ..._methods.py => 0036_v330_credtype_remove_become_methods.py} | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) rename awx/main/migrations/{0035_v330_credtype_remove_become_methods.py => 0036_v330_credtype_remove_become_methods.py} (86%) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 955abb9b74..ca9464f93b 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -5,6 +5,7 @@ import copy import json import logging +import operator import re import six import urllib diff --git a/awx/main/migrations/0035_v330_credtype_remove_become_methods.py b/awx/main/migrations/0036_v330_credtype_remove_become_methods.py similarity index 86% rename from awx/main/migrations/0035_v330_credtype_remove_become_methods.py rename to awx/main/migrations/0036_v330_credtype_remove_become_methods.py index 130a949ec7..3a43bd6a8b 100644 --- a/awx/main/migrations/0035_v330_credtype_remove_become_methods.py +++ b/awx/main/migrations/0036_v330_credtype_remove_become_methods.py @@ -10,7 +10,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('main', '0034_v330_more_oauth2_help_text'), + ('main', '0035_v330_more_oauth2_help_text'), + ] operations = [ From a1541d679ce25597a83f29558ddb7726c93791cc Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Mon, 23 Apr 2018 12:41:07 -0400 Subject: [PATCH 10/33] remove obsolete .go unit test --- awx/ui/test/unit/components/side-nav-item.unit.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/awx/ui/test/unit/components/side-nav-item.unit.js b/awx/ui/test/unit/components/side-nav-item.unit.js index 455fffd4c9..0aa0bb63ef 100644 --- a/awx/ui/test/unit/components/side-nav-item.unit.js +++ b/awx/ui/test/unit/components/side-nav-item.unit.js @@ -44,13 +44,6 @@ describe('Components | Side Nav Item', () => { expect(SideNavItemCtrl.isRoute).toBe(false); }); - it('go() should call $state.go()', angular.mock.inject((_$state_) => { - spyOn(_$state_, 'go'); - SideNavItemCtrl.go(); - expect(_$state_.go).toHaveBeenCalled(); - expect(_$state_.go).toHaveBeenCalledWith('dashboard', jasmine.any(Object), jasmine.any(Object)); - })); - it('should load name, icon, and route from scope', () => { expect(SideNavItem.isolateScope().name).toBeDefined(); expect(SideNavItem.isolateScope().iconClass).toBeDefined(); From 18b41791ab9152ebb9ddc8c4a4340077cb342cb7 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 23 Apr 2018 12:59:41 -0400 Subject: [PATCH 11/33] Updating vmware_inventory from upstream --- awx/plugins/inventory/vmware_inventory.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/awx/plugins/inventory/vmware_inventory.py b/awx/plugins/inventory/vmware_inventory.py index 997f53dcaa..28977a3aed 100755 --- a/awx/plugins/inventory/vmware_inventory.py +++ b/awx/plugins/inventory/vmware_inventory.py @@ -287,11 +287,23 @@ class VMWareInventory(object): self.debugl('lower keys is %s' % self.lowerkeys) self.skip_keys = list(config.get('vmware', 'skip_keys').split(',')) self.debugl('skip keys is %s' % self.skip_keys) - self.host_filters = list(config.get('vmware', 'host_filters').split(',')) + temp_host_filters = list(config.get('vmware', 'host_filters').split('}},')) + for host_filter in temp_host_filters: + host_filter = host_filter.rstrip() + if host_filter != "": + if not host_filter.endswith("}}"): + host_filter += "}}" + self.host_filters.append(host_filter) self.debugl('host filters are %s' % self.host_filters) - self.groupby_patterns = list(config.get('vmware', 'groupby_patterns').split(',')) - self.debugl('groupby patterns are %s' % self.groupby_patterns) + temp_groupby_patterns = list(config.get('vmware', 'groupby_patterns').split('}},')) + for groupby_pattern in temp_groupby_patterns: + groupby_pattern = groupby_pattern.rstrip() + if groupby_pattern != "": + if not groupby_pattern.endswith("}}"): + groupby_pattern += "}}" + self.groupby_patterns.append(groupby_pattern) + self.debugl('groupby patterns are %s' % self.groupby_patterns) # Special feature to disable the brute force serialization of the # virtulmachine objects. The key name for these properties does not # matter because the values are just items for a larger list. @@ -491,7 +503,7 @@ class VMWareInventory(object): keylist = map(lambda x: x.strip(), tv['value'].split(',')) for kl in keylist: try: - newkey = self.config.get('vmware', 'custom_field_group_prefix') + field_name + '_' + kl + newkey = self.config.get('vmware', 'custom_field_group_prefix') + str(field_name) + '_' + kl newkey = newkey.strip() except Exception as e: self.debugl(e) From e38d779d04bd8f14b750ae2f1165f9f383f80f7d Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 23 Apr 2018 13:42:37 -0400 Subject: [PATCH 12/33] Fixed botched merge conflict bug which prevents launching jobs that need credential selection --- .../src/templates/prompt/prompt.controller.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/awx/ui/client/src/templates/prompt/prompt.controller.js b/awx/ui/client/src/templates/prompt/prompt.controller.js index 133121e6fd..5b6f035dd5 100644 --- a/awx/ui/client/src/templates/prompt/prompt.controller.js +++ b/awx/ui/client/src/templates/prompt/prompt.controller.js @@ -70,16 +70,16 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel', vm.promptDataClone.prompts.credentials.passwords = {}; - if(vm.promptData.launchConf.passwords_needed_to_start) { - vm.promptData.launchConf.passwords_needed_to_start.forEach((passwordNeeded) => { + if(vm.promptDataClone.launchConf.passwords_needed_to_start) { + vm.promptDataClone.launchConf.passwords_needed_to_start.forEach((passwordNeeded) => { if(passwordNeeded === "ssh_password") { - vm.promptData.prompts.credentials.passwords.ssh = {}; + vm.promptDataClone.prompts.credentials.passwords.ssh = {}; } if(passwordNeeded === "become_password") { - vm.promptData.prompts.credentials.passwords.become = {}; + vm.promptDataClone.prompts.credentials.passwords.become = {}; } if(passwordNeeded === "ssh_key_unlock") { - vm.promptData.prompts.credentials.passwords.ssh_key_unlock = {}; + vm.promptDataClone.prompts.credentials.passwords.ssh_key_unlock = {}; } if(passwordNeeded.startsWith("vault_password")) { let vault_id; @@ -87,11 +87,11 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel', vault_id = passwordNeeded.split(/\.(.+)/)[1]; } - if(!vm.promptData.prompts.credentials.passwords.vault) { - vm.promptData.prompts.credentials.passwords.vault = []; + if(!vm.promptDataClone.prompts.credentials.passwords.vault) { + vm.promptDataClone.prompts.credentials.passwords.vault = []; } - vm.promptData.prompts.credentials.passwords.vault.push({ + vm.promptDataClone.prompts.credentials.passwords.vault.push({ vault_id: vault_id }); } From 5848a61238b253339a573262f258e9906fa46ada Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 23 Apr 2018 13:52:11 -0400 Subject: [PATCH 13/33] Show verbosity on prompt preview tab --- .../templates/prompt/steps/preview/prompt-preview.partial.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.partial.html b/awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.partial.html index 452aa6815c..ba83655f9b 100644 --- a/awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.partial.html +++ b/awx/ui/client/src/templates/prompt/steps/preview/prompt-preview.partial.html @@ -32,7 +32,7 @@
{{:: vm.strings.get('prompt.LIMIT') }}
-
+
{{:: vm.strings.get('prompt.VERBOSITY') }}
From 19d5d71937263149eaee184e3e82ab8d75f2e301 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 23 Apr 2018 13:11:18 -0400 Subject: [PATCH 14/33] unpin botocore now that an upstream dependency issue is resolved related: https://github.com/ansible/awx/commit/4f585dd09e35c2ab1011e8ea93e6533be8877329 related: https://github.com/boto/botocore/pull/1433 --- requirements/requirements.in | 3 +-- requirements/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index cf1c314d9d..3dbd0aed63 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -5,8 +5,7 @@ asgiref==1.1.2 azure==3.0.0 backports.ssl-match-hostname==3.5.0.1 boto==2.47.0 -boto3==1.6.2 -botocore<1.9.8 # botocore 1.9.8 pinned python-dateutil < 2.7.0 (our TZID fixes) https://github.com/boto/botocore/pull/1402 +boto3==1.7.6 channels==1.1.8 celery==3.1.25 daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade diff --git a/requirements/requirements.txt b/requirements/requirements.txt index a13c7105ea..a938b9323e 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -95,9 +95,9 @@ backports.functools-lru-cache==1.5 # via jaraco.functools backports.ssl-match-hostname==3.5.0.1 baron==0.6.6 # via redbaron billiard==3.3.0.23 # via celery -boto3==1.6.2 +boto3==1.7.6 boto==2.47.0 -botocore==1.9.7 +botocore==1.10.6 celery==3.1.25 certifi==2018.1.18 # via msrest cffi==1.11.5 # via azure-datalake-store, cryptography From 405a936544ada0bcf8285b009ad13f25517f27d2 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 23 Apr 2018 15:29:13 -0400 Subject: [PATCH 15/33] add more logs for network canvas activity --- awx/network_ui/consumers.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/awx/network_ui/consumers.py b/awx/network_ui/consumers.py index a67fe0a2e5..36cbb24803 100644 --- a/awx/network_ui/consumers.py +++ b/awx/network_ui/consumers.py @@ -80,7 +80,7 @@ class NetworkingEvents(object): type='device_type', id='cid', host_id='host_id'), device) - logger.info("Device %s", device) + logger.info("Device created %s", device) d, _ = Device.objects.get_or_create(topology_id=topology_id, cid=device['cid'], defaults=device) d.x = device['x'] d.y = device['y'] @@ -92,6 +92,7 @@ class NetworkingEvents(object): .update(device_id_seq=device['cid'])) def onDeviceDestroy(self, device, topology_id, client_id): + logger.info("Device removed %s", device) Device.objects.filter(topology_id=topology_id, cid=device['id']).delete() def onDeviceMove(self, device, topology_id, client_id): @@ -101,6 +102,7 @@ class NetworkingEvents(object): Device.objects.filter(topology_id=topology_id, cid=device['id']).update(host_id=device['host_id']) def onDeviceLabelEdit(self, device, topology_id, client_id): + logger.debug("Device label edited %s", device) Device.objects.filter(topology_id=topology_id, cid=device['id']).update(name=device['name']) def onInterfaceLabelEdit(self, interface, topology_id, client_id): @@ -111,6 +113,7 @@ class NetworkingEvents(object): .update(name=interface['name'])) def onLinkLabelEdit(self, link, topology_id, client_id): + logger.debug("Link label edited %s", link) Link.objects.filter(from_device__topology_id=topology_id, cid=link['id']).update(name=link['name']) def onInterfaceCreate(self, interface, topology_id, client_id): @@ -125,6 +128,7 @@ class NetworkingEvents(object): .update(interface_id_seq=interface['id'])) def onLinkCreate(self, link, topology_id, client_id): + logger.debug("Link created %s", link) device_map = dict(Device.objects .filter(topology_id=topology_id, cid__in=[link['from_device_id'], link['to_device_id']]) .values_list('cid', 'pk')) @@ -141,6 +145,7 @@ class NetworkingEvents(object): .update(link_id_seq=link['id'])) def onLinkDestroy(self, link, topology_id, client_id): + logger.debug("Link deleted %s", link) device_map = dict(Device.objects .filter(topology_id=topology_id, cid__in=[link['from_device_id'], link['to_device_id']]) .values_list('cid', 'pk')) From 29b9c44a1e2420e71b37a562c7d8fd09b1a74819 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Mon, 23 Apr 2018 15:29:53 -0400 Subject: [PATCH 16/33] Show tower group name field as read-only --- .../instance-groups/add-edit/edit-instance-group.controller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js b/awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js index 458266a1fc..21e04a44ae 100644 --- a/awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js +++ b/awx/ui/client/src/instance-groups/add-edit/edit-instance-group.controller.js @@ -28,6 +28,7 @@ function EditController ($rootScope, $state, models, strings) { vm.form.disabled = !instanceGroup.has('options', 'actions.PUT'); + vm.form.name._disabled = instanceGroup.get('name') === 'tower'; vm.form.policy_instance_list._lookupTags = true; vm.form.policy_instance_list._model = instance; vm.form.policy_instance_list._placeholder = "Policy Instance List"; From b9427ecf6da1e9662f35c2179b0647f0e2316152 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Mon, 23 Apr 2018 13:07:23 -0400 Subject: [PATCH 17/33] Show instance groups tab if user is an Org Admin --- .../lib/components/layout/layout.directive.js | 28 +++++++++++++++++-- .../lib/components/layout/layout.partial.html | 2 +- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/lib/components/layout/layout.directive.js b/awx/ui/client/lib/components/layout/layout.directive.js index f853c5bb19..c6fddc51e4 100644 --- a/awx/ui/client/lib/components/layout/layout.directive.js +++ b/awx/ui/client/lib/components/layout/layout.directive.js @@ -1,6 +1,6 @@ const templateUrl = require('~components/layout/layout.partial.html'); -function AtLayoutController ($scope, strings, $transitions) { +function AtLayoutController ($scope, $http, strings, ProcessErrors, $transitions) { const vm = this || {}; $transitions.onSuccess({}, (transition) => { @@ -9,10 +9,14 @@ function AtLayoutController ($scope, strings, $transitions) { $scope.$watch('$root.current_user', (val) => { vm.isLoggedIn = val && val.username; - if (val) { + if (!_.isEmpty(val)) { vm.isSuperUser = $scope.$root.user_is_superuser || $scope.$root.user_is_system_auditor; vm.currentUsername = val.username; vm.currentUserId = val.id; + + if (!vm.isSuperUser) { + checkOrgAdmin(); + } } }); @@ -32,9 +36,27 @@ function AtLayoutController ($scope, strings, $transitions) { return strings.get(string); } }; + + function checkOrgAdmin () { + const usersPath = `/api/v2/users/${vm.currentUserId}/admin_of_organizations/`; + $http.get(usersPath) + .then(({ data }) => { + if (data.count > 0) { + vm.isOrgAdmin = true; + } else { + vm.isOrgAdmin = false; + } + }) + .catch(({ data, status }) => { + ProcessErrors(null, data, status, null, { + hdr: strings.get('error.HEADER'), + msg: strings.get('error.CALL', { path: usersPath, action: 'GET', status }) + }); + }); + } } -AtLayoutController.$inject = ['$scope', 'ComponentsStrings', '$transitions']; +AtLayoutController.$inject = ['$scope', '$http', 'ComponentsStrings', 'ProcessErrors', '$transitions']; function atLayout () { return { diff --git a/awx/ui/client/lib/components/layout/layout.partial.html b/awx/ui/client/lib/components/layout/layout.partial.html index ada6b2f1ea..4714a23172 100644 --- a/awx/ui/client/lib/components/layout/layout.partial.html +++ b/awx/ui/client/lib/components/layout/layout.partial.html @@ -85,7 +85,7 @@ system-admin-only="true"> + ng-show="$parent.layoutVm.isSuperUser || $parent.layoutVm.isOrgAdmin"> From 9cfd264103c3a39878392b0ea3c1ec298bf8a57d Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Mon, 23 Apr 2018 16:57:43 -0400 Subject: [PATCH 18/33] specifically bind html only the row items that need it for new lists in the ui --- awx/ui/client/features/templates/templatesList.view.html | 4 ++-- awx/ui/client/lib/components/list/row-item.directive.js | 1 + awx/ui/client/lib/components/list/row-item.partial.html | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/features/templates/templatesList.view.html b/awx/ui/client/features/templates/templatesList.view.html index fee9f2b31a..e68ddef8fb 100644 --- a/awx/ui/client/features/templates/templatesList.view.html +++ b/awx/ui/client/features/templates/templatesList.view.html @@ -77,11 +77,11 @@ + value-bind-html="{{ vm.getModified(template) }}"> + value-bind-html="{{ vm.getLastRan(template) }}"> diff --git a/awx/ui/client/lib/components/list/row-item.directive.js b/awx/ui/client/lib/components/list/row-item.directive.js index 296aa28249..ea116cc5cc 100644 --- a/awx/ui/client/lib/components/list/row-item.directive.js +++ b/awx/ui/client/lib/components/list/row-item.directive.js @@ -19,6 +19,7 @@ function atRowItem () { labelState: '@', value: '@', valueLink: '@', + valueBindHtml: '@', smartStatus: '=?', tagValues: '=?', // TODO: add see more for tags if applicable diff --git a/awx/ui/client/lib/components/list/row-item.partial.html b/awx/ui/client/lib/components/list/row-item.partial.html index d504f0f928..4783993acc 100644 --- a/awx/ui/client/lib/components/list/row-item.partial.html +++ b/awx/ui/client/lib/components/list/row-item.partial.html @@ -1,5 +1,5 @@
+ ng-show="status || headerValue || value || valueBindHtml || (smartStatus && smartStatus.summary_fields.recent_jobs.length) || (tagValues && tagValues.length)">
+
+
From bcee83e87cafdaa4eb3278678879b863e4a83527 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Mon, 23 Apr 2018 19:23:49 -0400 Subject: [PATCH 19/33] Fix broken unit tests --- awx/ui/test/unit/components/layout.unit.js | 14 +++++++++++++- awx/ui/test/unit/components/side-nav-item.unit.js | 2 ++ awx/ui/test/unit/components/side-nav.unit.js | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/awx/ui/test/unit/components/layout.unit.js b/awx/ui/test/unit/components/layout.unit.js index 3b2140385e..76ecf0dcd6 100644 --- a/awx/ui/test/unit/components/layout.unit.js +++ b/awx/ui/test/unit/components/layout.unit.js @@ -1,6 +1,7 @@ describe('Components | Layout', () => { let $compile; let $rootScope; + let $httpBackend; let element; let scope; @@ -10,11 +11,14 @@ describe('Components | Layout', () => { angular.mock.module('ui.router'); angular.mock.module('at.lib.services'); angular.mock.module('at.lib.components'); + angular.mock.module('Utilities'); + angular.mock.module('ngCookies'); }); - beforeEach(angular.mock.inject((_$compile_, _$rootScope_) => { + beforeEach(angular.mock.inject((_$compile_, _$rootScope_, _$httpBackend_) => { $compile = _$compile_; $rootScope = _$rootScope_; + $httpBackend = _$httpBackend_; scope = $rootScope.$new(); element = angular.element(''); @@ -26,7 +30,15 @@ describe('Components | Layout', () => { let controller; beforeEach(() => { + const mockResponse = { + data: { + count: 3 + } + }; + controller = element.controller('atLayout'); + $httpBackend.when('GET', /admin_of_organizations/) + .respond(mockResponse); }); xit('$scope.$on($stateChangeSuccess) should assign toState name to currentState', () => { diff --git a/awx/ui/test/unit/components/side-nav-item.unit.js b/awx/ui/test/unit/components/side-nav-item.unit.js index 0aa0bb63ef..e0deffa245 100644 --- a/awx/ui/test/unit/components/side-nav-item.unit.js +++ b/awx/ui/test/unit/components/side-nav-item.unit.js @@ -10,6 +10,8 @@ describe('Components | Side Nav Item', () => { angular.mock.module('ui.router'); angular.mock.module('at.lib.services'); angular.mock.module('at.lib.components'); + angular.mock.module('Utilities'); + angular.mock.module('ngCookies'); }); beforeEach(angular.mock.inject((_$compile_, _$rootScope_) => { diff --git a/awx/ui/test/unit/components/side-nav.unit.js b/awx/ui/test/unit/components/side-nav.unit.js index e39da6075e..e460528a2e 100644 --- a/awx/ui/test/unit/components/side-nav.unit.js +++ b/awx/ui/test/unit/components/side-nav.unit.js @@ -15,6 +15,8 @@ describe('Components | Side Nav', () => { angular.mock.module('at.lib.components', ($provide) => { $provide.value('$window', windowMock); }); + angular.mock.module('Utilities'); + angular.mock.module('ngCookies'); }); beforeEach(angular.mock.inject((_$compile_, _$rootScope_) => { From 298af25babeea0f73a544dc746624022fc2fc9db Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 23 Apr 2018 18:13:26 -0700 Subject: [PATCH 20/33] Points the host event modal's Standard Out tab at `event_data.res.stdout` instead of `event_data.res.results.stdout`. Same for stderr. This was some stale copy pasta from the host event modal rework --- .../features/output/host-event/host-event.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/features/output/host-event/host-event.controller.js b/awx/ui/client/features/output/host-event/host-event.controller.js index 67105ba7a0..a688e59a64 100644 --- a/awx/ui/client/features/output/host-event/host-event.controller.js +++ b/awx/ui/client/features/output/host-event/host-event.controller.js @@ -26,7 +26,7 @@ function HostEventsController ( $scope.module_name = 'No result found'; } - if (_.has(hostEvent.event_data, 'res.result.stdout')) { + if (_.has(hostEvent.event_data, 'res.stdout')) { if (hostEvent.event_data.res.stdout === '') { $scope.stdout = ' '; } else { @@ -34,7 +34,7 @@ function HostEventsController ( } } - if (_.has(hostEvent.event_data, 'res.result.stderr')) { + if (_.has(hostEvent.event_data, 'res.stderr')) { if (hostEvent.event_data.res.stderr === '') { $scope.stderr = ' '; } else { From 99fb8e6d83b92a43bd446ca583d39a2d9854aa04 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 23 Apr 2018 19:15:12 -0700 Subject: [PATCH 21/33] Updates URL for host events for adhoc commands --- .../output/host-event/host-event.route.js | 2 +- .../output/host-event/host-event.service.js | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/features/output/host-event/host-event.route.js b/awx/ui/client/features/output/host-event/host-event.route.js index 06f3eeac51..105881c778 100644 --- a/awx/ui/client/features/output/host-event/host-event.route.js +++ b/awx/ui/client/features/output/host-event/host-event.route.js @@ -14,7 +14,7 @@ function exit () { } function HostEventResolve (HostEventService, $stateParams) { - return HostEventService.getRelatedJobEvents($stateParams.id, { + return HostEventService.getRelatedJobEvents($stateParams.id, $stateParams.type, { id: $stateParams.eventId }).then((response) => response.data.results[0]); } diff --git a/awx/ui/client/features/output/host-event/host-event.service.js b/awx/ui/client/features/output/host-event/host-event.service.js index a1e6952725..4454bde27b 100644 --- a/awx/ui/client/features/output/host-event/host-event.service.js +++ b/awx/ui/client/features/output/host-event/host-event.service.js @@ -4,13 +4,22 @@ function HostEventService ( GetBasePath, $rootScope ) { + this.getUrl = (id, type, params) => { + let url; + if (type === 'playbook') { + url = `${GetBasePath('jobs')}${id}/job_events/?${this.stringifyParams(params)}`; + } else if (type === 'command') { + url = `${GetBasePath('ad_hoc_commands')}${id}/events/?${this.stringifyParams(params)}`; + } + return url; + }; + // GET events related to a job run // e.g. // ?event=playbook_on_stats // ?parent=206&event__startswith=runner&page_size=200&order=host_name,counter - this.getRelatedJobEvents = (id, params) => { - let url = GetBasePath('jobs'); - url = `${url}${id}/job_events/?${this.stringifyParams(params)}`; + this.getRelatedJobEvents = (id, type, params) => { + const url = this.getUrl(id, type, params); Rest.setUrl(url); return Rest.get() .then(response => response) From 6f1774f1b1e5a0024c3e3ce25282d8fee919aae9 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 23 Apr 2018 19:49:18 -0700 Subject: [PATCH 22/33] Adds NgNonBindable directive to stdout lines in order to prevent stdout code from running angular snippets --- awx/ui/client/features/output/render.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/features/output/render.service.js b/awx/ui/client/features/output/render.service.js index 12ca797b32..aa86913133 100644 --- a/awx/ui/client/features/output/render.service.js +++ b/awx/ui/client/features/output/render.service.js @@ -169,7 +169,7 @@ function JobRenderService ($q, $sce, $window) { } if (current.isHost) { - tdEvent = `${content}`; + tdEvent = `${content}`; } if (current.time && current.line === ln) { From 155daf47ea01b60b1998e7e9c45ea1cc6503b683 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Mon, 23 Apr 2018 16:32:02 -0400 Subject: [PATCH 23/33] don't anticipate spinny on navbar click to current page --- awx/ui/test/e2e/tests/smoke.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js index 931ef9f6d5..b77b23d69d 100644 --- a/awx/ui/test/e2e/tests/smoke.js +++ b/awx/ui/test/e2e/tests/smoke.js @@ -190,9 +190,6 @@ module.exports = { credentials.section.navigation.expect.element('@credentials').enabled; credentials.section.navigation.click('@credentials'); - credentials.waitForElementVisible('div.spinny'); - credentials.waitForElementNotVisible('div.spinny'); - credentials.section.list.waitForElementVisible('@add'); credentials.section.list.expect.element('@add').enabled; credentials.section.list.click('@add'); @@ -219,7 +216,6 @@ module.exports = { credentials.section.navigation.expect.element('@credentials').enabled; credentials.section.navigation.click('@credentials'); - credentials.waitForElementVisible('div.spinny'); credentials.waitForElementNotVisible('div.spinny'); credentials.section.list.waitForElementVisible('@add'); From 68975572f37484004916abc704a02e0f5b1e2aa8 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 24 Apr 2018 09:23:08 -0400 Subject: [PATCH 24/33] do not update modified_by for system fields --- awx/main/models/base.py | 12 +++++++++--- awx/main/tests/functional/models/test_job.py | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/awx/main/models/base.py b/awx/main/models/base.py index 7639bc4548..fcca82474c 100644 --- a/awx/main/models/base.py +++ b/awx/main/models/base.py @@ -256,6 +256,7 @@ class PrimordialModel(CreatedModifiedModel): def save(self, *args, **kwargs): update_fields = kwargs.get('update_fields', []) + fields_are_specified = bool(update_fields) user = get_current_user() if user and not user.id: user = None @@ -263,9 +264,14 @@ class PrimordialModel(CreatedModifiedModel): self.created_by = user if 'created_by' not in update_fields: update_fields.append('created_by') - self.modified_by = user - if 'modified_by' not in update_fields: - update_fields.append('modified_by') + # Update modified_by if not called with update_fields, or if any + # editable fields are present in update_fields + if ( + (not fields_are_specified) or + any(getattr(self._meta.get_field(name), 'editable', True) for name in update_fields)): + self.modified_by = user + if 'modified_by' not in update_fields: + update_fields.append('modified_by') super(PrimordialModel, self).save(*args, **kwargs) def clean_description(self): diff --git a/awx/main/tests/functional/models/test_job.py b/awx/main/tests/functional/models/test_job.py index bc166fd77d..ec23045fea 100644 --- a/awx/main/tests/functional/models/test_job.py +++ b/awx/main/tests/functional/models/test_job.py @@ -1,6 +1,7 @@ import pytest from awx.main.models import JobTemplate, Job +from crum import impersonate @pytest.mark.django_db @@ -49,3 +50,18 @@ def test_awx_custom_virtualenv_without_jt(project): job = Job.objects.get(pk=job.id) assert job.ansible_virtualenv_path == '/venv/fancy-proj' + + +@pytest.mark.django_db +def test_update_parent_instance(job_template, alice): + # jobs are launched as a particular user, user not saved as modified_by + with impersonate(alice): + assert job_template.current_job is None + assert job_template.status == 'never updated' + assert job_template.modified_by is None + job = job_template.jobs.create(status='new') + job.status = 'pending' + job.save() + assert job_template.current_job == job + assert job_template.status == 'pending' + assert job_template.modified_by is None From 7c621a91ee60e9820feb543fc44cc23d5ad1f18d Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 24 Apr 2018 11:26:36 -0400 Subject: [PATCH 25/33] use named formatting in error messages --- awx/api/serializers.py | 4 +++- awx/main/fields.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index ca9464f93b..bba331fa23 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2673,7 +2673,9 @@ class CredentialSerializer(BaseSerializer): for field in set(data.keys()) - valid_fields - set(credential_type.defined_fields): if data.get(field): raise serializers.ValidationError( - {"detail": _("'%s' is not a valid field for %s") % (field, credential_type.name)} + {"detail": _("'{field_name}' is not a valid field for {credential_type_name}").format( + field_name=field, credential_type_name=credential_type.name + )} ) value.pop('kind', None) return value diff --git a/awx/main/fields.py b/awx/main/fields.py index 44389f3879..14e1cc6ad0 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -59,7 +59,8 @@ __all__ = ['AutoOneToOneField', 'ImplicitRoleField', 'JSONField', def __enum_validate__(validator, enums, instance, schema): if instance not in enums: yield jsonschema.exceptions.ValidationError( - _("'%s' is not one of ['%s']") % (instance, "', '".join(enums)) + _("'{value}' is not one of ['{allowed_values}']").format( + value=instance, allowed_values="', '".join(enums)) ) @@ -729,7 +730,8 @@ class CredentialTypeInputField(JSONSchemaField): for key in ('choices', 'multiline', 'format', 'secret',): if key in field and field['type'] != 'string': raise django_exceptions.ValidationError( - _('%s not allowed for %s type (%s)' % (key, field['type'], field['id'])), + _('{sub_key} not allowed for {element_type} type ({element_id})'.format( + sub_key=key, element_type=field['type'], element_id=field['id'])), code='invalid', params={'value': value}, ) @@ -826,13 +828,15 @@ class CredentialTypeInjectorField(JSONSchemaField): ).from_string(tmpl).render(valid_namespace) except UndefinedError as e: raise django_exceptions.ValidationError( - _('%s uses an undefined field (%s)') % (key, e), + _('{sub_key} uses an undefined field ({error_msg})').format( + sub_key=key, error_msg=e), code='invalid', params={'value': value}, ) except TemplateSyntaxError as e: raise django_exceptions.ValidationError( - _('Syntax error rendering template for %s inside of %s (%s)') % (key, type_, e), + _('Syntax error rendering template for {sub_key} inside of {type} ({error_msg})').format( + sub_key=key, type=type_, error_msg=e), code='invalid', params={'value': value}, ) From 13550acb9105cdd224776430bb55222bfc2cddeb Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 24 Apr 2018 10:49:04 -0400 Subject: [PATCH 26/33] fix cross-talk between JT-proj due to arg mutability --- awx/main/models/unified_jobs.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index ab03389535..943956f7ac 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -263,14 +263,7 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio if field not in update_fields: update_fields.append(field) # Do the actual save. - try: - super(UnifiedJobTemplate, self).save(*args, **kwargs) - except ValueError: - # A fix for https://trello.com/c/S4rU1F21 - # Does not resolve the root cause. Tis merely a bandaid. - if 'scm_delete_on_next_update' in update_fields: - update_fields.remove('scm_delete_on_next_update') - super(UnifiedJobTemplate, self).save(*args, **kwargs) + super(UnifiedJobTemplate, self).save(*args, **kwargs) def _get_current_status(self): @@ -722,7 +715,10 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique def _get_parent_instance(self): return getattr(self, self._get_parent_field_name(), None) - def _update_parent_instance_no_save(self, parent_instance, update_fields=[]): + def _update_parent_instance_no_save(self, parent_instance, update_fields=None): + if update_fields is None: + update_fields = [] + def parent_instance_set(key, val): setattr(parent_instance, key, val) if key not in update_fields: From 619ec905b28e8bf5a0544dec15e72db396e78bac Mon Sep 17 00:00:00 2001 From: chris meyers Date: Tue, 24 Apr 2018 14:05:38 -0400 Subject: [PATCH 27/33] policy fields not required * They were previously not required until a min/max was enforced. This caused the fields to, unintentionally, be required. * This fix makes the policy fields not required and provides sane defaults. --- awx/api/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index bba331fa23..99bdf339ea 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -4587,8 +4587,8 @@ class InstanceGroupSerializer(BaseSerializer): percent_capacity_remaining = serializers.SerializerMethodField() jobs_running = serializers.SerializerMethodField() instances = serializers.SerializerMethodField() - policy_instance_percentage = serializers.IntegerField(min_value=0, max_value=100) - policy_instance_minimum = serializers.IntegerField(min_value=0) + policy_instance_percentage = serializers.IntegerField(min_value=0, max_value=100, required=False, initial=0) + policy_instance_minimum = serializers.IntegerField(min_value=0, required=False, initial=0) class Meta: model = InstanceGroup From c98ede2f271401bc3a7f893e2f1358d15654f10e Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 24 Apr 2018 16:53:10 -0400 Subject: [PATCH 28/33] fix a bug in custom virtualenv when Project.organization is None see: https://github.com/ansible/tower/issues/1490 --- awx/main/models/jobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index d60833edeb..51394aa830 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -538,7 +538,7 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana for virtualenv in ( self.job_template.custom_virtualenv if self.job_template else None, self.project.custom_virtualenv, - self.project.organization.custom_virtualenv + self.project.organization.custom_virtualenv if self.project.organization else None ): if virtualenv: return virtualenv From 05419d010bb9353bfce2c5f8346a78151b866814 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 24 Apr 2018 21:40:11 -0400 Subject: [PATCH 29/33] Update group cluster policies on save, not just created Currently updating policy settings doesn't trigger a re-evaluation of instance group policies, this makes sure we re-evaluate in the event that anything changes. --- awx/main/models/ha.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/awx/main/models/ha.py b/awx/main/models/ha.py index b7e50ec2b4..471276c560 100644 --- a/awx/main/models/ha.py +++ b/awx/main/models/ha.py @@ -192,9 +192,8 @@ class JobOrigin(models.Model): @receiver(post_save, sender=InstanceGroup) def on_instance_group_saved(sender, instance, created=False, raw=False, **kwargs): - if created: - from awx.main.tasks import apply_cluster_membership_policies - connection.on_commit(lambda: apply_cluster_membership_policies.apply_async()) + from awx.main.tasks import apply_cluster_membership_policies + connection.on_commit(lambda: apply_cluster_membership_policies.apply_async()) @receiver(post_save, sender=Instance) From 4af8a532321d783382f80a59491ae4e9256ebd2c Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 24 Apr 2018 16:31:08 -0400 Subject: [PATCH 30/33] Remove Instance Group concept/usage from WorkflowJobs This also relaxes some of the task manager rules on Instance Groups down the full stack such that workflow jobs tend to shortcut the processing or omit it altogether. This lets the workflow job spawning logic exist outside of the instance group queues, which it doesn't need to participate in in the first place. --- awx/main/managers.py | 2 -- awx/main/models/workflow.py | 2 +- awx/main/scheduler/task_manager.py | 10 +++++++--- .../task_management/test_rampart_groups.py | 14 +++++++++++++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/awx/main/managers.py b/awx/main/managers.py index 1adb75e913..274a0ef774 100644 --- a/awx/main/managers.py +++ b/awx/main/managers.py @@ -178,8 +178,6 @@ class InstanceGroupManager(models.Manager): if t.status == 'waiting' or not t.execution_node: # Subtract capacity from any peer groups that share instances if not t.instance_group: - logger.warning('Excluded %s from capacity algorithm ' - '(missing instance_group).', t.log_format) impacted_groups = [] elif t.instance_group.name not in ig_ig_mapping: # Waiting job in group with 0 capacity has no collateral impact diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index f43a43cd24..c63bbc6f1f 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -474,7 +474,7 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio @property def preferred_instance_groups(self): - return self.global_instance_groups + return [] ''' A WorkflowJob is a virtual job. It doesn't result in a celery task. diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py index f988e76fd3..b3d5ed14f1 100644 --- a/awx/main/scheduler/task_manager.py +++ b/awx/main/scheduler/task_manager.py @@ -259,7 +259,7 @@ class TaskManager(): else: if type(task) is WorkflowJob: task.status = 'running' - if not task.supports_isolation() and rampart_group.controller_id: + elif not task.supports_isolation() and rampart_group.controller_id: # non-Ansible jobs on isolated instances run on controller task.instance_group = rampart_group.controller logger.info('Submitting isolated %s to queue %s via %s.', @@ -271,7 +271,8 @@ class TaskManager(): task.celery_task_id = str(uuid.uuid4()) task.save() - self.consume_capacity(task, rampart_group.name) + if rampart_group is not None: + self.consume_capacity(task, rampart_group.name) def post_commit(): task.websocket_emit_status(task.status) @@ -281,7 +282,7 @@ class TaskManager(): connection.on_commit(post_commit) def process_running_tasks(self, running_tasks): - map(lambda task: self.graph[task.instance_group.name]['graph'].add_job(task), running_tasks) + map(lambda task: self.graph[task.instance_group.name]['graph'].add_job(task) if task.instance_group else None, running_tasks) def create_project_update(self, task): project_task = Project.objects.get(id=task.project_id).create_project_update( @@ -447,6 +448,9 @@ class TaskManager(): continue preferred_instance_groups = task.preferred_instance_groups found_acceptable_queue = False + if isinstance(task, WorkflowJob): + self.start_task(task, None, task.get_jobs_fail_chain()) + continue for rampart_group in preferred_instance_groups: remaining_capacity = self.get_remaining_capacity(rampart_group.name) if remaining_capacity <= 0: diff --git a/awx/main/tests/functional/task_management/test_rampart_groups.py b/awx/main/tests/functional/task_management/test_rampart_groups.py index 9b4b3eac44..ce79b78003 100644 --- a/awx/main/tests/functional/task_management/test_rampart_groups.py +++ b/awx/main/tests/functional/task_management/test_rampart_groups.py @@ -2,7 +2,7 @@ import pytest import mock from datetime import timedelta from awx.main.scheduler import TaskManager -from awx.main.models import InstanceGroup +from awx.main.models import InstanceGroup, WorkflowJob from awx.main.tasks import apply_cluster_membership_policies @@ -77,6 +77,18 @@ def test_multi_group_with_shared_dependency(instance_factory, default_instance_g assert TaskManager.start_task.call_count == 2 +@pytest.mark.django_db +def test_workflow_job_no_instancegroup(workflow_job_template_factory, default_instance_group, mocker): + wfjt = workflow_job_template_factory('anicedayforawalk').workflow_job_template + wfj = WorkflowJob.objects.create(workflow_job_template=wfjt) + wfj.status = "pending" + wfj.save() + with mocker.patch("awx.main.scheduler.TaskManager.start_task"): + TaskManager().schedule() + TaskManager.start_task.assert_called_once_with(wfj, None, []) + assert wfj.instance_group is None + + @pytest.mark.django_db def test_overcapacity_blocking_other_groups_unaffected(instance_factory, default_instance_group, mocker, instance_group_factory, job_template_factory): From c691d16b1195aafee5ab4dab5f583932ed2635eb Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 11 Apr 2018 15:45:14 -0400 Subject: [PATCH 31/33] validate instance group host list --- awx/api/serializers.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 99bdf339ea..c774898d0d 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -4587,8 +4587,22 @@ class InstanceGroupSerializer(BaseSerializer): percent_capacity_remaining = serializers.SerializerMethodField() jobs_running = serializers.SerializerMethodField() instances = serializers.SerializerMethodField() - policy_instance_percentage = serializers.IntegerField(min_value=0, max_value=100, required=False, initial=0) - policy_instance_minimum = serializers.IntegerField(min_value=0, required=False, initial=0) + # NOTE: help_text is duplicated from field definitions, no obvious way of + # both defining field details here and also getting the field's help_text + policy_instance_percentage = serializers.IntegerField( + default=0, min_value=0, max_value=100, required=False, initial=0, + help_text=_("Minimum percentage of all instances that will be automatically assigned to " + "this group when new instances come online.") + ) + policy_instance_minimum = serializers.IntegerField( + default=0, min_value=0, required=False, initial=0, + help_text=_("Static minimum number of Instances that will be automatically assign to " + "this group when new instances come online.") + ) + policy_instance_list = serializers.ListField( + child=serializers.CharField(), + help_text=_("List of exact-match Instances that will be assigned to this group") + ) class Meta: model = InstanceGroup @@ -4605,6 +4619,14 @@ class InstanceGroupSerializer(BaseSerializer): res['controller'] = self.reverse('api:instance_group_detail', kwargs={'pk': obj.controller_id}) return res + def validate_policy_instance_list(self, value): + for instance_name in value: + if value.count(instance_name) > 1: + raise serializers.ValidationError(_('Duplicate entry {}.').format(instance_name)) + if not Instance.objects.filter(hostname=instance_name).exists(): + raise serializers.ValidationError(_('{} is not a valid hostname of an existing instance.').format(instance_name)) + return value + def get_jobs_qs(self): # Store running jobs queryset in context, so it will be shared in ListView if 'running_jobs' not in self.context: From 14c6265b270ff47dbb95656f401b39018636d0c0 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Tue, 24 Apr 2018 12:00:55 -0400 Subject: [PATCH 32/33] ensure instance policy percentages round up --- awx/main/tests/functional/test_instances.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/awx/main/tests/functional/test_instances.py b/awx/main/tests/functional/test_instances.py index 11484dfc6e..91dee86b9e 100644 --- a/awx/main/tests/functional/test_instances.py +++ b/awx/main/tests/functional/test_instances.py @@ -60,6 +60,21 @@ def test_policy_instance_few_instances(mock, instance_factory, instance_group_fa assert i2 in ig_4.instances.all() +@pytest.mark.django_db +@mock.patch('awx.main.tasks.handle_ha_toplogy_changes', return_value=None) +def test_policy_instance_distribution_round_up(mock, instance_factory, instance_group_factory): + i1 = instance_factory("i1") + i2 = instance_factory("i2") + i3 = instance_factory("i3") + i4 = instance_factory("i4") + i5 = instance_factory("i5") + ig_1 = instance_group_factory("ig1", percentage=79) + apply_cluster_membership_policies() + assert len(ig_1.instances.all()) == 4 + assert set([i1, i2, i3, i4]) == set(ig_1.instances.all()) + assert i5 not in ig_1.instances.all() + + @pytest.mark.django_db @mock.patch('awx.main.tasks.handle_ha_toplogy_changes', return_value=None) def test_policy_instance_distribution_uneven(mock, instance_factory, instance_group_factory): From b7f280588c8a1b2739f38ff557daa57a2b84bc4d Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 25 Apr 2018 09:35:45 -0400 Subject: [PATCH 33/33] add handling for missing related items of events --- awx/main/models/events.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/awx/main/models/events.py b/awx/main/models/events.py index 6f240cfdf4..21dcd90a24 100644 --- a/awx/main/models/events.py +++ b/awx/main/models/events.py @@ -2,7 +2,7 @@ import datetime import logging from django.conf import settings -from django.db import models +from django.db import models, DatabaseError from django.utils.dateparse import parse_datetime from django.utils.timezone import utc from django.utils.translation import ugettext_lazy as _ @@ -15,6 +15,8 @@ from awx.main.utils import ignore_inventory_computed_fields analytics_logger = logging.getLogger('awx.analytics.job_events') +logger = logging.getLogger('awx.main.models.events') + __all__ = ['JobEvent', 'ProjectUpdateEvent', 'AdHocCommandEvent', 'InventoryUpdateEvent', 'SystemJobEvent'] @@ -323,7 +325,10 @@ class BasePlaybookEvent(CreatedModifiedModel): hostnames = self._hostnames() self._update_host_summary_from_stats(hostnames) - self.job.inventory.update_computed_fields() + try: + self.job.inventory.update_computed_fields() + except DatabaseError: + logger.exception('Computed fields database error saving event {}'.format(self.pk)) @@ -441,6 +446,9 @@ class JobEvent(BasePlaybookEvent): def _update_host_summary_from_stats(self, hostnames): with ignore_inventory_computed_fields(): + if not self.job or not self.job.inventory: + logger.info('Event {} missing job or inventory, host summaries not updated'.format(self.pk)) + return qs = self.job.inventory.hosts.filter(name__in=hostnames) job = self.job for host in hostnames: