External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 05:59:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Change default pod spec in OPTIONS request to json

Browse Source
This commit is contained in:
Shane McDonald
2019-09-27 12:58:09 -04:00
parent ad1e7c46c3
commit 59413e0a8f
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/metadata.py
View File

@@ -2,7 +2,6 @@
# All Rights Reserved. # All Rights Reserved.
from collections import OrderedDict from collections import OrderedDict
import yaml
# Django # Django
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
@@ -203,7 +202,7 @@ class Metadata(metadata.SimpleMetadata):
continue continue
if field == "pod_spec_override": if field == "pod_spec_override":
meta['default'] = yaml.dump(PodManager().pod_definition) meta['default'] = PodManager().pod_definition
# Add type choices if available from the serializer. # Add type choices if available from the serializer.
if field == 'type' and hasattr(serializer, 'get_type_choices'): if field == 'type' and hasattr(serializer, 'get_type_choices'):

39
awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
View File

@@ -57,9 +57,42 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
toggleLabel: strings.get('container.POD_SPEC_TOGGLE') toggleLabel: strings.get('container.POD_SPEC_TOGGLE')
}; };
const podSpecValue = EditContainerGroupDataset.data.pod_spec_override.trim(); function sanitizeVars (str) {
const defaultPodSpecValue = instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default.trim(); // Quick function to test if the host vars are a json-object-string,
if (podSpecValue && podSpecValue !== defaultPodSpecValue) { // by testing if they can be converted to a JSON object w/o error.
function IsJsonString (varStr) {
try {
JSON.parse(varStr);
} catch (e) {
return false;
}
return true;
}
if (typeof str === 'undefined') {
return '---';
}
if (typeof str !== 'string') {
const yamlStr = jsyaml.safeDump(str);
// jsyaml.safeDump doesn't process an empty object correctly
if (yamlStr === '{}\n') {
return '---';
}
return yamlStr;
}
if (str === '' || str === '{}') {
return '---';
} else if (IsJsonString(str)) {
str = JSON.parse(str);
return jsyaml.safeDump(str);
}
return str;
}
const podSpecValue = sanitizeVars(EditContainerGroupDataset.data.pod_spec_override);
const defaultPodSpecValue = sanitizeVars(instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default);
if (podSpecValue && podSpecValue.trim() !== defaultPodSpecValue.trim()) {
vm.form.extraVars.isOpen = true; vm.form.extraVars.isOpen = true;
} else { } else {
vm.form.extraVars.isOpen = false; vm.form.extraVars.isOpen = false;