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

add gcp service account file input

Browse Source
This commit is contained in:
Jake McDermott 2017-11-16 16:40:32 -05:00
parent f15b1ae549
commit 1229a10f35
No known key found for this signature in database
GPG Key ID: 3B02CAD476EECB35
4 changed files with 147 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
awx/ui/client/features/credentials/add-credentials.controller.js
View File

@ -1,4 +1,4 @@
function AddCredentialsController (models, $state, strings) {
function AddCredentialsController (models, $state, $scope, strings, componentsStrings) {
const vm = this || {};
const { me, credential, credentialType, organization } = models;
@ -28,11 +28,27 @@ function AddCredentialsController (models, $state, strings) {
vm.form.credential_type._model = credentialType;
vm.form.credential_type._placeholder = strings.get('inputs.CREDENTIAL_TYPE_PLACEHOLDER');
const gceFileInputSchema = {
id: 'gce_service_account_key',
type: 'file',
label: strings.get('inputs.GCE_FILE_INPUT_LABEL'),
help_text: strings.get('inputs.GCE_FILE_INPUT_HELP_TEXT'),
};
let gceFileInputPreEditValues;
vm.form.inputs = {
_get: () => {
credentialType.mergeInputProperties();
return credentialType.get('inputs.fields');
const fields = credentialType.get('inputs.fields');
if (credentialType.get('name') === 'Google Compute Engine') {
fields.splice(2, 0, gceFileInputSchema);
$scope.$watch(`vm.form.${gceFileInputSchema.id}._value`, vm.gceOnFileInputChanged);
}
return fields;
},
_source: vm.form.credential_type,
_reference: 'vm.form.inputs',
@ -42,18 +58,66 @@ function AddCredentialsController (models, $state, strings) {
vm.form.save = data => {
data.user = me.get('id');
delete data.inputs[gceFileInputSchema.id];
return credential.request('post', { data });
};
vm.form.onSaveSuccess = res => {
$state.go('credentials.edit', { credential_id: res.data.id }, { reload: true });
};
vm.gceOnFileInputChanged = (value, oldValue) => {
if (value === oldValue) return;
const gceFileIsLoaded = !!value;
const gceFileInputState = vm.form[gceFileInputSchema.id];
const { obj, error } = vm.gceParseFileInput(value);
gceFileInputState._isValid = !error;
gceFileInputState._message = error ? componentsStrings.get('message.INVALID_INPUT') : '';
vm.form.project._disabled = gceFileIsLoaded;
vm.form.username._disabled = gceFileIsLoaded;
vm.form.ssh_key_data._disabled = gceFileIsLoaded;
vm.form.ssh_key_data._displayHint = !vm.form.ssh_key_data._disabled;
if (gceFileIsLoaded) {
gceFileInputPreEditValues = Object.assign({}, {
project: vm.form.project._value,
ssh_key_data: vm.form.ssh_key_data._value,
username: vm.form.username._value
});
vm.form.project._value = _.get(obj, 'project_id', '');
vm.form.ssh_key_data._value = _.get(obj, 'private_key', '');
vm.form.username._value = _.get(obj, 'client_email', '');
} else {
vm.form.project._value = gceFileInputPreEditValues.project;
vm.form.ssh_key_data._value = gceFileInputPreEditValues.ssh_key_data;
vm.form.username._value = gceFileInputPreEditValues.username;
}
};
vm.gceParseFileInput = value => {
let obj;
let error;
try {
obj = angular.fromJson(value);
} catch (err) {
error = err;
}
return { obj, error };
};
}
AddCredentialsController.$inject = [
'resolvedModels',
'$state',
'CredentialsStrings'
'$scope',
'CredentialsStrings',
'ComponentsStrings'
];
export default AddCredentialsController;

4
awx/ui/client/features/credentials/add-edit-credentials.view.html
View File

@ -14,9 +14,9 @@
<at-divider></at-divider>
<at-input-lookup col="4" tab="4" state="vm.form.credential_type"></at-input-lookup>
<at-input-lookup col="4" tab="5" state="vm.form.credential_type"></at-input-lookup>
<at-input-group col="4" tab="5" state="vm.form.inputs">
<at-input-group col="4" tab="6" state="vm.form.inputs">
{{:: vm.strings.get('inputs.GROUP_TITLE') }}
</at-input-group>

4
awx/ui/client/features/credentials/credentials.strings.js
View File

@ -17,7 +17,9 @@ function CredentialsStrings (BaseString) {
ns.inputs = {
GROUP_TITLE: t.s('Type Details'),
ORGANIZATION_PLACEHOLDER: t.s('SELECT AN ORGANIZATION'),
CREDENTIAL_TYPE_PLACEHOLDER: t.s('SELECT A CREDENTIAL TYPE')
CREDENTIAL_TYPE_PLACEHOLDER: t.s('SELECT A CREDENTIAL TYPE'),
GCE_FILE_INPUT_LABEL: t.s('Service Account JSON File'),
GCE_FILE_INPUT_HELP_TEXT: t.s('Provide account information using Google Compute Engine JSON credentials file.')
};
ns.add = {

79
awx/ui/client/features/credentials/edit-credentials.controller.js
View File

@ -1,4 +1,4 @@
function EditCredentialsController (models, $state, $scope, strings) {
function EditCredentialsController (models, $state, $scope, strings, componentsStrings) {
const vm = this || {};
const { me, credential, credentialType, organization } = models;
@ -64,15 +64,35 @@ function EditCredentialsController (models, $state, $scope, strings) {
vm.form.credential_type._displayValue = credentialType.get('name');
vm.form.credential_type._placeholder = strings.get('inputs.CREDENTIAL_TYPE_PLACEHOLDER');
const gceFileInputSchema = {
id: 'gce_service_account_key',
type: 'file',
label: strings.get('inputs.GCE_FILE_INPUT_LABEL'),
help_text: strings.get('inputs.GCE_FILE_INPUT_HELP_TEXT'),
};
let gceFileInputPreEditValues;
vm.form.inputs = {
_get () {
let fields;
credentialType.mergeInputProperties();
if (credentialType.get('id') === credential.get('credential_type')) {
return credential.assignInputGroupValues(credentialType.get('inputs.fields'));
fields = credential.assignInputGroupValues(credentialType.get('inputs.fields'));
} else {
fields = credentialType.get('inputs.fields');
}
return credentialType.get('inputs.fields');
if (credentialType.get('name') === 'Google Compute Engine') {
fields.splice(2, 0, gceFileInputSchema);
$scope.$watch(`vm.form.${gceFileInputSchema.id}._value`, vm.gceOnFileInputChanged);
$scope.$watch('vm.form.ssh_key_data._isBeingReplaced', vm.gceOnReplaceKeyChanged);
}
return fields;
},
_source: vm.form.credential_type,
_reference: 'vm.form.inputs',
@ -88,19 +108,70 @@ function EditCredentialsController (models, $state, $scope, strings) {
data.user = me.get('id');
credential.unset('inputs');
delete data.inputs[gceFileInputSchema.id];
return credential.request('put', { data });
};
vm.form.onSaveSuccess = () => {
$state.go('credentials.edit', { credential_id: credential.get('id') }, { reload: true });
};
vm.gceOnReplaceKeyChanged = value => {
vm.form[gceFileInputSchema.id]._disabled = !value;
};
vm.gceOnFileInputChanged = (value, oldValue) => {
if (value === oldValue) return;
const gceFileIsLoaded = !!value;
const gceFileInputState = vm.form[gceFileInputSchema.id];
const { obj, error } = vm.gceParseFileInput(value);
gceFileInputState._isValid = !error;
gceFileInputState._message = error ? componentsStrings.get('message.INVALID_INPUT') : '';
vm.form.project._disabled = gceFileIsLoaded;
vm.form.username._disabled = gceFileIsLoaded;
vm.form.ssh_key_data._disabled = gceFileIsLoaded;
vm.form.ssh_key_data._displayHint = !vm.form.ssh_key_data._disabled;
if (gceFileIsLoaded) {
gceFileInputPreEditValues = Object.assign({}, {
project: vm.form.project._value,
ssh_key_data: vm.form.ssh_key_data._value,
username: vm.form.username._value
});
vm.form.project._value = _.get(obj, 'project_id', '');
vm.form.ssh_key_data._value = _.get(obj, 'private_key', '');
vm.form.username._value = _.get(obj, 'client_email', '');
} else {
vm.form.project._value = gceFileInputPreEditValues.project;
vm.form.ssh_key_data._value = gceFileInputPreEditValues.ssh_key_data;
vm.form.username._value = gceFileInputPreEditValues.username;
}
};
vm.gceParseFileInput = value => {
let obj;
let error;
try {
obj = angular.fromJson(value);
} catch (err) {
error = err;
}
return { obj, error };
};
}
EditCredentialsController.$inject = [
'resolvedModels',
'$state',
'$scope',
'CredentialsStrings'
'CredentialsStrings',
'ComponentsStrings'
];
export default EditCredentialsController;