You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/11/27 16:52:21 UTC
ambari git commit: AMBARI-14105 Oozie/Hive "Database User" field
validation missed. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 01f7d709e -> 5becb314e
AMBARI-14105 Oozie/Hive "Database User" field validation missed. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5becb314
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5becb314
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5becb314
Branch: refs/heads/trunk
Commit: 5becb314e91e79f13911e85dbe82e95b50a19e58
Parents: 01f7d70
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Nov 27 17:48:34 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Nov 27 17:48:34 2015 +0200
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 1 +
.../OOZIE/4.0.0.2.0/configuration/oozie-site.xml | 1 +
.../OOZIE/4.2.0.2.3/configuration/oozie-site.xml | 1 +
.../stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml | 1 +
.../HDP/2.1/services/OOZIE/configuration/oozie-site.xml | 1 +
.../stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml | 1 +
.../HDPWIN/2.2/services/HIVE/configuration/hive-site.xml | 1 +
.../app/models/configs/objects/service_config_property.js | 8 ++------
8 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5becb314/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index 29b4796..08cc4d7 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -69,6 +69,7 @@ limitations under the License.
<display-name>Database Username</display-name>
<description>username to use against metastore database</description>
<value-attributes>
+ <type>db_user</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5becb314/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
index 860a111..57cc8a7 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
@@ -227,6 +227,7 @@
Database user name to use to connect to the database
</description>
<value-attributes>
+ <type>db_user</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5becb314/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
index 0e0a79d..b25cfcb 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
@@ -108,6 +108,7 @@
Database user name to use to connect to the database
</description>
<value-attributes>
+ <type>db_user</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5becb314/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
index c8ba0a9..aad9ba5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
@@ -67,6 +67,7 @@ limitations under the License.
<display-name>Database Username</display-name>
<description>username to use against metastore database</description>
<value-attributes>
+ <type>db_user</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5becb314/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
index e77cdbb..af1a0a8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
@@ -226,6 +226,7 @@
Database user name to use to connect to the database
</description>
<value-attributes>
+ <type>db_user</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5becb314/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index 3058fc4..20c04db 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -436,6 +436,7 @@ limitations under the License.
<display-name>Database Username</display-name>
<description>username to use against metastore database</description>
<value-attributes>
+ <type>db_user</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5becb314/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
index be7bc7e..d771748 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml
@@ -404,6 +404,7 @@ limitations under the License.
<display-name>Database Username</display-name>
<description>username to use against metastore database</description>
<value-attributes>
+ <type>db_user</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5becb314/ambari-web/app/models/configs/objects/service_config_property.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js b/ambari-web/app/models/configs/objects/service_config_property.js
index 5e23735..fc723c7 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -430,14 +430,10 @@ App.ServiceConfigProperty = Em.Object.extend({
}
break;
case 'user':
- if (!validator.isValidUNIXUser(value)){
- this.set('errorMessage', 'Username is not valid');
- isError = true;
- }
- break;
case 'database':
+ case 'db_user':
if (!validator.isValidDbName(value)){
- this.set('errorMessage', 'Database is not valid');
+ this.set('errorMessage', 'Value is not valid');
isError = true;
}
break;