@@ -73,8 +73,8 @@
name="login_password"
id="login-password"
class="form-control LoginModal-field"
- ng-model="login_password" required
- autocomplete="off">
+ ng-model="login_password"
+ required>
}
- *
- * @typedef {Object} Tower.SystemTracking.RenderOptions
- * @property {string} nameKey - The name of the key that is used to locate facts from basisFacts in comparatorFacts
- * @property {string|string[]} compareKey - A single key or list of keys to compare in the two fact collections
- * @property {Tower.SystemTracking.KeyNameMap} keyNameMap - An object mapping existing key names to new key names for display
- * @property {Tower.SystemTracking.FactTemplate} factTemplate - An optional template used as the string for comparing and displaying a fact
- * @property {boolean} supportsValueArray - Indicates that the module we're rendering supports values in an array of strings rather than just a string; iterim measure to make sure modules with multiple facts matching nameKey don't get evaluated because we won't know how to dipslay them
- *
- * @typedef {(string|boolean)} Tower.SystemTracking.KeyNameMapValue - The name you want to use for the display of a key or "true" to indicate a key should be displayed without changing its name (all keys are hidden by default)
- *
- * @typedef {Object.
} Tower.SystemTracking.KeyNameMap - An object whose keys are the names of keys that exist in a fact and whose values control how that key is displayed
- *
- * @typedef {{displayKeyPath: string, nestingLevel: number, facts: Array.}} Tower.SystemTracking.FactComparisonDescriptor
- *
- * @typedef {{keyName: string, value1: Tower.SystemTracking.FactComparisonValue, value2: Tower.SystemTracking.FactComparisonValue, isDivergent: boolean}} Tower.SystemTracking.FactComparisonResult
- *
- * @typedef {(string|string[])} Tower.SystemTracking.FactComparisonValue
- *
- */
-export default
- function flatCompare(basisFacts,
- comparatorFacts, renderOptions) {
-
- var nameKey = renderOptions.nameKey;
- var compareKeys = renderOptions.compareKey;
- var keyNameMap = renderOptions.keyNameMap;
- var factTemplate = renderOptions.factTemplate;
-
-
- return basisFacts.facts.reduce(function(arr, basisFact) {
-
- // First, make sure this fact hasn't already been processed, if it
- // has don't process it again
- //
- if (_.any(arr, { displayKeyPath: basisFact[nameKey] })) {
- return arr;
- }
-
- var searcher = {};
- searcher[nameKey] = basisFact[nameKey];
-
- var containsValueArray = false;
- var matchingFacts = _.where(comparatorFacts.facts, searcher);
- var comparisonResults;
- var diffs;
-
- // If this fact exists more than once in `basisFacts`, then
- // we need to process it differently
- //
- var otherBasisFacts = _.where(basisFacts.facts, searcher);
- if (renderOptions.supportsValueArray && otherBasisFacts.length > 1) {
- comparisonResults = processFactsForValueArray(basisFacts.position, otherBasisFacts, matchingFacts);
- } else {
- comparisonResults = processFactsForSingleValue(basisFact, matchingFacts[0] || {});
- }
-
- function processFactsForValueArray(basisPosition, basisFacts, comparatorFacts) {
-
- function renderFactValues(facts) {
- return facts.map(function(fact) {
- return factTemplate.render(fact);
- });
- }
-
- var basisFactValues = renderFactValues(basisFacts);
- var comparatorFactValues = renderFactValues(comparatorFacts);
-
- var slottedValues = slotFactValues(basisPosition, basisFactValues, comparatorFactValues);
-
- var remaining = _.difference(slottedValues.left, slottedValues.right);
-
- if (_.isEmpty(remaining)) {
- slottedValues.isDivergent = false;
- } else {
- slottedValues.isDivergent = true;
- containsValueArray = true;
- }
-
- return slottedValues;
- }
-
- function processFactsForSingleValue(basisFact, comparatorFact) {
- // Perform comparison and get back comparisonResults; like:
- // { 'value':
- // { leftValue: 'blah',
- // rightValue: 'doo'
- // }
- // };
- //
- return _.reduce(compareKeys, function(result, compareKey) {
-
- var isNestedDisplay = false;
- var basisFactValue = basisFact[compareKey];
- var comparatorFactValue = comparatorFact[compareKey];
- var slottedValues;
-
- if (_.isUndefined(basisFactValue) && _.isUndefined(comparatorFactValue)) {
- return result;
- }
-
- var template = factTemplate;
-
- if (_.isObject(template) && template.hasOwnProperty(compareKey)) {
- template = template[compareKey];
-
- // 'true' means render the key without formatting
- if (template === true) {
- template =
- { render: function(fact) { return fact[compareKey]; }
- };
- }
-
- isNestedDisplay = true;
- } else if (typeof template.hasTemplate === 'function' && !template.hasTemplate()) {
- template =
- { render: function(fact) { return fact[compareKey]; }
- };
- isNestedDisplay = true;
- } else if (typeof factTemplate.render === 'function') {
- template = factTemplate;
- } else if (!template.hasOwnProperty(compareKey)) {
- return result;
- }
-
- // if (!renderOptions.supportsValueArray) {
- // comparatorFact = comparatorFact[0];
- // }
-
- basisFactValue = template.render(basisFact);
- comparatorFactValue = template.render(comparatorFact);
-
- slottedValues = slotFactValues(basisFacts.position,
- basisFactValue,
- comparatorFactValue);
-
- if (slottedValues.left !== slottedValues.right) {
- slottedValues.isDivergent = true;
- } else {
- slottedValues.isDivergent = false;
- }
-
- if (isNestedDisplay) {
- result[compareKey] = slottedValues;
- } else {
- result = slottedValues;
- }
-
- return result;
- }, {});
- }
-
- var hasDiffs =
- _.any(comparisonResults, { isDivergent: true }) ||
- comparisonResults.isDivergent === true;
-
- if (hasDiffs && typeof factTemplate.render === 'function') {
-
- diffs =
- { keyName: basisFact[nameKey],
- value1: comparisonResults.left,
- value2: comparisonResults.right
- };
-
- } else if (hasDiffs) {
-
- diffs =
- _(comparisonResults).map(function(slottedValues, key) {
-
- var keyName = key;
-
- if (keyNameMap && keyNameMap[key]) {
- keyName = keyNameMap[key];
- }
-
- return { keyName: keyName,
- value1: slottedValues.left,
- value2: slottedValues.right,
- isDivergent: slottedValues.isDivergent
- };
- }).compact()
- .value();
- }
-
- var descriptor =
- { displayKeyPath: basisFact[nameKey],
- nestingLevel: 0,
- containsValueArray: containsValueArray,
- facts: diffs
- };
-
- return arr.concat(descriptor);
- }, []).filter(function(diff) {
- return !_.isEmpty(diff.facts);
- });
-
- }
diff --git a/awx/ui/client/src/system-tracking/compare-facts/main.js b/awx/ui/client/src/system-tracking/compare-facts/main.js
deleted file mode 100644
index df8aa67e15..0000000000
--- a/awx/ui/client/src/system-tracking/compare-facts/main.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import compareNestedFacts from './nested';
-import compareFlatFacts from './flat';
-import FactTemplate from './fact-template';
-
-export function compareFacts(module, facts) {
-
-
- var renderOptions = _.merge({}, module);
-
- // If the module has a template or includes a list of keys to display,
- // then perform a flat comparison, otherwise assume nested
- //
- if (renderOptions.factTemplate || renderOptions.nameKey) {
- // For flat structures we compare left-to-right, then right-to-left to
- // make sure we get a good comparison between both hosts
-
- if (_.isPlainObject(renderOptions.factTemplate)) {
- renderOptions.factTemplate =
- _.mapValues(renderOptions.factTemplate, function(template) {
- if (typeof template === 'string' || typeof template === 'function') {
- return new FactTemplate(template);
- } else {
- return template;
- }
- });
- } else {
- renderOptions.factTemplate = new FactTemplate(renderOptions.factTemplate);
- }
-
- var leftToRight = compareFlatFacts(facts[0], facts[1], renderOptions);
- var rightToLeft = compareFlatFacts(facts[1], facts[0], renderOptions);
-
- return _(leftToRight)
- .concat(rightToLeft)
- .unique('displayKeyPath')
- .thru(function(result) {
- return { factData: result,
- isNestedDisplay: _.isPlainObject(renderOptions.factTemplate),
- leftData: facts[0].facts,
- rightData: facts[1].facts
- };
- })
- .value();
- } else {
- return { factData: compareNestedFacts(facts[0], facts[1]),
- isNestedDisplay: true
- };
- }
-}
diff --git a/awx/ui/client/src/system-tracking/compare-facts/nested-helpers.js b/awx/ui/client/src/system-tracking/compare-facts/nested-helpers.js
deleted file mode 100644
index 3a8fea8926..0000000000
--- a/awx/ui/client/src/system-tracking/compare-facts/nested-helpers.js
+++ /dev/null
@@ -1,204 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-export function formatFacts(diffedResults) {
-
- var loggingEnabled = false;
-
- function log(msg, obj) {
- if (loggingEnabled) {
- /* jshint ignore:start */
- console.log(msg, obj);
- /* jshint ignore:end */
- }
- return obj;
- }
-
- function isFlatFactArray(fact) {
- // Flat arrays will have the index as their
- // keyName
- return !_.isNaN(Number(fact.keyName));
- }
-
- function isNestedFactArray(fact) {
- // Nested arrays will have the index as the last element
- // in the keypath
- return !_.isNaN(Number(_.last(fact.keyPath)));
- }
- function isFactArray(fact) {
- return isNestedFactArray(fact) || isFlatFactArray(fact);
- }
-
- // Explode flat results into groups based matching
- // parent keypaths
- var grouped = _.groupBy(diffedResults, function(obj) {
- var leftKeyPathStr = obj.keyPath.join('.');
- log('obj.keyPath', obj.keyPath);
- return log(' reduced key', _.reduce(diffedResults, function(result, obj2) {
- log(' obj2.keyPath', obj2.keyPath);
- var rightKeyPathStr = obj2.keyPath.join('.');
- if (isFactArray(obj)) {
- log(' number hit!', Number(_.last(obj.keyPath)));
- return obj.keyPath.slice(0,-1);
- } else if (rightKeyPathStr && leftKeyPathStr !== rightKeyPathStr && log(' intersection', _.intersection(obj.keyPath, obj2.keyPath).join('.')) === rightKeyPathStr) {
- log(' hit!');
- return obj2.keyPath;
- } else {
- log(' else hit!');
- return result;
- }
- }, obj.keyPath)).join('.');
- });
-
- var normalized = _.mapValues(grouped, function(arr, rootKey) {
- log('processing', rootKey);
- var nestingLevel = 0;
- var trailingLength;
- return _(arr).sortBy('keyPath.length').tap(function(arr) {
- // Initialize trailing length to the shortest keyPath length
- // in the array (first item because we know it's sorted now)
- trailingLength = arr[0].keyPath.length;
- }).map(function(obj) {
- var keyPathStr = obj.keyPath.join('.');
- log(' calculating displayKeyPath for', keyPathStr);
- var rootKeyPath = rootKey.split('.');
- var displayKeyPath;
- // var factArrayIndex;
- var isFactArrayProp = isFactArray(obj);
-
- if (obj.keyPath.length > trailingLength) {
- nestingLevel++;
- trailingLength = obj.keyPath.length;
- }
-
- if (isNestedFactArray(obj)) {
- // factArrayIndex = obj.keyPath.length > 1 ? Number(_.last(obj.keyPath)) : obj.keyName;
- displayKeyPath = _.initial(obj.keyPath).join('.');
- // } else {
- // displayKeyPath = _.difference(obj.keyPath, rootKeyPath).join('.');
- } else {
- displayKeyPath = rootKeyPath.join('.');
- }
-
-
- obj.displayKeyPath = displayKeyPath;
- obj.nestingLevel = nestingLevel;
- // obj.arrayPosition = factArrayIndex;
- obj.isArrayMember = isFactArrayProp;
- return obj;
- }).value();
- });
-
- var flattened = _.reduce(normalized, function(flat, value) {
-
- var groupedValues = _.groupBy(value, 'displayKeyPath');
-
- var groupArr =
- _.reduce(groupedValues, function(groupArr, facts, key) {
- var isArray = facts[0].isArrayMember;
- var nestingLevel = facts[0].nestingLevel;
-
- if (isArray) {
- facts = _(facts)
- .groupBy('arrayPosition')
- .values()
- .value();
- }
-
- var displayObj =
- { keyPath: key.split('.'),
- displayKeyPath: key,
- isNestedDisplay: true,
- facts: facts,
- isFactArray: isArray,
- nestingLevel: nestingLevel
- };
- return groupArr.concat(displayObj);
- }, []);
-
- return flat.concat(groupArr);
-
- }, []);
-
- return flattened;
-}
-
-export function findFacts(factData) {
- var leftData = factData[0].facts;
- var rightData = factData[1].facts;
-
- // For value types (boolean, number) or complex objects use the value
- // as is. For collection types, return 'absent' if it's empty
- // otherwise, use the value as is.
- //
- function factValueOrAbsent(value) {
-
- if (_.isBoolean(value) ||
- _.isNumber(value)) {
- return value;
- }
-
- if (_.isNull(value) || _.isEmpty(value)) {
- return 'absent';
- }
-
- return value;
- }
-
- function factObject(keyPath, key, leftValue, rightValue) {
- var obj =
- { keyPath: keyPath,
- keyName: key
- };
-
- leftValue = factValueOrAbsent(leftValue);
- rightValue = factValueOrAbsent(rightValue);
-
- if (factData[0].position === 'left') {
- obj.value1 = leftValue;
- obj.value2 = rightValue;
- } else {
- obj.value1 = rightValue;
- obj.value2 = leftValue;
- }
-
- return obj;
- }
-
- function descend(parentValue, parentKey, parentKeys) {
- if (_.isObject(parentValue)) {
- return _.reduce(parentValue, function(all, value, key) {
- var merged = descend(value, key, parentKeys.concat(key));
- return all.concat(merged);
- }, []);
- } else {
-
- // default value in _.get ('absent') only hits if it's undefined, so we need to handle other falsey cases with ||
- var rightValue =
- _.get(rightData,
- parentKeys);
-
- return factObject(
- // TODO: Currently parentKeys is getting passed with the final key
- // as the last element. Figure out how to have it passed
- // in correctly, so that it's all the keys leading up to
- // the value, but not the value's key itself
- // In the meantime, slicing the last element off the array
- parentKeys.slice(0,-1),
- parentKey,
- parentValue,
- rightValue);
- }
- }
-
- return _.reduce(leftData, function(mergedFacts, parentValue, parentKey) {
-
- var merged = descend(parentValue, parentKey, [parentKey]);
-
- return _.flatten(mergedFacts.concat(merged));
-
- }, []);
-}
diff --git a/awx/ui/client/src/system-tracking/compare-facts/nested.js b/awx/ui/client/src/system-tracking/compare-facts/nested.js
deleted file mode 100644
index 31e98526a7..0000000000
--- a/awx/ui/client/src/system-tracking/compare-facts/nested.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import {formatFacts, findFacts} from './nested-helpers';
-
-export default function nestedCompare(basisFacts, comparatorFacts) {
-
- if (_.isEmpty(basisFacts.facts)) {
- var tmp = _.merge({}, basisFacts);
- basisFacts = _.merge({}, comparatorFacts);
- comparatorFacts = tmp;
- }
-
- var factsList = [basisFacts, comparatorFacts];
- factsList = findFacts(factsList);
- factsList = compareFacts(factsList);
- return formatFacts(factsList);
-
- function compareFacts(factsList) {
-
- function serializedFactKey(fact) {
- return fact.keyPath.join('.');
- }
-
- var groupedByParent =
- _.groupBy(factsList, function(fact) {
- return serializedFactKey(fact);
- });
-
-
- var diffed = _.mapValues(groupedByParent, function(facts) {
- return facts.filter(function(fact) {
- return fact.value1 !== fact.value2;
- }).map(function(fact) {
- // TODO: Can we determine a "compare order" and be able say
- // which property is actually divergent?
- return _.merge({}, fact, { isDivergent: true });
- });
- });
-
- var itemsWithDiffs =
- _.filter(factsList, function(facts) {
- var groupedData = diffed[serializedFactKey(facts)];
- return !_.isEmpty(groupedData);
- });
-
- var keysWithDiffs =
- _.reduce(diffed, function(diffs, facts, key) {
- diffs[key] =
- facts.reduce(function(diffKeys, fact) {
- if (fact.isDivergent) {
- return diffKeys.concat(fact.keyName);
- }
- return diffKeys;
- }, []);
- return diffs;
- }, {});
-
- var factsWithDivergence =
- _.mapValues(itemsWithDiffs, function(fact) {
- var divergentKeys = keysWithDiffs[serializedFactKey(fact)];
- if (divergentKeys) {
- var isDivergent = _.include(divergentKeys, fact.keyName);
- return _.merge({}, fact, { isDivergent: isDivergent });
- } else {
- return _.merge({}, fact, { isDivergent: false });
- }
- });
-
- return factsWithDivergence;
-
- }
-}
diff --git a/awx/ui/client/src/system-tracking/data-services/dedupe-versions.js b/awx/ui/client/src/system-tracking/data-services/dedupe-versions.js
deleted file mode 100644
index e6f2704008..0000000000
--- a/awx/ui/client/src/system-tracking/data-services/dedupe-versions.js
+++ /dev/null
@@ -1,42 +0,0 @@
-export default
- function dedupeVersions(nonEmptyResults) {
-
- if (_.any(nonEmptyResults, 'versions.length', 0)) {
- return _.pluck(nonEmptyResults, 'versions[0]');
- }
-
- // if the version that will be displayed on the left is before the
- // version that will be displayed on the right, flip them
- if (nonEmptyResults[0].versions[0].timestamp > nonEmptyResults[1].versions[0].timestamp) {
- nonEmptyResults = nonEmptyResults.reverse();
- }
-
- var firstTimestamp = nonEmptyResults[0].versions[0].timestamp;
-
- var hostIdsWithDupes =
- _(nonEmptyResults)
- .pluck('versions[0]')
- .filter('timestamp', firstTimestamp)
- .map(function(version, index) {
- return nonEmptyResults[index].hostId;
- })
- .value();
-
- if (hostIdsWithDupes.length === 1) {
- return _.pluck(nonEmptyResults, 'versions[0]');
- }
-
- var bestScanResults = _.max(nonEmptyResults, "versions.length");
-
- return nonEmptyResults.map(function(scan, index) {
- var hasDupe =
- _.include(hostIdsWithDupes, scan.hostId);
-
- if (hasDupe && index === 1) {
- return bestScanResults.versions[0];
- } else {
- return bestScanResults.versions[1];
- }
- });
-
- }
diff --git a/awx/ui/client/src/system-tracking/data-services/fact-scan-data.service.js b/awx/ui/client/src/system-tracking/data-services/fact-scan-data.service.js
deleted file mode 100644
index 9805dfdf2d..0000000000
--- a/awx/ui/client/src/system-tracking/data-services/fact-scan-data.service.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-export default ['Rest', 'GetBasePath', 'ProcessErrors', 'lodashAsPromised',
-function (Rest, GetBasePath, ProcessErrors, _) {
-
- function buildUrl (host_id, module, startDate, endDate) {
- var url = GetBasePath('hosts') + host_id + '/fact_versions/',
- params= [["module", module] , ['from', startDate.format()], ['to', endDate.format()]];
-
- params = params.filter(function(p){
- return !_.isEmpty(p[1]);
- });
- params = params.map(function(p){
- return p.join("=");
- }).join("&");
- url = _.compact([url, params]).join("?");
- return url;
- }
-
- return {
- getFacts: function(version) {
- var promise;
- Rest.setUrl(version.related.fact_view);
- promise = Rest.get();
- return promise.then(function (response) {
- return response.data;
- }).catch(function (response) {
- ProcessErrors(null, response.data, response.status, null, {
- hdr: 'Error!',
- msg: 'Failed to get license info. GET returned status: ' +
- response.status
- });
- });
- },
-
- getVersion: function(versionParams){
- //move the build url into getVersion and have the
- // parameters passed into this
- var promise;
- var hostId = versionParams.hostId;
- var startDate = versionParams.dateRange.from;
- var endDate = versionParams.dateRange.to;
- var module = versionParams.moduleName;
-
- var url = buildUrl(hostId, module, startDate, endDate);
-
- Rest.setUrl(url);
- promise = Rest.get();
- return promise.then(function(response) {
- versionParams.versions = response.data.results;
- return versionParams;
- }).catch(function (response) {
- ProcessErrors(null, response.data, response.status, null, {
- hdr: 'Error!',
- msg: 'Failed to get license info. GET returned status: ' +
- response.status
- });
- });
- }
- };
-}];
diff --git a/awx/ui/client/src/system-tracking/data-services/get-data-for-comparison.factory.js b/awx/ui/client/src/system-tracking/data-services/get-data-for-comparison.factory.js
deleted file mode 100644
index 0c29b2433c..0000000000
--- a/awx/ui/client/src/system-tracking/data-services/get-data-for-comparison.factory.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import dedupeVersions from './dedupe-versions';
-
-export default
- [ 'factScanDataService',
- 'resolveEmptyVersions',
- 'lodashAsPromised',
- function(factScanDataService, resolveEmptyVersions, _) {
- return function(hostIds, moduleName, leftDate, rightDate) {
-
- var singleHostMode = false;
-
- if (hostIds.length === 1) {
- singleHostMode = true;
- hostIds = hostIds.concat(hostIds[0]);
- }
-
- var hostVersionParams =
- [{ hostId: hostIds[0],
- dateRange: leftDate,
- moduleName: moduleName
- },
- { hostId: hostIds[1],
- dateRange: rightDate,
- moduleName: moduleName
- }
- ];
-
- return _(factScanDataService.getVersion(hostVersionParams[1]))
- .then(function(result) {
- return resolveEmptyVersions(result);
- }).thenAll(function(firstResult) {
-
- return factScanDataService.getVersion(hostVersionParams[0])
- .then(function(secondResult) {
- if (_.isEmpty(secondResult.versions)) {
- secondResult = resolveEmptyVersions(secondResult);
- }
-
- return [firstResult, secondResult];
- });
- }).thenAll(function(results) {
- var finalSet;
-
- if (singleHostMode) {
- finalSet = dedupeVersions(results.reverse());
- } else {
- finalSet = _.pluck(results, 'versions[0]').reverse();
- }
-
- return finalSet;
- }).thenMap(function(versionData) {
- if (versionData) {
- return factScanDataService.getFacts(versionData);
- } else {
- return { fact: [] };
- }
- }).thenAll(function(hostFacts) {
- return hostFacts;
- });
- };
- }
- ];
diff --git a/awx/ui/client/src/system-tracking/data-services/get-module-options.factory.js b/awx/ui/client/src/system-tracking/data-services/get-module-options.factory.js
deleted file mode 100644
index 5a6b6f5eb4..0000000000
--- a/awx/ui/client/src/system-tracking/data-services/get-module-options.factory.js
+++ /dev/null
@@ -1,79 +0,0 @@
-var moduleConfig =
- { 'packages':
- { compareKey: ['release', 'version'],
- nameKey: 'name',
- sortKey: 1,
- factTemplate: "{{epoch|append:':'}}{{version}}-{{release}}{{arch|prepend:'.'}}",
- supportsValueArray: true
- },
- 'services':
- { compareKey: ['state', 'source'],
- nameKey: 'name',
- factTemplate: '{{state}} ({{source}})',
- sortKey: 2
- },
- 'files':
- { compareKey: ['size', 'mode', 'checksum', 'mtime', 'gid', 'uid'],
- keyNameMap:
- { 'uid': 'ownership'
- },
- factTemplate:
- { 'uid': 'user id: {{uid}}, group id: {{gid}}',
- 'mode': true,
- 'checksum': true,
- 'size': true,
- 'mtime': '{{mtime|formatEpoch}}'
- },
- nameKey: 'path',
- sortKey: 3
- },
- 'ansible':
- { sortKey: 4
- },
- 'custom':
- {
- }
- };
-
-function makeModule(option, index) {
- var name = option[0];
- var displayName = option[1];
- var config = moduleConfig.hasOwnProperty(name) ?
- moduleConfig[name] : moduleConfig.custom;
- var modulesCount = _.keys(moduleConfig).length - 1;
-
- config.name = name;
- config.displayName = displayName;
-
- // Use index to sort custom modules,
- // offset by built-in modules since
- // they have a hardcoded sort key
- //
- if (_.isUndefined(config.sortKey)) {
- config.sortKey = (index - 1) + modulesCount;
- }
-
- return config;
-}
-
-function factory(hostId, rest, getBasePath, _) {
- var url = [ getBasePath('hosts') + hostId,
- 'fact_versions'
- ].join('/');
-
- rest.setUrl(url);
- return _(rest.options())
- .then(function(response) {
- var choices = response.data.actions.GET.module.choices;
- return _.sortBy(choices, '1');
- }).thenMap(makeModule);
-}
-
-export default
- [ 'Rest',
- 'GetBasePath',
- 'lodashAsPromised',
- function(rest, getBasePath, lodash) {
- return _.partialRight(factory, rest, getBasePath, lodash);
- }
- ];
diff --git a/awx/ui/client/src/system-tracking/data-services/main.js b/awx/ui/client/src/system-tracking/data-services/main.js
deleted file mode 100644
index d08b7baec7..0000000000
--- a/awx/ui/client/src/system-tracking/data-services/main.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import factScanDataService from './fact-scan-data.service';
-import getDataForComparison from './get-data-for-comparison.factory';
-import getModuleOptions from './get-module-options.factory';
-import resolveEmptyVersions from './resolve-empty-versions.factory';
-import shared from '../../shared/main';
-
-export default
- angular.module('systemTracking.dataServices', [shared.name])
- .factory('getModuleOptions', getModuleOptions)
- .factory('getDataForComparison', getDataForComparison)
- .factory('resolveEmptyVersions', resolveEmptyVersions)
- .service('factScanDataService', factScanDataService);
diff --git a/awx/ui/client/src/system-tracking/data-services/resolve-empty-versions.factory.js b/awx/ui/client/src/system-tracking/data-services/resolve-empty-versions.factory.js
deleted file mode 100644
index 7c7552af87..0000000000
--- a/awx/ui/client/src/system-tracking/data-services/resolve-empty-versions.factory.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import moment from '../../shared/moment/moment';
-
-function resolveEmptyVersions(service, _, candidate, previousResult) {
-
- candidate = _.merge({}, candidate);
-
- // theoretically, returning no versions, but also returning only a single version for _a particular date_ acts as an empty version problem. If there is only one version returned, you'll need to check previous dates as well.
- if (_.isEmpty(candidate.versions) || candidate.versions.length === 1) {
- // this marks the end of the date put in the datepicker. this needs to be the end, rather than the beginning of the date, because you may have returned one valid version on the date the datepicker had in it.
- var originalStartDate = candidate.dateRange.to.clone();
-
- if (!_.isUndefined(previousResult)) {
- candidate.dateRange.from = moment(previousResult.versions[0].timestamp);
- } else {
- candidate.dateRange.from = originalStartDate.clone().subtract(1, 'year');
- }
-
- candidate.dateRange.to = originalStartDate;
-
- return service.getVersion(candidate);
- }
-
- return _.promise(candidate);
-
-}
-
-export default
- [ 'factScanDataService',
- 'lodashAsPromised',
- function(factScanDataService, lodash) {
- return _.partial(resolveEmptyVersions, factScanDataService, lodash);
- }
- ];
diff --git a/awx/ui/client/src/system-tracking/date-picker/date-picker.block.less b/awx/ui/client/src/system-tracking/date-picker/date-picker.block.less
deleted file mode 100644
index 207cfca6a5..0000000000
--- a/awx/ui/client/src/system-tracking/date-picker/date-picker.block.less
+++ /dev/null
@@ -1,37 +0,0 @@
-.DatePicker {
- flex: 1 0 auto;
- display: flex;
-
- &-icon {
- flex: initial;
- padding: 6px 12px;
- font-size: 14px;
- border-radius: 4px 0 0 4px;
- border: 1px solid @b7grey;
- border-right: 0;
- background-color: @default-bg;
- }
-
- &-icon:hover {
- background-color: @f6grey;
- }
-
- &-icon:focus,
- &-icon:active {
- background-color: @f6grey;
- }
-
- &-input {
- flex: 1 0 auto;
- border-radius: 0 4px 4px 0;
- border: 1px solid @b7grey;
- padding: 6px 12px;
- background-color: @fcgrey;
- }
-
- &-input:focus,
- &-input:active {
- outline-offset: 0;
- outline: 0;
- }
-}
diff --git a/awx/ui/client/src/system-tracking/date-picker/date-picker.directive.js b/awx/ui/client/src/system-tracking/date-picker/date-picker.directive.js
deleted file mode 100644
index ca972bfacf..0000000000
--- a/awx/ui/client/src/system-tracking/date-picker/date-picker.directive.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-/* jshint unused: vars */
-
-export default ['moment',
- 'templateUrl',
- function(moment, templateUrl) {
- return {
- restrict: 'E',
- scope: {
- date: '=',
- minDate: '=',
- autoUpdate: '=?',
- inputClass: '&'
- },
- templateUrl: templateUrl('system-tracking/date-picker/date-picker'),
- link: function(scope, element, attrs) {
-
- // We need to make sure this _never_ recurses, which sometimes happens
- // with two-way binding.
- var mustUpdateValue = true;
- scope.autoUpdate = scope.autoUpdate === false ? false : true;
-
- scope.$watch('minDate', function(newValue) {
- if (newValue) {
-
- if (scope.autoUpdate && scope.date.isBefore(newValue)) {
- scope.date = newValue;
- }
-
- $('.date', element).datepicker('setStartDate', newValue.toDate());
- }
- });
-
- scope.$watch('date', function(newValue) {
- if (newValue) {
- mustUpdateValue = false;
- scope.dateValue = newValue.format('L');
- }
- }, true);
-
- scope.$watch('dateValue', function(newValue) {
- var newDate = moment(newValue, ['L'], moment.locale());
-
- if (newValue && !newDate.isValid()) {
- scope.error = "That is not a valid date.";
- } else if (newValue) {
- scope.date = newDate;
- }
- mustUpdateValue = true;
- });
-
- var localeData =
- moment.localeData();
- var dateFormat = momentFormatToDPFormat(localeData._longDateFormat.L);
- var localeKey = momentLocaleToDPLocale(moment.locale());
-
- element.find(".DatePicker").addClass("input-prepend date");
- element.find(".DatePicker").find(".DatePicker-icon").addClass("add-on");
- $(".date").datepicker({
- autoclose: true,
- language: localeKey,
- format: dateFormat
- });
-
- function momentLocaleToDPLocale(localeKey) {
- var parts = localeKey.split('-');
-
- if (parts.length === 2) {
- var lastPart = parts[1].toUpperCase();
- return [parts[0], lastPart].join('-');
- } else {
- return localeKey;
- }
-
- }
-
- function momentFormatToDPFormat(momentFormat) {
- var resultFormat = momentFormat;
-
- function lowerCase(str) {
- return str.toLowerCase();
- }
-
- resultFormat = resultFormat.replace(/D{1,2}/, lowerCase);
-
- if (/MMM/.test(resultFormat)) {
- resultFormat = resultFormat.replace('MMM', 'M');
- } else {
- resultFormat = resultFormat.replace(/M{1,2}/, 'm');
- }
-
- resultFormat = resultFormat.replace(/Y{2,4}/, lowerCase);
-
- return resultFormat;
- }
- }
- };
- }
-];
diff --git a/awx/ui/client/src/system-tracking/date-picker/date-picker.partial.html b/awx/ui/client/src/system-tracking/date-picker/date-picker.partial.html
deleted file mode 100644
index 74bd409a6f..0000000000
--- a/awx/ui/client/src/system-tracking/date-picker/date-picker.partial.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
diff --git a/awx/ui/client/src/system-tracking/date-picker/main.js b/awx/ui/client/src/system-tracking/date-picker/main.js
deleted file mode 100644
index 21bbf0432b..0000000000
--- a/awx/ui/client/src/system-tracking/date-picker/main.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import datePicker from './date-picker.directive';
-
-export default
- angular.module('systemTracking.datePicker',
- [])
- .directive('datePicker', datePicker);
diff --git a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less
deleted file mode 100644
index 62512a73cc..0000000000
--- a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less
+++ /dev/null
@@ -1,138 +0,0 @@
-/** @define FactDataTable */
-
-.FactDataTable {
- &-row, &-headingRow, &-groupHeadingRow {
- display: flex;
- }
-
- &-row {
- padding: .5em 0;
- align-items: center;
- transition: background-color 100ms, border-color 100ms;
- border: solid 1px @default-bg;
-
- &:nth-child(even) {
- background-color: @default-no-items-bord;
- }
-
- &:hover {
- background-color: @default-list-header-bg;
- border-color: @default-border;
- }
-
- &--flexible {
- max-height: initial;
- align-items: flex-start;
- }
-
- }
-
- &-repeat {
- &:nth-child(even) {
- background-color: @default-no-items-bord;
- }
- }
-
- &-headingRow {
- background-color: @default-list-header-bg;
- border: none;
- padding: 8px 12px;
-
- .FactDataTable-column.FactDataTableHeading:first-child {
- padding-left: 0;
- }
- }
-
- &-groupHeadingRow {
- background-color: @default-icon-hov;
- padding: 1em 12px;
- color: @default-interface-txt;
- font-size: 14px;
- }
-
- &-column {
- padding: 8px;
- flex: 1 0 33%;
- align-self: flex-start;
- padding: 0;
- margin: 0;
- overflow: hidden;
- padding: 8px;
- word-wrap: break-word;
- &--offsetLeft {
- margin-left: 33%;
- }
- }
-
- &-columnArray {
- display: flex;
- flex-direction: column;
- }
-
- &-columnMember {
- margin-bottom: 16px;
- &:last-child {
- margin-bottom: inherit;
- }
- }
-}
-
-.FactDataError {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 100%;
- height: 200px;
- border-radius: 5px;
- border: 1px solid @list-no-items-bord;
- background-color: @default-no-items-bord;
- color: @list-no-items-txt;
- text-transform: uppercase;
-}
-
-.FactDataGroup {
- &-headings {
- &:hover {
- background-color: @default-bg;
- border-color: transparent;
- }
- }
- &-header {
- padding: 0;
- }
-}
-
-.FactDataTableHeading {
- display: flex;
- flex-wrap: wrap;
- align-items: flex-end;
- font-size: 14px;
- color: @default-interface-txt;
- text-transform: uppercase;
-
- &-host {
- margin: 0;
- }
- &-date {
- flex-basis: auto;
- }
-
- // Override some global styling on h3 tags
- h3 {
- margin: 1em initial;
- }
-}
-
-.FactDatum {
- &--divergent {
- //margin-bottom: 0.5rem;
- background-color: @default-err;
- border: none;
- color: @default-bg;
-
- &:hover {
- background-color: @default-err;
- border: none;
- }
- }
-}
diff --git a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.directive.js b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.directive.js
deleted file mode 100644
index 1c99f546a0..0000000000
--- a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.directive.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* jshint unused: vars */
-
-export default
- [ 'templateUrl',
- function(templateUrl) {
- return { restrict: 'E',
- templateUrl: templateUrl('system-tracking/fact-data-table/fact-data-table'),
- scope:
- { leftHostname: '=',
- rightHostname: '=',
- leftScanDate: '=',
- rightScanDate: '=',
- leftDataNoScans: '=',
- rightDataNoScans: '=',
- isNestedDisplay: '=',
- singleResultView: '=',
- factData: '='
- }
- };
- }
- ];
diff --git a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.partial.html b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.partial.html
deleted file mode 100644
index efb66303bc..0000000000
--- a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.partial.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
- The selected fact scans were identical for this module. Showing all facts from the latest selected scan instead.
-
-
-
-
- Comparing facts from:
-
-
-
-
- No scans for
- {{leftHostname}}
- on
-
- {{leftHostname}} -
- {{leftScanDate|longDate}}
- {{rightScanDate|longDate}}
-
-
- No scans for {{rightHostname}} on
- {{rightHostname}} -
- {{rightScanDate|longDate}}
-
-
-
-
-
- {{group.facts.keyName}}
-
-
- {{value}}
-
-
-
-
- {{value}}
-
-
-
-
- {{group.facts.keyName}}
- {{group.facts.value1}}
- {{group.facts.value2}}
-
-
-
-
-
-
-
-
- {{group.displayKeyPath}}
-
-
-
-
-
-
- {{fact.keyName}}
-
-
- {{fact.keyPath[0]}}.{{fact.keyName}}
-
-
- {{fact.value1}}
-
-
- {{fact.value2}}
-
-
-
-
-
- {{fact.keyName}}
-
-
- {{fact.keyPath[0]}}.{{fact.keyName}}
-
-
- {{fact.value1}}
-
-
- {{fact.value2}}
-
-
-
-
-
-
-
-
-
- {{ factModulePickersLabelLeft }}
-
-
-
- There were no fact scans on this date, using a prior scan instead.
-
-
-
- {{ factModulePickersLabelRight }}
-
-
-
- There were no fact scans on this date, using a prior scan instead.
-
-
-
-
-
-
-
-
-
-
-
- There was insufficient scan data for one or both of the dates you selected. Please try selecting a different date or module.
-
-
- There was insufficient scan data for the date you selected. Please try selecting a different date or module.
-
-
-
- There were no facts collected on or before one of the dates you selected ({{error.dateValue|amDateFormat:'L'}}). Please select a different date and try again.
-
-
- The two fact scans were identical for this module.
-
-
- We were not able to find any facts collected for this inventory or module. To setup or run scan jobs, edit the "{{inventory.name}}" inventory and check "Store Ansible Facts."
-
-
-
-
-
diff --git a/awx/ui/client/src/system-tracking/system-tracking.route.js b/awx/ui/client/src/system-tracking/system-tracking.route.js
deleted file mode 100644
index da803afc91..0000000000
--- a/awx/ui/client/src/system-tracking/system-tracking.route.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import {templateUrl} from '../shared/template-url/template-url.factory';
-import { N_ } from '../i18n';
-
-export default {
- name: 'systemTracking',
- route: '/inventories/:inventoryId/system-tracking/:hostIds',
- controller: 'systemTracking',
- templateUrl: templateUrl('system-tracking/system-tracking'),
- params: {hosts: null, inventory: null},
- reloadOnSearch: false,
- ncyBreadcrumb: {
- label: N_("SYSTEM TRACKING")
- },
- resolve: {
- moduleOptions:
- [ 'getModuleOptions',
- 'ProcessErrors',
- '$stateParams',
- function(getModuleOptions, ProcessErrors, $stateParams) {
-
- var hostIds = $stateParams.hostIds.split(',');
-
- var data =
- getModuleOptions(hostIds[0])
- .catch(function (response) {
- ProcessErrors(null, response.data, response.status, null, {
- hdr: 'Error!',
- msg: 'Failed to get license info. GET returned status: ' +
- response.status
- });
- })
- .value();
-
- return data;
-
- }
- ],
- inventory:
- [ '$stateParams',
- '$q',
- 'Rest',
- 'GetBasePath',
- 'ProcessErrors',
- function($stateParams, $q, rest, getBasePath, ProcessErrors) {
-
- if ($stateParams.inventory) {
- return $q.when($stateParams.inventory);
- }
-
- var inventoryId = $stateParams.inventoryId;
-
- var url = getBasePath('inventory') + inventoryId + '/';
- rest.setUrl(url);
- return rest.get()
- .then(function(data) {
- return data.data;
- }).catch(function (response) {
- ProcessErrors(null, response.data, response.status, null, {
- hdr: 'Error!',
- msg: 'Failed to get license info. GET returned status: ' +
- response.status
- });
- });
- }
- ],
- hosts:
- [ '$stateParams',
- '$q',
- 'Rest',
- 'GetBasePath',
- 'ProcessErrors',
- function($stateParams, $q, rest, getBasePath, ProcessErrors) {
- if ($stateParams.hosts) {
- return $q.when($stateParams.hosts);
- }
-
- var hostIds = $stateParams.hostIds.split(',');
-
- var hosts =
- hostIds.map(function(hostId) {
- var url = getBasePath('hosts') +
- hostId + '/';
-
- rest.setUrl(url);
- return rest.get()
- .then(function(data) {
- return data.data;
- }).catch(function (response) {
- ProcessErrors(null, response.data, response.status, null, {
- hdr: 'Error!',
- msg: 'Failed to get license info. GET returned status: ' +
- response.status
- });
- });
- });
-
- return $q.all(hosts);
- }
-
- ]
- }
-};
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 7b75e16415..54bbe2c70d 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -245,7 +245,7 @@ function(NotificationsList, i18n) {
dataTitle: i18n._('Ansible Environment'),
dataContainer: 'body',
dataPlacement: 'right',
- ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)',
+ ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)',
ngShow: 'custom_virtualenvs_options.length > 1'
},
instance_groups: {
diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
index 88a416bb73..52242d6387 100644
--- a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
+++ b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
@@ -102,13 +102,6 @@
width: 90px;
color: @default-interface-txt;
}
-.WorkflowChart-conflictIcon {
- color: @default-err;
-}
-.WorkflowChart-conflictText {
- width: 90px;
- color: @default-interface-txt;
-}
.WorkflowChart-activeNode {
fill: @default-link;
}
diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
index ce25538807..75defa010f 100644
--- a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
+++ b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
@@ -327,16 +327,6 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
return (d.unifiedJobTemplate && d.unifiedJobTemplate.name) ? d.unifiedJobTemplate.name : "";
}).each(wrap);
- thisNode.append("foreignObject")
- .attr("x", 54)
- .attr("y", 45)
- .style("font-size","0.7em")
- .attr("class", "WorkflowChart-conflictText")
- .html(function () {
- return `
\uf06a ${TemplatesStrings.get('workflow_maker.EDGE_CONFLICT')}`;
- })
- .style("display", function(d) { return (d.edgeConflict && !d.placeholder) ? null : "none"; });
-
thisNode.append("foreignObject")
.attr("x", 62)
.attr("y", 22)
@@ -831,9 +821,6 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
t.selectAll(".WorkflowChart-deletedText")
.style("display", function(d){ return d.unifiedJobTemplate || d.placeholder ? "none" : null; });
- t.selectAll(".WorkflowChart-conflictText")
- .style("display", function(d) { return (d.edgeConflict && !d.placeholder) ? null : "none"; });
-
t.selectAll(".WorkflowChart-activeNode")
.style("display", function(d) { return d.isActiveEdit ? null : "none"; });
diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index d76229c0f9..f94c1f3422 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -4,13 +4,12 @@
* All Rights Reserved
*************************************************/
-export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
- '$state', 'ProcessErrors', 'CreateSelect2', '$q', 'JobTemplateModel',
+export default ['$scope', 'WorkflowService', 'TemplatesService',
+ 'ProcessErrors', 'CreateSelect2', '$q', 'JobTemplateModel',
'Empty', 'PromptService', 'Rest', 'TemplatesStrings', '$timeout',
- 'i18n',
- function($scope, WorkflowService, GetBasePath, TemplatesService,
- $state, ProcessErrors, CreateSelect2, $q, JobTemplate,
- Empty, PromptService, Rest, TemplatesStrings, $timeout, i18n) {
+ function ($scope, WorkflowService, TemplatesService,
+ ProcessErrors, CreateSelect2, $q, JobTemplate,
+ Empty, PromptService, Rest, TemplatesStrings, $timeout) {
let promptWatcher, surveyQuestionWatcher, credentialsWatcher;
@@ -31,24 +30,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
value: "check"
}];
- $scope.edgeFlags = {
- conflict: false
- };
-
- $scope.edgeTypeOptions = [
- {
- label: $scope.strings.get('workflow_maker.ALWAYS'),
- value: 'always'
- },
- {
- label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
- value: 'success'
- },
- {
- label: $scope.strings.get('workflow_maker.ON_FAILURE'),
- value: 'failure'
- }
- ];
+ $scope.edgeTypeOptions = createEdgeTypeOptions();
let editRequests = [];
let associateRequests = [];
@@ -59,6 +41,22 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.toggleKey = () => $scope.showKey = !$scope.showKey;
$scope.keyClassList = `{ 'Key-menuIcon--active': showKey }`;
+ function createEdgeTypeOptions() {
+ return ([{
+ label: $scope.strings.get('workflow_maker.ALWAYS'),
+ value: 'always'
+ },
+ {
+ label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+ value: 'success'
+ },
+ {
+ label: $scope.strings.get('workflow_maker.ON_FAILURE'),
+ value: 'failure'
+ }
+ ]);
+ }
+
function resetNodeForm() {
$scope.workflowMakerFormConfig.nodeMode = "idle";
delete $scope.selectedTemplate;
@@ -74,7 +72,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
// params.parentId
// params.node
- let buildSendableNodeData = function() {
+ let buildSendableNodeData = function () {
// Create the node
let sendableNodeData = {
unified_job_template: params.node.unifiedJobTemplate.id,
@@ -122,7 +120,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
return sendableNodeData;
};
- let continueRecursing = function(parentId) {
+ let continueRecursing = function (parentId) {
$scope.totalIteratedNodes++;
if ($scope.totalIteratedNodes === $scope.treeData.data.totalNodes) {
@@ -130,7 +128,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
completionCallback();
} else {
if (params.node.children && params.node.children.length > 0) {
- _.forEach(params.node.children, function(child) {
+ _.forEach(params.node.children, function (child) {
if (child.edgeType === "success") {
recursiveNodeUpdates({
parentId: parentId,
@@ -155,49 +153,51 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
if (params.node.isNew) {
TemplatesService.addWorkflowNode({
- url: $scope.treeData.workflow_job_template_obj.related.workflow_nodes,
- data: buildSendableNodeData()
- })
- .then(function(data) {
+ url: $scope.treeData.workflow_job_template_obj.related.workflow_nodes,
+ data: buildSendableNodeData()
+ })
+ .then(function (data) {
- if (!params.node.isRoot) {
- associateRequests.push({
- parentId: params.parentId,
- nodeId: data.data.id,
- edge: params.node.edgeType
+ if (!params.node.isRoot) {
+ associateRequests.push({
+ parentId: params.parentId,
+ nodeId: data.data.id,
+ edge: params.node.edgeType
+ });
+ }
+
+ if (_.get(params, 'node.promptData.launchConf.ask_credential_on_launch')) {
+ // This finds the credentials that were selected in the prompt but don't occur
+ // in the template defaults
+ let credentialsToPost = params.node.promptData.prompts.credentials.value.filter(function (credFromPrompt) {
+ let defaultCreds = _.get(params, 'node.promptData.launchConf.defaults.credentials', []);
+ return !defaultCreds.some(function (defaultCred) {
+ return credFromPrompt.id === defaultCred.id;
+ });
+ });
+
+ credentialsToPost.forEach((credentialToPost) => {
+ credentialRequests.push({
+ id: data.data.id,
+ data: {
+ id: credentialToPost.id
+ }
+ });
+ });
+ }
+
+ params.node.isNew = false;
+ continueRecursing(data.data.id);
+ }, function ({ data, config, status }) {
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER'),
+ msg: $scope.strings.get('error.CALL', {
+ path: `${config.url}`,
+ action: `${config.method}`,
+ status
+ })
});
- }
-
- if (_.get(params, 'node.promptData.launchConf.ask_credential_on_launch')){
- // This finds the credentials that were selected in the prompt but don't occur
- // in the template defaults
- let credentialsToPost = params.node.promptData.prompts.credentials.value.filter(function(credFromPrompt) {
- let defaultCreds = params.node.promptData.launchConf.defaults.credentials ? params.node.promptData.launchConf.defaults.credentials : [];
- return !defaultCreds.some(function(defaultCred) {
- return credFromPrompt.id === defaultCred.id;
- });
- });
-
- credentialsToPost.forEach((credentialToPost) => {
- credentialRequests.push({
- id: data.data.id,
- data: {
- id: credentialToPost.id
- }
- });
- });
- }
-
- params.node.isNew = false;
- continueRecursing(data.data.id);
- }, function(error) {
- ProcessErrors($scope, error.data, error.status, null, {
- hdr: 'Error!',
- msg: 'Failed to add workflow node. ' +
- 'POST returned status: ' +
- error.status
});
- });
} else {
if (params.node.edited || !params.node.originalParentId || (params.node.originalParentId && params.parentId !== params.node.originalParentId)) {
@@ -208,56 +208,56 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
data: buildSendableNodeData()
});
- if (_.get(params, 'node.promptData.launchConf.ask_credential_on_launch')){
- let credentialsNotInPriorCredentials = params.node.promptData.prompts.credentials.value.filter(function(credFromPrompt) {
- let defaultCreds = params.node.promptData.launchConf.defaults.credentials ? params.node.promptData.launchConf.defaults.credentials : [];
- return !defaultCreds.some(function(defaultCred) {
- return credFromPrompt.id === defaultCred.id;
- });
- });
+ if (_.get(params, 'node.promptData.launchConf.ask_credential_on_launch')) {
+ let credentialsNotInPriorCredentials = params.node.promptData.prompts.credentials.value.filter(function (credFromPrompt) {
+ let defaultCreds = _.get(params, 'node.promptData.launchConf.defaults.credentials', []);
+ return !defaultCreds.some(function (defaultCred) {
+ return credFromPrompt.id === defaultCred.id;
+ });
+ });
- let credentialsToAdd = credentialsNotInPriorCredentials.filter(function(credNotInPrior) {
- let previousOverrides = params.node.promptData.prompts.credentials.previousOverrides ? params.node.promptData.prompts.credentials.previousOverrides : [];
- return !previousOverrides.some(function(priorCred) {
- return credNotInPrior.id === priorCred.id;
- });
- });
+ let credentialsToAdd = credentialsNotInPriorCredentials.filter(function (credNotInPrior) {
+ let previousOverrides = _.get(params, 'node.promptData.prompts.credentials.previousOverrides', []);
+ return !previousOverrides.some(function (priorCred) {
+ return credNotInPrior.id === priorCred.id;
+ });
+ });
- let credentialsToRemove = [];
+ let credentialsToRemove = [];
- if (_.has(params, 'node.promptData.prompts.credentials.previousOverrides')) {
- credentialsToRemove = params.node.promptData.prompts.credentials.previousOverrides.filter(function(priorCred) {
- return !credentialsNotInPriorCredentials.some(function(credNotInPrior) {
- return priorCred.id === credNotInPrior.id;
- });
- });
- }
+ if (_.has(params, 'node.promptData.prompts.credentials.previousOverrides')) {
+ credentialsToRemove = params.node.promptData.prompts.credentials.previousOverrides.filter(function (priorCred) {
+ return !credentialsNotInPriorCredentials.some(function (credNotInPrior) {
+ return priorCred.id === credNotInPrior.id;
+ });
+ });
+ }
- credentialsToAdd.forEach((credentialToAdd) => {
- credentialRequests.push({
- id: params.node.nodeId,
- data: {
- id: credentialToAdd.id
- }
- });
- });
+ credentialsToAdd.forEach((credentialToAdd) => {
+ credentialRequests.push({
+ id: params.node.nodeId,
+ data: {
+ id: credentialToAdd.id
+ }
+ });
+ });
- credentialsToRemove.forEach((credentialToRemove) => {
- credentialRequests.push({
- id: params.node.nodeId,
- data: {
- id: credentialToRemove.id,
- disassociate: true
- }
- });
- });
- }
+ credentialsToRemove.forEach((credentialToRemove) => {
+ credentialRequests.push({
+ id: params.node.nodeId,
+ data: {
+ id: credentialToRemove.id,
+ disassociate: true
+ }
+ });
+ });
+ }
}
if (params.node.originalParentId && (params.parentId !== params.node.originalParentId || params.node.originalEdge !== params.node.edgeType)) {
let parentIsDeleted = false;
- _.forEach($scope.treeData.data.deletedNodes, function(deletedNode) {
+ _.forEach($scope.treeData.data.deletedNodes, function (deletedNode) {
if (deletedNode === params.node.originalParentId) {
parentIsDeleted = true;
}
@@ -297,44 +297,15 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
}
}
- let updateEdgeDropdownOptions = (optionsToInclude) => {
- // Not passing optionsToInclude will include all by default
- if (!optionsToInclude) {
- $scope.edgeTypeOptions = [
- {
- label: i18n._('Always'),
- value: 'always'
- },
- {
- label: i18n._('On Success'),
- value: 'success'
- },
- {
- label: i18n._('On Failure'),
- value: 'failure'
- }
- ];
- } else {
- $scope.edgeTypeOptions = [];
+ let updateEdgeDropdownOptions = (edgeTypeValue) => {
+ // Not passing an edgeTypeValue will include all by default
- optionsToInclude.forEach((optionToInclude) => {
- if (optionToInclude === "always") {
- $scope.edgeTypeOptions.push({
- label: $scope.strings.get('workflow_maker.ALWAYS'),
- value: 'always'
- });
- } else if (optionToInclude === "success") {
- $scope.edgeTypeOptions.push({
- label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
- value: 'success'
- });
- } else if (optionToInclude === "failure") {
- $scope.edgeTypeOptions.push({
- label: $scope.strings.get('workflow_maker.ON_FAILURE'),
- value: 'failure'
- });
- }
+ if (edgeTypeValue) {
+ $scope.edgeTypeOptions = _.filter(createEdgeTypeOptions(), {
+ 'value': edgeTypeValue
});
+ } else {
+ $scope.edgeTypeOptions = createEdgeTypeOptions();
}
CreateSelect2({
@@ -347,9 +318,9 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
let credentialRequiresPassword = false;
$scope.promptData.prompts.credentials.value.forEach((credential) => {
if ((credential.passwords_needed &&
- credential.passwords_needed.length > 0) ||
+ credential.passwords_needed.length > 0) ||
(_.has(credential, 'inputs.vault_password') &&
- credential.inputs.vault_password === "ASK")
+ credential.inputs.vault_password === "ASK")
) {
credentialRequiresPassword = true;
}
@@ -364,7 +335,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
'missingSurveyValue'
];
- promptWatcher = $scope.$watchGroup(promptDataToWatch, function() {
+ promptWatcher = $scope.$watchGroup(promptDataToWatch, function () {
let missingPromptValue = false;
if ($scope.missingSurveyValue) {
missingPromptValue = true;
@@ -381,20 +352,20 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
}
};
- $scope.closeWorkflowMaker = function() {
+ $scope.closeWorkflowMaker = function () {
// Revert the data to the master which was created when the dialog was opened
$scope.treeData.data = angular.copy($scope.treeDataMaster);
$scope.closeDialog();
};
- $scope.saveWorkflowMaker = function() {
+ $scope.saveWorkflowMaker = function () {
$scope.totalIteratedNodes = 0;
if ($scope.treeData && $scope.treeData.data && $scope.treeData.data.children && $scope.treeData.data.children.length > 0) {
- let completionCallback = function() {
+ let completionCallback = function () {
- let disassociatePromises = disassociateRequests.map(function(request) {
+ let disassociatePromises = disassociateRequests.map(function (request) {
return TemplatesService.disassociateWorkflowNode({
parentId: request.parentId,
nodeId: request.nodeId,
@@ -402,67 +373,68 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
});
});
- let editNodePromises = editRequests.map(function(request) {
+ let editNodePromises = editRequests.map(function (request) {
return TemplatesService.editWorkflowNode({
id: request.id,
data: request.data
});
});
- let deletePromises = $scope.treeData.data.deletedNodes.map(function(nodeId) {
+ let deletePromises = $scope.treeData.data.deletedNodes.map(function (nodeId) {
return TemplatesService.deleteWorkflowJobTemplateNode(nodeId);
});
$q.all(disassociatePromises.concat(editNodePromises, deletePromises))
- .then(function() {
+ .then(function () {
- let credentialPromises = credentialRequests.map(function(request) {
- return TemplatesService.postWorkflowNodeCredential({
- id: request.id,
- data: request.data
+ let credentialPromises = credentialRequests.map(function (request) {
+ return TemplatesService.postWorkflowNodeCredential({
+ id: request.id,
+ data: request.data
+ });
});
- });
- let associatePromises = associateRequests.map(function(request) {
- return TemplatesService.associateWorkflowNode({
- parentId: request.parentId,
- nodeId: request.nodeId,
- edge: request.edge
+ let associatePromises = associateRequests.map(function (request) {
+ return TemplatesService.associateWorkflowNode({
+ parentId: request.parentId,
+ nodeId: request.nodeId,
+ edge: request.edge
+ });
});
- });
- $q.all(associatePromises.concat(credentialPromises))
- .then(function() {
- $scope.closeDialog();
- }).catch(({data, status}) => {
+ return $q.all(associatePromises.concat(credentialPromises))
+ .then(function () {
+ $scope.closeDialog();
+ });
+ }).catch(({
+ data,
+ status
+ }) => {
ProcessErrors($scope, data, status, null, {});
});
- }).catch(({data, status}) => {
- ProcessErrors($scope, data, status, null, {});
- });
};
- _.forEach($scope.treeData.data.children, function(child) {
+ _.forEach($scope.treeData.data.children, function (child) {
recursiveNodeUpdates({
node: child
}, completionCallback);
});
} else {
- let deletePromises = $scope.treeData.data.deletedNodes.map(function(nodeId) {
+ let deletePromises = $scope.treeData.data.deletedNodes.map(function (nodeId) {
return TemplatesService.deleteWorkflowJobTemplateNode(nodeId);
});
$q.all(deletePromises)
- .then(function() {
- $scope.closeDialog();
- });
+ .then(function () {
+ $scope.closeDialog();
+ });
}
};
/* ADD NODE FUNCTIONS */
- $scope.startAddNode = function(parent, betweenTwoNodes) {
+ $scope.startAddNode = function (parent, betweenTwoNodes) {
if ($scope.placeholderNode || $scope.nodeBeingEdited) {
$scope.cancelNodeForm();
@@ -481,41 +453,29 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.treeData.nextIndex++;
- let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
- tree: $scope.treeData.data,
- parentId: betweenTwoNodes ? parent.source.id : parent.id,
- childId: $scope.placeholderNode.id
- });
-
// Set the default to success
- let edgeType = {label: $scope.strings.get('workflow_maker.ON_SUCCESS'), value: "success"};
+ let edgeType = {
+ label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+ value: "success"
+ };
if (parent && ((betweenTwoNodes && parent.source.isStartNode) || (!betweenTwoNodes && parent.isStartNode))) {
- // We don't want to give the user the option to select
- // a type as this node will always be executed
- updateEdgeDropdownOptions(["always"]);
- edgeType = {label: $scope.strings.get('workflow_maker.ALWAYS'), value: "always"};
+ // This node will always be executed
+ updateEdgeDropdownOptions('always');
+ edgeType = {
+ label: $scope.strings.get('workflow_maker.ALWAYS'),
+ value: "always"
+ };
} else {
- if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
- updateEdgeDropdownOptions(["success", "failure"]);
- edgeType = {label: $scope.strings.get('workflow_maker.ON_SUCCESS'), value: "success"};
- } else if (_.includes(siblingConnectionTypes, "always")) {
- updateEdgeDropdownOptions(["always"]);
- edgeType = {label: $scope.strings.get('workflow_maker.ALWAYS'), value: "always"};
- } else {
- updateEdgeDropdownOptions();
- }
+ updateEdgeDropdownOptions();
}
- // Reset the edgeConflict flag
- resetEdgeConflict();
-
$scope.edgeType = edgeType;
$scope.$broadcast("refreshWorkflowChart");
};
- $scope.confirmNodeForm = function() {
+ $scope.confirmNodeForm = function () {
if ($scope.workflowMakerFormConfig.nodeMode === "add") {
if ($scope.selectedTemplate && $scope.edgeType && $scope.edgeType.value) {
@@ -565,13 +525,10 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.promptData = null;
- // Reset the edgeConflict flag
- resetEdgeConflict();
-
$scope.$broadcast("refreshWorkflowChart");
};
- $scope.cancelNodeForm = function() {
+ $scope.cancelNodeForm = function () {
if ($scope.workflowMakerFormConfig.nodeMode === "add") {
// Remove the placeholder node from the tree
WorkflowService.removeNodeFromTree({
@@ -598,9 +555,6 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.selectedTemplateInvalid = false;
$scope.showPromptButton = false;
- // Reset the edgeConflict flag
- resetEdgeConflict();
-
// Reset the form
resetNodeForm();
@@ -609,7 +563,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
/* EDIT NODE FUNCTIONS */
- $scope.startEditNode = function(nodeToEdit) {
+ $scope.startEditNode = function (nodeToEdit) {
if (!$scope.nodeBeingEdited || ($scope.nodeBeingEdited && $scope.nodeBeingEdited.id !== nodeToEdit.id)) {
if ($scope.placeholderNode || $scope.nodeBeingEdited) {
@@ -636,7 +590,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.nodeBeingEdited.isActiveEdit = true;
- let finishConfiguringEdit = function() {
+ let finishConfiguringEdit = function () {
let jobTemplate = new JobTemplate();
@@ -656,8 +610,8 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
!launchConf.credential_needed_to_start &&
!launchConf.ask_variables_on_launch &&
launchConf.variables_needed_to_start.length === 0) {
- $scope.showPromptButton = false;
- $scope.promptModalMissingReqFields = false;
+ $scope.showPromptButton = false;
+ $scope.promptModalMissingReqFields = false;
} else {
$scope.showPromptButton = true;
@@ -729,7 +683,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
let credentialRequiresPassword = false;
prompts.credentials.value.forEach((credential) => {
- if(credential.inputs) {
+ if (credential.inputs) {
if ((credential.inputs.password && credential.inputs.password === "ASK") ||
(credential.inputs.become_password && credential.inputs.become_password === "ASK") ||
(credential.inputs.ssh_key_unlock && credential.inputs.ssh_key_unlock === "ASK") ||
@@ -756,8 +710,8 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
!launchConf.credential_needed_to_start &&
!launchConf.ask_variables_on_launch &&
launchConf.variables_needed_to_start.length === 0) {
- $scope.showPromptButton = false;
- $scope.promptModalMissingReqFields = false;
+ $scope.showPromptButton = false;
+ $scope.promptModalMissingReqFields = false;
} else {
$scope.showPromptButton = true;
@@ -816,7 +770,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
watchForPromptChanges();
}
}
- });
+ });
}
if (_.get($scope, 'nodeBeingEdited.unifiedJobTemplate')) {
@@ -855,32 +809,30 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.workflowMakerFormConfig.activeTab = "jobs";
}
- let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
- tree: $scope.treeData.data,
- parentId: parent.id,
- childId: nodeToEdit.id
- });
+ let edgeDropdownOptions = null;
- let edgeDropdownOptions = null;
-
- switch($scope.nodeBeingEdited.edgeType) {
+ // Select RUN dropdown option
+ switch ($scope.nodeBeingEdited.edgeType) {
case "always":
- $scope.edgeType = {label: i18n._("Always"), value: "always"};
- if (siblingConnectionTypes.length === 1 && _.includes(siblingConnectionTypes, "always") || $scope.nodeBeingEdited.isRoot) {
- edgeDropdownOptions = ["always"];
+ $scope.edgeType = {
+ label: $scope.strings.get('workflow_maker.ALWAYS'),
+ value: "always"
+ };
+ if ($scope.nodeBeingEdited.isRoot) {
+ edgeDropdownOptions = 'always';
}
break;
case "success":
- $scope.edgeType = {label: i18n._("On Success"), value: "success"};
- if (siblingConnectionTypes.length !== 0 && (!_.includes(siblingConnectionTypes, "always"))) {
- edgeDropdownOptions = ["success", "failure"];
- }
+ $scope.edgeType = {
+ label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+ value: "success"
+ };
break;
case "failure":
- $scope.edgeType = {label: i18n._("On Failure"), value: "failure"};
- if (siblingConnectionTypes.length !== 0 && (!_.includes(siblingConnectionTypes, "always"))) {
- edgeDropdownOptions = ["success", "failure"];
- }
+ $scope.edgeType = {
+ label: $scope.strings.get('workflow_maker.ON_FAILURE'),
+ value: "failure"
+ };
break;
}
@@ -897,15 +849,18 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
// unified job template so we're going to pull down the whole object
TemplatesService.getUnifiedJobTemplate($scope.nodeBeingEdited.unifiedJobTemplate.id)
- .then(function(data) {
+ .then(function (data) {
$scope.nodeBeingEdited.unifiedJobTemplate = _.clone(data.data.results[0]);
finishConfiguringEdit();
- }, function(error) {
- ProcessErrors($scope, error.data, error.status, null, {
- hdr: 'Error!',
- msg: 'Failed to get unified job template. GET returned ' +
- 'status: ' + error.status
- });
+ }, function ({ data, status, config }) {
+ ProcessErrors($scope, data, status, null, {
+ hdr: $scope.strings.get('error.HEADER'),
+ msg: $scope.strings.get('error.CALL', {
+ path: `${config.url}`,
+ action: `${config.method}`,
+ status
+ })
+ });
});
} else {
finishConfiguringEdit();
@@ -922,16 +877,16 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.deleteOverlayVisible = false;
}
- $scope.startDeleteNode = function(nodeToDelete) {
+ $scope.startDeleteNode = function (nodeToDelete) {
$scope.nodeToBeDeleted = nodeToDelete;
$scope.deleteOverlayVisible = true;
};
- $scope.cancelDeleteNode = function() {
+ $scope.cancelDeleteNode = function () {
resetDeleteNode();
};
- $scope.confirmDeleteNode = function() {
+ $scope.confirmDeleteNode = function () {
if ($scope.nodeToBeDeleted) {
// TODO: turn this into a promise so that we can handle errors
@@ -949,95 +904,56 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
resetNodeForm();
}
- // Reset the edgeConflict flag
- resetEdgeConflict();
-
resetDeleteNode();
$scope.$broadcast("refreshWorkflowChart");
if ($scope.placeholderNode) {
- let edgeType = {label: "On Success", value: "success"};
+ let edgeType = {
+ label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+ value: "success"
+ };
+
if ($scope.placeholderNode.isRoot) {
- updateEdgeDropdownOptions(["always"]);
- edgeType = {label: "Always", value: "always"};
- } else {
- // we need to update the possible edges based on any new siblings
- let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
- tree: $scope.treeData.data,
- parentId: $scope.placeholderNode.parent.id,
- childId: $scope.placeholderNode.id
- });
-
- if (
- (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) &&
- !_.includes(siblingConnectionTypes, "always")
- ) {
- updateEdgeDropdownOptions(["success", "failure"]);
- } else if (
- _.includes(siblingConnectionTypes, "always") &&
- !_.includes(siblingConnectionTypes, "success") &&
- !_.includes(siblingConnectionTypes, "failure")
- ) {
- updateEdgeDropdownOptions(["always"]);
- edgeType = {label: "Always", value: "always"};
- } else {
- updateEdgeDropdownOptions();
- }
-
- }
- $scope.edgeType = edgeType;
- } else if ($scope.nodeBeingEdited) {
- let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
- tree: $scope.treeData.data,
- parentId: $scope.nodeBeingEdited.parent.id,
- childId: $scope.nodeBeingEdited.id
- });
-
- if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
- updateEdgeDropdownOptions(["success", "failure"]);
- } else if (_.includes(siblingConnectionTypes, "always") && $scope.nodeBeingEdited.edgeType === "always") {
- updateEdgeDropdownOptions(["always"]);
+ updateEdgeDropdownOptions('always');
+ edgeType = {
+ label: $scope.strings.get('workflow_maker.ALWAYS'),
+ value: "always"
+ };
} else {
updateEdgeDropdownOptions();
}
- switch($scope.nodeBeingEdited.edgeType) {
- case "always":
- $scope.edgeType = {label: i18n._("Always"), value: "always"};
- if (
- _.includes(siblingConnectionTypes, "always") &&
- !_.includes(siblingConnectionTypes, "success") &&
- !_.includes(siblingConnectionTypes, "failure")
- ) {
- updateEdgeDropdownOptions(["always"]);
- } else {
- updateEdgeDropdownOptions();
- }
- break;
- case "success":
- $scope.edgeType = {label: i18n._("On Success"), value: "success"};
- if (
- (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) &&
- !_.includes(siblingConnectionTypes, "always")
- ) {
- updateEdgeDropdownOptions(["success", "failure"]);
- } else {
- updateEdgeDropdownOptions();
- }
- break;
- case "failure":
- $scope.edgeType = {label: i18n._("On Failure"), value: "failure"};
- if (
- (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) &&
- !_.includes(siblingConnectionTypes, "always")
- ) {
- updateEdgeDropdownOptions(["success", "failure"]);
- } else {
- updateEdgeDropdownOptions();
- }
- break;
- }
+ $scope.edgeType = edgeType;
+ } else if ($scope.nodeBeingEdited) {
+
+ switch ($scope.nodeBeingEdited.edgeType) {
+ case "always":
+ $scope.edgeType = {
+ label: $scope.strings.get('workflow_maker.ALWAYS'),
+ value: "always"
+ };
+ if ($scope.nodeBeingEdited.isRoot) {
+ updateEdgeDropdownOptions('always');
+ } else {
+ updateEdgeDropdownOptions();
+ }
+ break;
+ case "success":
+ $scope.edgeType = {
+ label: $scope.strings.get('workflow_maker.ON_SUCCESS'),
+ value: "success"
+ };
+ updateEdgeDropdownOptions();
+ break;
+ case "failure":
+ $scope.edgeType = {
+ label: $scope.strings.get('workflow_maker.ON_FAILURE'),
+ value: "failure"
+ };
+ updateEdgeDropdownOptions();
+ break;
+ }
}
$scope.treeData.data.totalNodes--;
@@ -1045,13 +961,13 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
};
- $scope.toggleFormTab = function(tab) {
+ $scope.toggleFormTab = function (tab) {
if ($scope.workflowMakerFormConfig.activeTab !== tab) {
$scope.workflowMakerFormConfig.activeTab = tab;
}
};
- $scope.templateManuallySelected = function(selectedTemplate) {
+ $scope.templateManuallySelected = function (selectedTemplate) {
if (promptWatcher) {
promptWatcher();
@@ -1100,8 +1016,8 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
!launchConf.credential_needed_to_start &&
!launchConf.ask_variables_on_launch &&
launchConf.variables_needed_to_start.length === 0) {
- $scope.showPromptButton = false;
- $scope.promptModalMissingReqFields = false;
+ $scope.showPromptButton = false;
+ $scope.promptModalMissingReqFields = false;
} else {
$scope.showPromptButton = true;
@@ -1168,56 +1084,47 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
}
};
- function resetEdgeConflict(){
- $scope.edgeFlags.conflict = false;
-
- WorkflowService.checkForEdgeConflicts({
- treeData: $scope.treeData.data,
- edgeFlags: $scope.edgeFlags
- });
- }
-
- $scope.toggleManualControls = function() {
+ $scope.toggleManualControls = function () {
$scope.showManualControls = !$scope.showManualControls;
};
- $scope.panChart = function(direction) {
+ $scope.panChart = function (direction) {
$scope.$broadcast('panWorkflowChart', {
direction: direction
});
};
- $scope.zoomChart = function(zoom) {
+ $scope.zoomChart = function (zoom) {
$scope.$broadcast('zoomWorkflowChart', {
zoom: zoom
});
};
- $scope.resetChart = function() {
+ $scope.resetChart = function () {
$scope.$broadcast('resetWorkflowChart');
};
- $scope.workflowZoomed = function(zoom) {
+ $scope.workflowZoomed = function (zoom) {
$scope.$broadcast('workflowZoomed', {
zoom: zoom
});
};
- $scope.zoomToFitChart = function() {
+ $scope.zoomToFitChart = function () {
$scope.$broadcast('zoomToFitChart');
};
- $scope.openPromptModal = function() {
+ $scope.openPromptModal = function () {
$scope.promptData.triggerModalOpen = true;
};
let allNodes = [];
let page = 1;
- let buildTreeFromNodes = function(){
+ let buildTreeFromNodes = function () {
WorkflowService.buildTree({
workflowNodes: allNodes
- }).then(function(data){
+ }).then(function (data) {
$scope.treeData = data;
// TODO: I think that the workflow chart directive (and eventually d3) is meddling with
@@ -1234,33 +1141,35 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
});
};
- let getNodes = function(){
+ let getNodes = function () {
// Get the workflow nodes
TemplatesService.getWorkflowJobTemplateNodes($scope.workflowJobTemplateObj.id, page)
- .then(function(data){
- for(var i=0; i
-
+
AWX provides a web-based user interface, REST API, and task engine built on top of [Ansible](https://github.com/ansible/ansible). It is the upstream project for [Tower](https://www.ansible.com/tower), a commercial derivative of AWX.
@@ -11,6 +10,8 @@ To learn more about using AWX, and Tower, view the [Tower docs site](http://docs
The AWX Project Frequently Asked Questions can be found [here](https://www.ansible.com/awx-project-faq).
+The AWX logos and branding assets are covered by [our trademark guidelines](https://github.com/ansible/awx-logos/blob/master/TRADEMARKS.md).
+
Contributing
------------
diff --git a/VERSION b/VERSION
index 227cea2156..38f77a65b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/awx/__init__.py b/awx/__init__.py
index 2241a165a0..8f35750c48 100644
--- a/awx/__init__.py
+++ b/awx/__init__.py
@@ -12,14 +12,6 @@ __version__ = get_distribution('awx').version
__all__ = ['__version__']
-# Isolated nodes do not have celery installed
-try:
- from .celery import app as celery_app # noqa
- __all__.append('celery_app')
-except ImportError:
- pass
-
-
# Check for the presence/absence of "devonly" module to determine if running
# from a source code checkout or release packaage.
try:
diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index 8d502eb5c9..146eff930b 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -599,7 +599,7 @@ class InstanceGroupInstanceList(InstanceGroupMembershipMixin, SubListAttachDetac
search_fields = ('hostname',)
-class ScheduleList(ListAPIView):
+class ScheduleList(ListCreateAPIView):
view_name = _("Schedules")
model = Schedule
@@ -1291,7 +1291,7 @@ class ProjectUpdateNotificationsList(SubListAPIView):
search_fields = ('subject', 'notification_type', 'body',)
-class ProjectUpdateScmInventoryUpdates(SubListCreateAPIView):
+class ProjectUpdateScmInventoryUpdates(SubListAPIView):
view_name = _("Project Update SCM Inventory Updates")
model = InventoryUpdate
@@ -1484,10 +1484,11 @@ class OAuth2TokenActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIVi
search_fields = ('changes',)
-class UserTeamsList(ListAPIView):
+class UserTeamsList(SubListAPIView):
- model = User
+ model = Team
serializer_class = TeamSerializer
+ parent_model = User
def get_queryset(self):
u = get_object_or_404(User, pk=self.kwargs['pk'])
@@ -1665,7 +1666,7 @@ class CredentialTypeDetail(RetrieveUpdateDestroyAPIView):
return super(CredentialTypeDetail, self).destroy(request, *args, **kwargs)
-class CredentialTypeCredentialList(SubListAPIView):
+class CredentialTypeCredentialList(SubListCreateAPIView):
model = Credential
parent_model = CredentialType
@@ -2959,6 +2960,16 @@ class JobTemplateSurveySpec(GenericAPIView):
obj_permission_type = 'admin'
serializer_class = EmptySerializer
+ ALLOWED_TYPES = {
+ 'text': six.string_types,
+ 'textarea': six.string_types,
+ 'password': six.string_types,
+ 'multiplechoice': six.string_types,
+ 'multiselect': six.string_types,
+ 'integer': int,
+ 'float': float
+ }
+
def get(self, request, *args, **kwargs):
obj = self.get_object()
if not feature_enabled('surveys'):
@@ -2985,7 +2996,8 @@ class JobTemplateSurveySpec(GenericAPIView):
obj.save(update_fields=['survey_spec'])
return Response()
- def _validate_spec_data(self, new_spec, old_spec):
+ @staticmethod
+ def _validate_spec_data(new_spec, old_spec):
schema_errors = {}
for field, expect_type, type_label in [
('name', six.string_types, 'string'),
@@ -3006,40 +3018,75 @@ class JobTemplateSurveySpec(GenericAPIView):
variable_set = set()
old_spec_dict = JobTemplate.pivot_spec(old_spec)
for idx, survey_item in enumerate(new_spec["spec"]):
+ context = dict(
+ idx=six.text_type(idx),
+ survey_item=survey_item
+ )
+ # General element validation
if not isinstance(survey_item, dict):
return Response(dict(error=_("Survey question %s is not a json object.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
- if "type" not in survey_item:
- return Response(dict(error=_("'type' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
- if "question_name" not in survey_item:
- return Response(dict(error=_("'question_name' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
- if "variable" not in survey_item:
- return Response(dict(error=_("'variable' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
+ for field_name in ['type', 'question_name', 'variable', 'required']:
+ if field_name not in survey_item:
+ return Response(dict(error=_("'{field_name}' missing from survey question {idx}").format(
+ field_name=field_name, **context
+ )), status=status.HTTP_400_BAD_REQUEST)
+ val = survey_item[field_name]
+ allow_types = six.string_types
+ type_label = 'string'
+ if field_name == 'required':
+ allow_types = bool
+ type_label = 'boolean'
+ if not isinstance(val, allow_types):
+ return Response(dict(error=_("'{field_name}' in survey question {idx} expected to be {type_label}.").format(
+ field_name=field_name, type_label=type_label, **context
+ )))
if survey_item['variable'] in variable_set:
return Response(dict(error=_("'variable' '%(item)s' duplicated in survey question %(survey)s.") % {
'item': survey_item['variable'], 'survey': str(idx)}), status=status.HTTP_400_BAD_REQUEST)
else:
variable_set.add(survey_item['variable'])
- if "required" not in survey_item:
- return Response(dict(error=_("'required' missing from survey question %s.") % str(idx)), status=status.HTTP_400_BAD_REQUEST)
- if survey_item["type"] == "password" and "default" in survey_item:
- if not isinstance(survey_item['default'], six.string_types):
+ # Type-specific validation
+ # validate question type <-> default type
+ qtype = survey_item["type"]
+ if qtype not in JobTemplateSurveySpec.ALLOWED_TYPES:
+ return Response(dict(error=_(
+ "'{survey_item[type]}' in survey question {idx} is not one of '{allowed_types}' allowed question types."
+ ).format(
+ allowed_types=', '.join(JobTemplateSurveySpec.ALLOWED_TYPES.keys()), **context
+ )))
+ if 'default' in survey_item:
+ if not isinstance(survey_item['default'], JobTemplateSurveySpec.ALLOWED_TYPES[qtype]):
+ type_label = 'string'
+ if qtype in ['integer', 'float']:
+ type_label = qtype
return Response(dict(error=_(
- "Value {question_default} for '{variable_name}' expected to be a string."
+ "Default value {survey_item[default]} in survey question {idx} expected to be {type_label}."
).format(
- question_default=survey_item["default"], variable_name=survey_item["variable"])
- ), status=status.HTTP_400_BAD_REQUEST)
+ type_label=type_label, **context
+ )), status=status.HTTP_400_BAD_REQUEST)
+ # additional type-specific properties, the UI provides these even
+ # if not applicable to the question, TODO: request that they not do this
+ for key in ['min', 'max']:
+ if key in survey_item:
+ if survey_item[key] is not None and (not isinstance(survey_item[key], int)):
+ return Response(dict(error=_(
+ "The {min_or_max} limit in survey question {idx} expected to be integer."
+ ).format(min_or_max=key, **context)))
+ if qtype in ['multiplechoice', 'multiselect'] and 'choices' not in survey_item:
+ return Response(dict(error=_(
+ "Survey question {idx} of type {survey_item[type]} must specify choices.".format(**context)
+ )))
+ # Process encryption substitution
if ("default" in survey_item and isinstance(survey_item['default'], six.string_types) and
survey_item['default'].startswith('$encrypted$')):
# Submission expects the existence of encrypted DB value to replace given default
- if survey_item["type"] != "password":
+ if qtype != "password":
return Response(dict(error=_(
"$encrypted$ is a reserved keyword for password question defaults, "
- "survey question {question_position} is type {question_type}."
- ).format(
- question_position=str(idx), question_type=survey_item["type"])
- ), status=status.HTTP_400_BAD_REQUEST)
+ "survey question {idx} is type {survey_item[type]}."
+ ).format(**context)), status=status.HTTP_400_BAD_REQUEST)
old_element = old_spec_dict.get(survey_item['variable'], {})
encryptedish_default_exists = False
if 'default' in old_element:
@@ -3051,10 +3098,10 @@ class JobTemplateSurveySpec(GenericAPIView):
encryptedish_default_exists = True
if not encryptedish_default_exists:
return Response(dict(error=_(
- "$encrypted$ is a reserved keyword, may not be used for new default in position {question_position}."
- ).format(question_position=str(idx))), status=status.HTTP_400_BAD_REQUEST)
+ "$encrypted$ is a reserved keyword, may not be used for new default in position {idx}."
+ ).format(**context)), status=status.HTTP_400_BAD_REQUEST)
survey_item['default'] = old_element['default']
- elif survey_item["type"] == "password" and 'default' in survey_item:
+ elif qtype == "password" and 'default' in survey_item:
# Submission provides new encrypted default
survey_item['default'] = encrypt_value(survey_item['default'])
@@ -3318,7 +3365,7 @@ class JobTemplateCallback(GenericAPIView):
with transaction.atomic():
job = job_template.create_job(**kv)
- # Send a signal to celery that the job should be started.
+ # Send a signal to signify that the job should be started.
result = job.signal_start(inventory_sources_already_updated=inventory_sources_already_updated)
if not result:
data = dict(msg=_('Error starting job!'))
@@ -3438,10 +3485,6 @@ class WorkflowJobTemplateNodeChildrenBaseList(WorkflowsEnforcementMixin, Enforce
return getattr(parent, self.relationship).all()
def is_valid_relation(self, parent, sub, created=False):
- mutex_list = ('success_nodes', 'failure_nodes') if self.relationship == 'always_nodes' else ('always_nodes',)
- for relation in mutex_list:
- if getattr(parent, relation).all().exists():
- return {'Error': _('Cannot associate {0} when {1} have been associated.').format(self.relationship, relation)}
if created:
return None
diff --git a/awx/api/views/mixin.py b/awx/api/views/mixin.py
index 0830b0c419..9a705f7b14 100644
--- a/awx/api/views/mixin.py
+++ b/awx/api/views/mixin.py
@@ -101,7 +101,9 @@ class UnifiedJobDeletionMixin(object):
class InstanceGroupMembershipMixin(object):
'''
- Manages signaling celery to reload its queue configuration on Instance Group membership changes
+ This mixin overloads attach/detach so that it calls InstanceGroup.save(),
+ triggering a background recalculation of policy-based instance group
+ membership.
'''
def attach(self, request, *args, **kwargs):
response = super(InstanceGroupMembershipMixin, self).attach(request, *args, **kwargs)
diff --git a/awx/celery.py b/awx/celery.py
deleted file mode 100644
index 124a2a4fd4..0000000000
--- a/awx/celery.py
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# Copyright (c) 2017 Ansible, Inc.
-# All Rights Reserved.
-
-from __future__ import absolute_import, unicode_literals
-
-import os
-from celery import Celery
-from django.conf import settings # noqa
-
-
-try:
- import awx.devonly # noqa
- MODE = 'development'
-except ImportError: # pragma: no cover
- MODE = 'production'
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'awx.settings.%s' % MODE)
-
-app = Celery('awx')
-app.config_from_object('django.conf:settings')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
-
-if __name__ == '__main__':
- app.start()
diff --git a/awx/conf/settings.py b/awx/conf/settings.py
index 986e09037d..b0b365ef69 100644
--- a/awx/conf/settings.py
+++ b/awx/conf/settings.py
@@ -2,11 +2,13 @@
from collections import namedtuple
import contextlib
import logging
+import re
import sys
import threading
import time
import StringIO
import traceback
+import urllib
import six
@@ -60,6 +62,15 @@ SETTING_CACHE_DEFAULTS = True
__all__ = ['SettingsWrapper', 'get_settings_to_cache', 'SETTING_CACHE_NOTSET']
+def normalize_broker_url(value):
+ parts = value.rsplit('@', 1)
+ match = re.search('(amqp://[^:]+:)(.*)', parts[0])
+ if match:
+ prefix, password = match.group(1), match.group(2)
+ parts[0] = prefix + urllib.quote(password)
+ return '@'.join(parts)
+
+
@contextlib.contextmanager
def _ctit_db_wrapper(trans_safe=False):
'''
@@ -115,7 +126,8 @@ def _ctit_db_wrapper(trans_safe=False):
bottom_stack.close()
# Log the combined stack
if trans_safe:
- logger.warning('Database settings are not available, using defaults, error:\n{}'.format(tb_string))
+ if 'check_migrations' not in sys.argv:
+ logger.warning('Database settings are not available, using defaults, error:\n{}'.format(tb_string))
else:
logger.error('Error modifying something related to database settings.\n{}'.format(tb_string))
finally:
@@ -444,7 +456,16 @@ class SettingsWrapper(UserSettingsHolder):
value = self._get_local(name)
if value is not empty:
return value
- return self._get_default(name)
+ value = self._get_default(name)
+ # sometimes users specify RabbitMQ passwords that contain
+ # unescaped : and @ characters that confused urlparse, e.g.,
+ # amqp://guest:a@ns:ibl3#@localhost:5672//
+ #
+ # detect these scenarios, and automatically escape the user's
+ # password so it just works
+ if name == 'BROKER_URL':
+ value = normalize_broker_url(value)
+ return value
def _set_local(self, name, value):
field = self.registry.get_setting_field(name)
diff --git a/awx/main/dispatch/__init__.py b/awx/main/dispatch/__init__.py
new file mode 100644
index 0000000000..ac4ef421df
--- /dev/null
+++ b/awx/main/dispatch/__init__.py
@@ -0,0 +1,5 @@
+from django.conf import settings
+
+
+def get_local_queuename():
+ return settings.CLUSTER_HOST_ID.encode('utf-8')
diff --git a/awx/main/dispatch/control.py b/awx/main/dispatch/control.py
new file mode 100644
index 0000000000..9beb6b4da2
--- /dev/null
+++ b/awx/main/dispatch/control.py
@@ -0,0 +1,60 @@
+import logging
+import socket
+
+from django.conf import settings
+
+from awx.main.dispatch import get_local_queuename
+from kombu import Connection, Queue, Exchange, Producer, Consumer
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+class Control(object):
+
+ services = ('dispatcher', 'callback_receiver')
+ result = None
+
+ def __init__(self, service):
+ if service not in self.services:
+ raise RuntimeError('{} must be in {}'.format(service, self.services))
+ self.service = service
+ queuename = get_local_queuename()
+ self.queue = Queue(queuename, Exchange(queuename), routing_key=queuename)
+
+ def publish(self, msg, conn, host, **kwargs):
+ producer = Producer(
+ exchange=self.queue.exchange,
+ channel=conn,
+ routing_key=get_local_queuename()
+ )
+ producer.publish(msg, expiration=5, **kwargs)
+
+ def status(self, *args, **kwargs):
+ return self.control_with_reply('status', *args, **kwargs)
+
+ def running(self, *args, **kwargs):
+ return self.control_with_reply('running', *args, **kwargs)
+
+ def control_with_reply(self, command, host=None, timeout=5):
+ host = host or settings.CLUSTER_HOST_ID
+ logger.warn('checking {} {} for {}'.format(self.service, command, host))
+ reply_queue = Queue(name="amq.rabbitmq.reply-to")
+ self.result = None
+ with Connection(settings.BROKER_URL) as conn:
+ with Consumer(conn, reply_queue, callbacks=[self.process_message], no_ack=True):
+ self.publish({'control': command}, conn, host, reply_to='amq.rabbitmq.reply-to')
+ try:
+ conn.drain_events(timeout=timeout)
+ except socket.timeout:
+ logger.error('{} did not reply within {}s'.format(self.service, timeout))
+ raise
+ return self.result
+
+ def control(self, msg, host=None, **kwargs):
+ host = host or settings.CLUSTER_HOST_ID
+ with Connection(settings.BROKER_URL) as conn:
+ self.publish(msg, conn, host)
+
+ def process_message(self, body, message):
+ self.result = body
+ message.ack()
diff --git a/awx/main/dispatch/pool.py b/awx/main/dispatch/pool.py
new file mode 100644
index 0000000000..b03bbf4c92
--- /dev/null
+++ b/awx/main/dispatch/pool.py
@@ -0,0 +1,381 @@
+import logging
+import os
+import random
+import traceback
+from uuid import uuid4
+
+import collections
+from multiprocessing import Process
+from multiprocessing import Queue as MPQueue
+from Queue import Full as QueueFull, Empty as QueueEmpty
+
+from django.conf import settings
+from django.db import connection as django_connection
+from django.core.cache import cache as django_cache
+from jinja2 import Template
+import psutil
+
+from awx.main.models import UnifiedJob
+from awx.main.dispatch import reaper
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+class PoolWorker(object):
+ '''
+ Used to track a worker child process and its pending and finished messages.
+
+ This class makes use of two distinct multiprocessing.Queues to track state:
+
+ - self.queue: this is a queue which represents pending messages that should
+ be handled by this worker process; as new AMQP messages come
+ in, a pool will put() them into this queue; the child
+ process that is forked will get() from this queue and handle
+ received messages in an endless loop
+ - self.finished: this is a queue which the worker process uses to signal
+ that it has finished processing a message
+
+ When a message is put() onto this worker, it is tracked in
+ self.managed_tasks.
+
+ Periodically, the worker will call .calculate_managed_tasks(), which will
+ cause messages in self.finished to be removed from self.managed_tasks.
+
+ In this way, self.managed_tasks represents a view of the messages assigned
+ to a specific process. The message at [0] is the least-recently inserted
+ message, and it represents what the worker is running _right now_
+ (self.current_task).
+
+ A worker is "busy" when it has at least one message in self.managed_tasks.
+ It is "idle" when self.managed_tasks is empty.
+ '''
+
+ def __init__(self, queue_size, target, args):
+ self.messages_sent = 0
+ self.messages_finished = 0
+ self.managed_tasks = collections.OrderedDict()
+ self.finished = MPQueue(queue_size)
+ self.queue = MPQueue(queue_size)
+ self.process = Process(target=target, args=(self.queue, self.finished) + args)
+ self.process.daemon = True
+
+ def start(self):
+ self.process.start()
+
+ def put(self, body):
+ uuid = '?'
+ if isinstance(body, dict):
+ if not body.get('uuid'):
+ body['uuid'] = str(uuid4())
+ uuid = body['uuid']
+ logger.debug('delivered {} to worker[{}] qsize {}'.format(
+ uuid, self.pid, self.qsize
+ ))
+ self.managed_tasks[uuid] = body
+ self.queue.put(body, block=True, timeout=5)
+ self.messages_sent += 1
+ self.calculate_managed_tasks()
+
+ def quit(self):
+ '''
+ Send a special control message to the worker that tells it to exit
+ gracefully.
+ '''
+ self.queue.put('QUIT')
+
+ @property
+ def pid(self):
+ return self.process.pid
+
+ @property
+ def qsize(self):
+ return self.queue.qsize()
+
+ @property
+ def alive(self):
+ return self.process.is_alive()
+
+ @property
+ def mb(self):
+ if self.alive:
+ return '{:0.3f}'.format(
+ psutil.Process(self.pid).memory_info().rss / 1024.0 / 1024.0
+ )
+ return '0'
+
+ @property
+ def exitcode(self):
+ return str(self.process.exitcode)
+
+ def calculate_managed_tasks(self):
+ # look to see if any tasks were finished
+ finished = []
+ for _ in range(self.finished.qsize()):
+ try:
+ finished.append(self.finished.get(block=False))
+ except QueueEmpty:
+ break # qsize is not always _totally_ up to date
+
+ # if any tasks were finished, removed them from the managed tasks for
+ # this worker
+ for uuid in finished:
+ self.messages_finished += 1
+ del self.managed_tasks[uuid]
+
+ @property
+ def current_task(self):
+ self.calculate_managed_tasks()
+ # the task at [0] is the one that's running right now (or is about to
+ # be running)
+ if len(self.managed_tasks):
+ return self.managed_tasks[self.managed_tasks.keys()[0]]
+
+ return None
+
+ @property
+ def orphaned_tasks(self):
+ orphaned = []
+ if not self.alive:
+ # if this process had a running task that never finished,
+ # requeue its error callbacks
+ current_task = self.current_task
+ if isinstance(current_task, dict):
+ orphaned.extend(current_task.get('errbacks', []))
+
+ # if this process has any pending messages requeue them
+ for _ in range(self.qsize):
+ try:
+ message = self.queue.get(block=False)
+ if message != 'QUIT':
+ orphaned.append(message)
+ except QueueEmpty:
+ break # qsize is not always _totally_ up to date
+ if len(orphaned):
+ logger.error(
+ 'requeuing {} messages from gone worker pid:{}'.format(
+ len(orphaned), self.pid
+ )
+ )
+ return orphaned
+
+ @property
+ def busy(self):
+ self.calculate_managed_tasks()
+ return len(self.managed_tasks) > 0
+
+ @property
+ def idle(self):
+ return not self.busy
+
+
+class WorkerPool(object):
+ '''
+ Creates a pool of forked PoolWorkers.
+
+ As WorkerPool.write(...) is called (generally, by a kombu consumer
+ implementation when it receives an AMQP message), messages are passed to
+ one of the multiprocessing Queues where some work can be done on them.
+
+ class MessagePrinter(awx.main.dispatch.worker.BaseWorker):
+
+ def perform_work(self, body):
+ print body
+
+ pool = WorkerPool(min_workers=4) # spawn four worker processes
+ pool.init_workers(MessagePrint().work_loop)
+ pool.write(
+ 0, # preferred worker 0
+ 'Hello, World!'
+ )
+ '''
+
+ debug_meta = ''
+
+ def __init__(self, min_workers=None, queue_size=None):
+ self.name = settings.CLUSTER_HOST_ID
+ self.pid = os.getpid()
+ self.min_workers = min_workers or settings.JOB_EVENT_WORKERS
+ self.queue_size = queue_size or settings.JOB_EVENT_MAX_QUEUE_SIZE
+ self.workers = []
+
+ def __len__(self):
+ return len(self.workers)
+
+ def init_workers(self, target, *target_args):
+ self.target = target
+ self.target_args = target_args
+ for idx in range(self.min_workers):
+ self.up()
+
+ def up(self):
+ idx = len(self.workers)
+ # It's important to close these because we're _about_ to fork, and we
+ # don't want the forked processes to inherit the open sockets
+ # for the DB and memcached connections (that way lies race conditions)
+ django_connection.close()
+ django_cache.close()
+ worker = PoolWorker(self.queue_size, self.target, (idx,) + self.target_args)
+ self.workers.append(worker)
+ try:
+ worker.start()
+ except Exception:
+ logger.exception('could not fork')
+ else:
+ logger.warn('scaling up worker pid:{}'.format(worker.pid))
+ return idx, worker
+
+ def debug(self, *args, **kwargs):
+ self.cleanup()
+ tmpl = Template(
+ '{{ pool.name }}[pid:{{ pool.pid }}] workers total={{ workers|length }} {{ meta }} \n'
+ '{% for w in workers %}'
+ '. worker[pid:{{ w.pid }}]{% if not w.alive %} GONE exit={{ w.exitcode }}{% endif %}'
+ ' sent={{ w.messages_sent }}'
+ ' finished={{ w.messages_finished }}'
+ ' qsize={{ w.managed_tasks|length }}'
+ ' rss={{ w.mb }}MB'
+ '{% for task in w.managed_tasks.values() %}'
+ '\n - {% if loop.index0 == 0 %}running {% else %}queued {% endif %}'
+ '{{ task["uuid"] }} '
+ '{% if "task" in task %}'
+ '{{ task["task"].rsplit(".", 1)[-1] }}'
+ # don't print kwargs, they often contain launch-time secrets
+ '(*{{ task.get("args", []) }})'
+ '{% endif %}'
+ '{% endfor %}'
+ '{% if not w.managed_tasks|length %}'
+ ' [IDLE]'
+ '{% endif %}'
+ '\n'
+ '{% endfor %}'
+ )
+ return tmpl.render(pool=self, workers=self.workers, meta=self.debug_meta)
+
+ def write(self, preferred_queue, body):
+ queue_order = sorted(range(len(self.workers)), cmp=lambda x, y: -1 if x==preferred_queue else 0)
+ write_attempt_order = []
+ for queue_actual in queue_order:
+ try:
+ self.workers[queue_actual].put(body)
+ return queue_actual
+ except QueueFull:
+ pass
+ except Exception:
+ tb = traceback.format_exc()
+ logger.warn("could not write to queue %s" % preferred_queue)
+ logger.warn("detail: {}".format(tb))
+ write_attempt_order.append(preferred_queue)
+ logger.warn("could not write payload to any queue, attempted order: {}".format(write_attempt_order))
+ return None
+
+ def stop(self, signum):
+ try:
+ for worker in self.workers:
+ os.kill(worker.pid, signum)
+ except Exception:
+ logger.exception('could not kill {}'.format(worker.pid))
+
+
+class AutoscalePool(WorkerPool):
+ '''
+ An extended pool implementation that automatically scales workers up and
+ down based on demand
+ '''
+
+ def __init__(self, *args, **kwargs):
+ self.max_workers = kwargs.pop('max_workers', None)
+ super(AutoscalePool, self).__init__(*args, **kwargs)
+
+ if self.max_workers is None:
+ settings_absmem = getattr(settings, 'SYSTEM_TASK_ABS_MEM', None)
+ if settings_absmem is not None:
+ total_memory_gb = int(settings_absmem)
+ else:
+ total_memory_gb = (psutil.virtual_memory().total >> 30) + 1 # noqa: round up
+ # 5 workers per GB of total memory
+ self.max_workers = (total_memory_gb * 5)
+
+ @property
+ def should_grow(self):
+ if len(self.workers) < self.min_workers:
+ # If we don't have at least min_workers, add more
+ return True
+ # If every worker is busy doing something, add more
+ return all([w.busy for w in self.workers])
+
+ @property
+ def full(self):
+ return len(self.workers) == self.max_workers
+
+ @property
+ def debug_meta(self):
+ return 'min={} max={}'.format(self.min_workers, self.max_workers)
+
+ def cleanup(self):
+ """
+ Perform some internal account and cleanup. This is run on
+ every cluster node heartbeat:
+
+ 1. Discover worker processes that exited, and recover messages they
+ were handling.
+ 2. Clean up unnecessary, idle workers.
+ """
+ orphaned = []
+ for w in self.workers[::]:
+ if not w.alive:
+ # the worker process has exited
+ # 1. take the task it was running and enqueue the error
+ # callbacks
+ # 2. take any pending tasks delivered to its queue and
+ # send them to another worker
+ logger.error('worker pid:{} is gone (exit={})'.format(w.pid, w.exitcode))
+ if w.current_task:
+ if w.current_task != 'QUIT':
+ try:
+ for j in UnifiedJob.objects.filter(celery_task_id=w.current_task['uuid']):
+ reaper.reap_job(j, 'failed')
+ except Exception:
+ logger.exception('failed to reap job UUID {}'.format(w.current_task['uuid']))
+ orphaned.extend(w.orphaned_tasks)
+ self.workers.remove(w)
+ elif w.idle and len(self.workers) > self.min_workers:
+ # the process has an empty queue (it's idle) and we have
+ # more processes in the pool than we need (> min)
+ # send this process a message so it will exit gracefully
+ # at the next opportunity
+ logger.warn('scaling down worker pid:{}'.format(w.pid))
+ w.quit()
+ self.workers.remove(w)
+
+ for m in orphaned:
+ # if all the workers are dead, spawn at least one
+ if not len(self.workers):
+ self.up()
+ idx = random.choice(range(len(self.workers)))
+ self.write(idx, m)
+
+ def up(self):
+ if self.full:
+ # if we can't spawn more workers, just toss this message into a
+ # random worker's backlog
+ idx = random.choice(range(len(self.workers)))
+ return idx, self.workers[idx]
+ else:
+ return super(AutoscalePool, self).up()
+
+ def write(self, preferred_queue, body):
+ # when the cluster heartbeat occurs, clean up internally
+ if isinstance(body, dict) and 'cluster_node_heartbeat' in body['task']:
+ self.cleanup()
+ if self.should_grow:
+ self.up()
+ # we don't care about "preferred queue" round robin distribution, just
+ # find the first non-busy worker and claim it
+ workers = self.workers[:]
+ random.shuffle(workers)
+ for w in workers:
+ if not w.busy:
+ w.put(body)
+ break
+ else:
+ return super(AutoscalePool, self).write(preferred_queue, body)
diff --git a/awx/main/dispatch/publish.py b/awx/main/dispatch/publish.py
new file mode 100644
index 0000000000..739998ca96
--- /dev/null
+++ b/awx/main/dispatch/publish.py
@@ -0,0 +1,128 @@
+import inspect
+import logging
+import sys
+from uuid import uuid4
+
+from django.conf import settings
+from kombu import Connection, Exchange, Producer
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+def serialize_task(f):
+ return '.'.join([f.__module__, f.__name__])
+
+
+class task:
+ """
+ Used to decorate a function or class so that it can be run asynchronously
+ via the task dispatcher. Tasks can be simple functions:
+
+ @task()
+ def add(a, b):
+ return a + b
+
+ ...or classes that define a `run` method:
+
+ @task()
+ class Adder:
+ def run(self, a, b):
+ return a + b
+
+ # Tasks can be run synchronously...
+ assert add(1, 1) == 2
+ assert Adder().run(1, 1) == 2
+
+ # ...or published to a queue:
+ add.apply_async([1, 1])
+ Adder.apply_async([1, 1])
+
+ # Tasks can also define a specific target queue or exchange type:
+
+ @task(queue='slow-tasks')
+ def snooze():
+ time.sleep(10)
+
+ @task(queue='tower_broadcast', exchange_type='fanout')
+ def announce():
+ print "Run this everywhere!"
+ """
+
+ def __init__(self, queue=None, exchange_type=None):
+ self.queue = queue
+ self.exchange_type = exchange_type
+
+ def __call__(self, fn=None):
+ queue = self.queue
+ exchange_type = self.exchange_type
+
+ class PublisherMixin(object):
+
+ queue = None
+
+ @classmethod
+ def delay(cls, *args, **kwargs):
+ return cls.apply_async(args, kwargs)
+
+ @classmethod
+ def apply_async(cls, args=None, kwargs=None, queue=None, uuid=None, **kw):
+ task_id = uuid or str(uuid4())
+ args = args or []
+ kwargs = kwargs or {}
+ queue = (
+ queue or
+ getattr(cls.queue, 'im_func', cls.queue) or
+ settings.CELERY_DEFAULT_QUEUE
+ )
+ obj = {
+ 'uuid': task_id,
+ 'args': args,
+ 'kwargs': kwargs,
+ 'task': cls.name
+ }
+ obj.update(**kw)
+ if callable(queue):
+ queue = queue()
+ if not settings.IS_TESTING(sys.argv):
+ with Connection(settings.BROKER_URL) as conn:
+ exchange = Exchange(queue, type=exchange_type or 'direct')
+ producer = Producer(conn)
+ logger.debug('publish {}({}, queue={})'.format(
+ cls.name,
+ task_id,
+ queue
+ ))
+ producer.publish(obj,
+ serializer='json',
+ compression='bzip2',
+ exchange=exchange,
+ declare=[exchange],
+ delivery_mode="persistent",
+ routing_key=queue)
+ return (obj, queue)
+
+ # If the object we're wrapping *is* a class (e.g., RunJob), return
+ # a *new* class that inherits from the wrapped class *and* BaseTask
+ # In this way, the new class returned by our decorator is the class
+ # being decorated *plus* PublisherMixin so cls.apply_async() and
+ # cls.delay() work
+ bases = []
+ ns = {'name': serialize_task(fn), 'queue': queue}
+ if inspect.isclass(fn):
+ bases = list(fn.__bases__)
+ ns.update(fn.__dict__)
+ cls = type(
+ fn.__name__,
+ tuple(bases + [PublisherMixin]),
+ ns
+ )
+ if inspect.isclass(fn):
+ return cls
+
+ # if the object being decorated is *not* a class (it's a Python
+ # function), make fn.apply_async and fn.delay proxy through to the
+ # PublisherMixin we dynamically created above
+ setattr(fn, 'name', cls.name)
+ setattr(fn, 'apply_async', cls.apply_async)
+ setattr(fn, 'delay', cls.delay)
+ return fn
diff --git a/awx/main/dispatch/reaper.py b/awx/main/dispatch/reaper.py
new file mode 100644
index 0000000000..8e9a9d3d15
--- /dev/null
+++ b/awx/main/dispatch/reaper.py
@@ -0,0 +1,46 @@
+from datetime import timedelta
+import logging
+
+from django.db.models import Q
+from django.utils.timezone import now as tz_now
+from django.contrib.contenttypes.models import ContentType
+
+from awx.main.models import Instance, UnifiedJob, WorkflowJob
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+def reap_job(j, status):
+ j.status = status
+ j.start_args = '' # blank field to remove encrypted passwords
+ j.job_explanation += ' '.join((
+ 'Task was marked as running in Tower but was not present in',
+ 'the job queue, so it has been marked as failed.',
+ ))
+ j.save(update_fields=['status', 'start_args', 'job_explanation'])
+ if hasattr(j, 'send_notification_templates'):
+ j.send_notification_templates('failed')
+ j.websocket_emit_status(status)
+ logger.error(
+ '{} is no longer running; reaping'.format(j.log_format)
+ )
+
+
+def reap(instance=None, status='failed'):
+ '''
+ Reap all jobs in waiting|running for this instance.
+ '''
+ me = instance or Instance.objects.me()
+ now = tz_now()
+ workflow_ctype_id = ContentType.objects.get_for_model(WorkflowJob).id
+ jobs = UnifiedJob.objects.filter(
+ (
+ Q(status='running') |
+ Q(status='waiting', modified__lte=now - timedelta(seconds=60))
+ ) & (
+ Q(execution_node=me.hostname) |
+ Q(controller_node=me.hostname)
+ ) & ~Q(polymorphic_ctype_id=workflow_ctype_id)
+ )
+ for j in jobs:
+ reap_job(j, status)
diff --git a/awx/main/dispatch/worker/__init__.py b/awx/main/dispatch/worker/__init__.py
new file mode 100644
index 0000000000..009386914f
--- /dev/null
+++ b/awx/main/dispatch/worker/__init__.py
@@ -0,0 +1,3 @@
+from .base import AWXConsumer, BaseWorker # noqa
+from .callback import CallbackBrokerWorker # noqa
+from .task import TaskWorker # noqa
diff --git a/awx/main/dispatch/worker/base.py b/awx/main/dispatch/worker/base.py
new file mode 100644
index 0000000000..11cb95e06a
--- /dev/null
+++ b/awx/main/dispatch/worker/base.py
@@ -0,0 +1,146 @@
+# Copyright (c) 2018 Ansible by Red Hat
+# All Rights Reserved.
+
+import os
+import logging
+import signal
+from uuid import UUID
+from Queue import Empty as QueueEmpty
+
+from kombu import Producer
+from kombu.mixins import ConsumerMixin
+
+from awx.main.dispatch.pool import WorkerPool
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+def signame(sig):
+ return dict(
+ (k, v) for v, k in signal.__dict__.items()
+ if v.startswith('SIG') and not v.startswith('SIG_')
+ )[sig]
+
+
+class WorkerSignalHandler:
+
+ def __init__(self):
+ self.kill_now = False
+ signal.signal(signal.SIGINT, self.exit_gracefully)
+
+ def exit_gracefully(self, *args, **kwargs):
+ self.kill_now = True
+
+
+class AWXConsumer(ConsumerMixin):
+
+ def __init__(self, name, connection, worker, queues=[], pool=None):
+ self.connection = connection
+ self.total_messages = 0
+ self.queues = queues
+ self.worker = worker
+ self.pool = pool
+ if pool is None:
+ self.pool = WorkerPool()
+ self.pool.init_workers(self.worker.work_loop)
+
+ def get_consumers(self, Consumer, channel):
+ logger.debug(self.listening_on)
+ return [Consumer(queues=self.queues, accept=['json'],
+ callbacks=[self.process_task])]
+
+ @property
+ def listening_on(self):
+ return 'listening on {}'.format([
+ '{} [{}]'.format(q.name, q.exchange.type) for q in self.queues
+ ])
+
+ def control(self, body, message):
+ logger.warn(body)
+ control = body.get('control')
+ if control in ('status', 'running'):
+ producer = Producer(
+ channel=self.connection,
+ routing_key=message.properties['reply_to']
+ )
+ if control == 'status':
+ msg = '\n'.join([self.listening_on, self.pool.debug()])
+ elif control == 'running':
+ msg = []
+ for worker in self.pool.workers:
+ worker.calculate_managed_tasks()
+ msg.extend(worker.managed_tasks.keys())
+ producer.publish(msg)
+ elif control == 'reload':
+ for worker in self.pool.workers:
+ worker.quit()
+ else:
+ logger.error('unrecognized control message: {}'.format(control))
+ message.ack()
+
+ def process_task(self, body, message):
+ if 'control' in body:
+ return self.control(body, message)
+ if len(self.pool):
+ if "uuid" in body and body['uuid']:
+ try:
+ queue = UUID(body['uuid']).int % len(self.pool)
+ except Exception:
+ queue = self.total_messages % len(self.pool)
+ else:
+ queue = self.total_messages % len(self.pool)
+ else:
+ queue = 0
+ self.pool.write(queue, body)
+ self.total_messages += 1
+ message.ack()
+
+ def run(self, *args, **kwargs):
+ signal.signal(signal.SIGINT, self.stop)
+ signal.signal(signal.SIGTERM, self.stop)
+ self.worker.on_start()
+ super(AWXConsumer, self).run(*args, **kwargs)
+
+ def stop(self, signum, frame):
+ self.should_stop = True # this makes the kombu mixin stop consuming
+ logger.debug('received {}, stopping'.format(signame(signum)))
+ self.worker.on_stop()
+ raise SystemExit()
+
+
+class BaseWorker(object):
+
+ def work_loop(self, queue, finished, idx, *args):
+ ppid = os.getppid()
+ signal_handler = WorkerSignalHandler()
+ while not signal_handler.kill_now:
+ # if the parent PID changes, this process has been orphaned
+ # via e.g., segfault or sigkill, we should exit too
+ if os.getppid() != ppid:
+ break
+ try:
+ body = queue.get(block=True, timeout=1)
+ if body == 'QUIT':
+ break
+ except QueueEmpty:
+ continue
+ except Exception as e:
+ logger.error("Exception on worker, restarting: " + str(e))
+ continue
+ try:
+ self.perform_work(body, *args)
+ finally:
+ if 'uuid' in body:
+ uuid = body['uuid']
+ logger.debug('task {} is finished'.format(uuid))
+ finished.put(uuid)
+ logger.warn('worker exiting gracefully pid:{}'.format(os.getpid()))
+
+ def perform_work(self, body):
+ raise NotImplementedError()
+
+ def on_start(self):
+ pass
+
+ def on_stop(self):
+ pass
diff --git a/awx/main/dispatch/worker/callback.py b/awx/main/dispatch/worker/callback.py
new file mode 100644
index 0000000000..caa655bd9a
--- /dev/null
+++ b/awx/main/dispatch/worker/callback.py
@@ -0,0 +1,120 @@
+import logging
+import time
+import os
+import signal
+import traceback
+
+from django.conf import settings
+from django.db import DatabaseError, OperationalError, connection as django_connection
+from django.db.utils import InterfaceError, InternalError
+
+from awx.main.consumers import emit_channel_notification
+from awx.main.models import (JobEvent, AdHocCommandEvent, ProjectUpdateEvent,
+ InventoryUpdateEvent, SystemJobEvent, UnifiedJob)
+
+from .base import BaseWorker
+
+logger = logging.getLogger('awx.main.commands.run_callback_receiver')
+
+
+class CallbackBrokerWorker(BaseWorker):
+ '''
+ A worker implementation that deserializes callback event data and persists
+ it into the database.
+
+ The code that *builds* these types of messages is found in the AWX display
+ callback (`awx.lib.awx_display_callback`).
+ '''
+
+ MAX_RETRIES = 2
+
+ def perform_work(self, body):
+ try:
+ event_map = {
+ 'job_id': JobEvent,
+ 'ad_hoc_command_id': AdHocCommandEvent,
+ 'project_update_id': ProjectUpdateEvent,
+ 'inventory_update_id': InventoryUpdateEvent,
+ 'system_job_id': SystemJobEvent,
+ }
+
+ if not any([key in body for key in event_map]):
+ raise Exception('Payload does not have a job identifier')
+ if settings.DEBUG:
+ from pygments import highlight
+ from pygments.lexers import PythonLexer
+ from pygments.formatters import Terminal256Formatter
+ from pprint import pformat
+ logger.info('Body: {}'.format(
+ highlight(pformat(body, width=160), PythonLexer(), Terminal256Formatter(style='friendly'))
+ )[:1024 * 4])
+
+ def _save_event_data():
+ for key, cls in event_map.items():
+ if key in body:
+ cls.create_from_data(**body)
+
+ job_identifier = 'unknown job'
+ for key in event_map.keys():
+ if key in body:
+ job_identifier = body[key]
+ break
+
+ if body.get('event') == 'EOF':
+ try:
+ final_counter = body.get('final_counter', 0)
+ logger.info('Event processing is finished for Job {}, sending notifications'.format(job_identifier))
+ # EOF events are sent when stdout for the running task is
+ # closed. don't actually persist them to the database; we
+ # just use them to report `summary` websocket events as an
+ # approximation for when a job is "done"
+ emit_channel_notification(
+ 'jobs-summary',
+ dict(group_name='jobs', unified_job_id=job_identifier, final_counter=final_counter)
+ )
+ # Additionally, when we've processed all events, we should
+ # have all the data we need to send out success/failure
+ # notification templates
+ uj = UnifiedJob.objects.get(pk=job_identifier)
+ if hasattr(uj, 'send_notification_templates'):
+ retries = 0
+ while retries < 5:
+ if uj.finished:
+ uj.send_notification_templates('succeeded' if uj.status == 'successful' else 'failed')
+ break
+ else:
+ # wait a few seconds to avoid a race where the
+ # events are persisted _before_ the UJ.status
+ # changes from running -> successful
+ retries += 1
+ time.sleep(1)
+ uj = UnifiedJob.objects.get(pk=job_identifier)
+ except Exception:
+ logger.exception('Worker failed to emit notifications: Job {}'.format(job_identifier))
+ return
+
+ retries = 0
+ while retries <= self.MAX_RETRIES:
+ try:
+ _save_event_data()
+ break
+ except (OperationalError, InterfaceError, InternalError):
+ if retries >= self.MAX_RETRIES:
+ logger.exception('Worker could not re-establish database connectivity, shutting down gracefully: Job {}'.format(job_identifier))
+ os.kill(os.getppid(), signal.SIGINT)
+ return
+ delay = 60 * retries
+ logger.exception('Database Error Saving Job Event, retry #{i} in {delay} seconds:'.format(
+ i=retries + 1,
+ delay=delay
+ ))
+ django_connection.close()
+ time.sleep(delay)
+ retries += 1
+ except DatabaseError:
+ logger.exception('Database Error Saving Job Event for Job {}'.format(job_identifier))
+ break
+ except Exception as exc:
+ tb = traceback.format_exc()
+ logger.error('Callback Task Processor Raised Exception: %r', exc)
+ logger.error('Detail: {}'.format(tb))
diff --git a/awx/main/dispatch/worker/task.py b/awx/main/dispatch/worker/task.py
new file mode 100644
index 0000000000..d1273749a1
--- /dev/null
+++ b/awx/main/dispatch/worker/task.py
@@ -0,0 +1,113 @@
+import inspect
+import logging
+import importlib
+import sys
+import traceback
+
+import six
+
+from awx.main.tasks import dispatch_startup, inform_cluster_of_shutdown
+
+from .base import BaseWorker
+
+logger = logging.getLogger('awx.main.dispatch')
+
+
+class TaskWorker(BaseWorker):
+ '''
+ A worker implementation that deserializes task messages and runs native
+ Python code.
+
+ The code that *builds* these types of messages is found in
+ `awx.main.dispatch.publish`.
+ '''
+
+ @classmethod
+ def resolve_callable(cls, task):
+ '''
+ Transform a dotted notation task into an imported, callable function, e.g.,
+
+ awx.main.tasks.delete_inventory
+ awx.main.tasks.RunProjectUpdate
+ '''
+ module, target = task.rsplit('.', 1)
+ module = importlib.import_module(module)
+ _call = None
+ if hasattr(module, target):
+ _call = getattr(module, target, None)
+ return _call
+
+ def run_callable(self, body):
+ '''
+ Given some AMQP message, import the correct Python code and run it.
+ '''
+ task = body['task']
+ uuid = body.get('uuid', '