You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/03/01 22:29:25 UTC
ambari git commit: AMBARI-15251. Ambari - Managed KDC Credentials is
not saving the Admin Principal and Admin Password when Adding Services.
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 beac3462d -> 479f21327
AMBARI-15251. Ambari - Managed KDC Credentials is not saving the Admin Principal and Admin Password when Adding Services. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/479f2132
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/479f2132
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/479f2132
Branch: refs/heads/branch-2.2
Commit: 479f21327a327cfad90e21f96270317f0926f56e
Parents: beac346
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Mar 1 22:03:47 2016 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Mar 1 23:29:20 2016 +0200
----------------------------------------------------------------------
.../main/admin/kerberos/step4_controller.js | 61 --------------------
ambari-web/app/routes/add_service_routes.js | 2 -
.../admin/kerberos/step4_controller_test.js | 10 +---
3 files changed, 1 insertion(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/479f2132/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
index d4b025c..339afbf 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
@@ -25,8 +25,6 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
return this.get('wizardController.name') == 'addServiceController';
}.property('wizardController.name'),
- adminPropertyNames: [{name: 'admin_principal', displayName: 'Admin principal'}, {name: 'admin_password', displayName: 'Admin password'}],
-
clearStep: function() {
this.set('isRecommendedLoaded', false);
this.set('selectedService', null);
@@ -118,8 +116,6 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
if (this.get('wizardController.name') == 'addServiceController') {
// config properties for installed services should be disabled on Add Service Wizard
configProperties.forEach(function(item) {
- if (this.get('adminPropertyNames').mapProperty('name').contains(item.get('name'))
- || item.get('name') === 'persist_credentials') return;
if (this.get('installedServiceNames').contains(item.get('serviceName')) || item.get('serviceName') == 'Cluster') {
item.set('isEditable', false);
} else if (stackConfigs) {
@@ -164,7 +160,6 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
// stored configs from previous steps (Configure Kerberos or Customize Services for ASW)
var storedServiceConfigs = this.get('wizardController').getDBProperty('serviceConfigProperties');
var installedServiceNames = ['Cluster'].concat(App.Service.find().mapProperty('serviceName'));
- var adminProps = [];
var configProperties = configs.slice(0);
var siteProperties = App.config.get('preDefinedSiteProperties');
// override stored values
@@ -173,9 +168,7 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
// show admin properties in add service wizard
if (this.get('isWithinAddService')) {
installedServiceNames = installedServiceNames.concat(this.get('selectedServiceNames'));
- adminProps = this.createAdminCredentialsProperties(configProperties);
}
- configProperties = adminProps.concat(configProperties);
configProperties = configProperties.filter(function(item) {
return installedServiceNames.contains(item.get('serviceName'));
});
@@ -274,59 +267,5 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
});
this.updateKerberosDescriptor(kerberosDescriptor, configs);
App.get('router.kerberosWizardController').saveKerberosDescriptorConfigs(kerberosDescriptor);
- },
-
- /**
- * Generate App.ServiceConfigProperty instances for 'admin_principal' and 'admin_password' properties
- * Used for Add Service Wizard only on Configure Identities step.
- *
- * @param {object[]} loadedProperties list of already loaded config properties
- * @returns {App.ServiceConfigProperty[]}
- */
- createAdminCredentialsProperties: function(loadedProperties) {
- if (App.router.get('mainAdminKerberosController.isManualKerberos')) {
- return [];
- }
- var fileName = 'krb5-conf.xml';
- var krbProperties = loadedProperties.filterProperty('filename', fileName);
- var siteProperties = App.config.get('preDefinedSiteProperties');
- var credentialProperties = this.get('adminPropertyNames').map(function(prop, index) {
- var existingProperty = krbProperties.findProperty('name', prop.name);
- var coreObject = {
- displayName: prop.displayName,
- isRequired: false,
- isRequiredByAgent: false,
- supportsFinal: false,
- isFinal: false,
- isSecureConfig: true,
- index: index,
- value: '',
- isVisible: true,
- isUserProperty: false
- };
- var propTpl = App.config.createDefaultConfig(prop.name, 'Cluster', fileName, false, coreObject);
- var siteProperty = siteProperties.filterProperty('filename', fileName).findProperty('name', prop.name);
- if (!Em.isNone(siteProperty)) {
- propTpl = $.extend(true, {}, siteProperty, propTpl);
- }
- if (!Em.isNone(existingProperty)) {
- propTpl = $.extend(true, {}, propTpl, existingProperty);
- }
- return App.ServiceConfigProperty.create(propTpl);
- });
- if (App.get('supports.storeKDCCredentials')) {
- var storeProps = [];
- this.initilizeKDCStoreProperties(storeProps);
- var persistCredentialsProp = storeProps.findProperty('name', 'persist_credentials');
- if (!Em.isNone(persistCredentialsProp)) {
- Em.setProperties(persistCredentialsProp, {
- index: credentialProperties.length,
- serviceName: 'Cluster',
- category: 'Global'
- });
- credentialProperties.pushObject(App.ServiceConfigProperty.create(persistCredentialsProp));
- }
- }
- return credentialProperties;
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/479f2132/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index ea3baa1..f756ef6 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -293,8 +293,6 @@ module.exports = App.WizardRoute.extend({
if (App.Cluster.find().objectAt(0).get('isKerberosEnabled')) {
if (router.get('mainAdminKerberosController.isManualKerberos')) {
router.get('wizardStep8Controller').updateKerberosDescriptor(true);
- } else {
- router.get('kerberosWizardStep2Controller').createKerberosAdminSession(router.get('kerberosWizardStep4Controller.stepConfigs')[0].get('configs'));
}
router.get('addServiceController').cacheStepConfigValues(router.get('kerberosWizardStep4Controller'));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/479f2132/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
index 39c1ef3..bb94588 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
@@ -210,9 +210,7 @@ describe('App.KerberosWizardStep4Controller', function() {
{ name: 'spnego_keytab', e: false },
{ name: 'falcon_keytab', e: true },
{ name: 'hdfs_keytab', e: false },
- { name: 'mapreduce_keytab', e: true },
- { name: 'admin_principal', e: true },
- { name: 'admin_password', e: true }
+ { name: 'mapreduce_keytab', e: true }
];
propertiesEditableTests.forEach(function(test) {
@@ -221,12 +219,6 @@ describe('App.KerberosWizardStep4Controller', function() {
});
});
- ['admin_principal', 'admin_password'].forEach(function(item) {
- it('property `{0}` should have empty value'.format(item), function() {
- expect(res.findProperty('name', item).get('value')).to.be.eql('');
- });
- });
-
after(function() {
controller.destroy();
controller = null;