You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by br...@apache.org on 2013/12/17 19:59:11 UTC
[2/2] git commit: SENTRY-66: Allow Sentry e2e tests to use HS2 LDAP
authentication in cluster mode (Sravya Tirukkovalur via Brock Noland)
SENTRY-66: Allow Sentry e2e tests to use HS2 LDAP authentication in cluster mode (Sravya Tirukkovalur via Brock Noland)
Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/b9aa0b7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/b9aa0b7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/b9aa0b7a
Branch: refs/heads/master
Commit: b9aa0b7a0ea944493e5b681d3fa2cfa9e5a1a1d2
Parents: c5dd7da
Author: Brock Noland <br...@apache.org>
Authored: Tue Dec 17 12:58:43 2013 -0600
Committer: Brock Noland <br...@apache.org>
Committed: Tue Dec 17 12:58:43 2013 -0600
----------------------------------------------------------------------
.../AbstractTestWithStaticConfiguration.java | 6 +--
.../apache/sentry/tests/e2e/hive/Context.java | 4 +-
.../sentry/tests/e2e/hive/TestCrossDbOps.java | 34 +++++++-------
.../sentry/tests/e2e/hive/TestEndToEnd.java | 8 ++--
.../e2e/hive/TestExportImportPrivileges.java | 14 +++---
.../e2e/hive/TestMetadataObjectRetrieval.java | 22 ++++-----
.../tests/e2e/hive/TestMetadataPermissions.java | 10 ++--
.../tests/e2e/hive/TestMovingToProduction.java | 16 +++----
.../tests/e2e/hive/TestPerDBConfiguration.java | 43 +++++++++---------
.../e2e/hive/TestPerDatabasePolicyFile.java | 4 +-
.../e2e/hive/TestPrivilegeAtTransform.java | 4 +-
.../e2e/hive/TestPrivilegesAtDatabaseScope.java | 31 ++++++-------
.../e2e/hive/TestPrivilegesAtFunctionScope.java | 12 ++---
.../e2e/hive/TestPrivilegesAtTableScope.java | 48 ++++++++++----------
.../e2e/hive/TestRuntimeMetadataRetrieval.java | 28 ++++++------
.../sentry/tests/e2e/hive/TestSandboxOps.java | 32 ++++++-------
.../hive/TestSentryOnFailureHookLoading.java | 6 +--
.../tests/e2e/hive/TestServerConfiguration.java | 20 ++++----
.../tests/e2e/hive/TestUriPermissions.java | 28 ++++++------
.../tests/e2e/hive/TestUserManagement.java | 18 ++++----
20 files changed, 194 insertions(+), 194 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java
index a1d9d15..6ae3776 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/AbstractTestWithStaticConfiguration.java
@@ -94,7 +94,7 @@ public abstract class AbstractTestWithStaticConfiguration {
baseDir, confDir, dataDir, policyFileLocation);
}
protected void dropDb(String user, String...dbs) throws Exception {
- Connection connection = context.createConnection(user, "password");
+ Connection connection = context.createConnection(user);
Statement statement = connection.createStatement();
for(String db : dbs) {
statement.execute("DROP DATABASE IF EXISTS " + db + " CASCADE");
@@ -103,7 +103,7 @@ public abstract class AbstractTestWithStaticConfiguration {
connection.close();
}
protected void createDb(String user, String...dbs) throws Exception {
- Connection connection = context.createConnection(user, "password");
+ Connection connection = context.createConnection(user);
Statement statement = connection.createStatement();
for(String db : dbs) {
statement.execute("CREATE DATABASE " + db);
@@ -113,7 +113,7 @@ public abstract class AbstractTestWithStaticConfiguration {
}
protected void createTable(String user, String db, File dataFile, String...tables)
throws Exception {
- Connection connection = context.createConnection(user, "password");
+ Connection connection = context.createConnection(user);
Statement statement = connection.createStatement();
statement.execute("USE " + db);
for(String table : tables) {
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/Context.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/Context.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/Context.java
index f86ae6d..66cd2d1 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/Context.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/Context.java
@@ -73,7 +73,9 @@ public class Context {
statements = Sets.newHashSet();
}
- public Connection createConnection(String username, String password) throws Exception {
+ public Connection createConnection(String username) throws Exception {
+
+ String password = username;
Connection connection = hiveServer.createConnection(username, password);
connections.add(connection);
assertNotNull("Connection is null", connection);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestCrossDbOps.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestCrossDbOps.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestCrossDbOps.java
index 6d3d1b9..836cb27 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestCrossDbOps.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestCrossDbOps.java
@@ -86,7 +86,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
policyFile.write(context.getPolicyFile());
// admin create two databases
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
statement.execute("DROP DATABASE IF EXISTS DB_2 CASCADE");
@@ -104,7 +104,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
// test show databases
// show databases shouldn't filter any of the dbs from the resultset
- Connection conn = context.createConnection(USER1_1, "");
+ Connection conn = context.createConnection(USER1_1);
Statement stmt = context.createStatement(conn);
ResultSet res = stmt.executeQuery("SHOW DATABASES");
List<String> result = new ArrayList<String>();
@@ -148,7 +148,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
conn.close();
// test show databases and show tables for user2_1
- conn = context.createConnection(USER2_1, "");
+ conn = context.createConnection(USER2_1);
stmt = context.createStatement(conn);
res = stmt.executeQuery("SHOW DATABASES");
result.clear();
@@ -202,7 +202,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
policyFile.write(context.getPolicyFile());
// admin create two databases
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
statement.execute("DROP DATABASE IF EXISTS DB_2 CASCADE");
@@ -220,7 +220,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
// test show databases
// show databases shouldn't filter any of the dbs from the resultset
- Connection conn = context.createConnection(USER1_1, "");
+ Connection conn = context.createConnection(USER1_1);
List<String> result = new ArrayList<String>();
// test direct JDBC metadata API
@@ -289,7 +289,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
conn.close();
// test show databases and show tables for user2
- conn = context.createConnection(USER2_1, "");
+ conn = context.createConnection(USER2_1);
// test direct JDBC metadata API
res = conn.getMetaData().getSchemas();
@@ -363,7 +363,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
createDb(ADMIN1, DB1, DB2);
for (String user : new String[]{USER1_1, USER1_2}) {
for (String dbName : new String[]{DB1, DB2}) {
- Connection userConn = context.createConnection(user, "foo");
+ Connection userConn = context.createConnection(user);
String tabName = user + "_tab1";
Statement userStmt = context.createStatement(userConn);
// Positive case: test user1 and user2 has permissions to access
@@ -390,7 +390,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
.write(context.getPolicyFile());
dropDb(ADMIN1, DB1);
createDb(ADMIN1, DB1);
- Connection adminCon = context.createConnection(ADMIN1, "password");
+ Connection adminCon = context.createConnection(ADMIN1);
Statement adminStmt = context.createStatement(adminCon);
String tabName = DB1 + "." + "admin_tab1";
adminStmt.execute("create table " + tabName + "(c1 string)");
@@ -418,7 +418,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
.setUserGroupMapping(StaticUserGroup.getStaticMapping());
policyFile.write(context.getPolicyFile());
- Connection adminCon = context.createConnection(ADMIN1, "foo");
+ Connection adminCon = context.createConnection(ADMIN1);
Statement adminStmt = context.createStatement(adminCon);
String dbName = "db1";
adminStmt.execute("use default");
@@ -427,7 +427,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
adminStmt.execute("create table " + dbName + ".table_1 (id int)");
adminStmt.close();
adminCon.close();
- Connection userConn = context.createConnection(USER1_1, "foo");
+ Connection userConn = context.createConnection(USER1_1);
Statement userStmt = context.createStatement(userConn);
context.assertAuthzException(userStmt, "select * from " + dbName + ".table_1");
userConn.close();
@@ -450,13 +450,13 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
dropDb(ADMIN1, DB1);
createDb(ADMIN1, DB1);
- Connection adminCon = context.createConnection(ADMIN1, "password");
+ Connection adminCon = context.createConnection(ADMIN1);
Statement adminStmt = context.createStatement(adminCon);
adminStmt.execute("create table " + DB1 + ".table_1 (id int)");
adminStmt.execute("create table " + DB1 + ".table_2 (id int)");
adminStmt.close();
adminCon.close();
- Connection userConn = context.createConnection(USER1_1, "foo");
+ Connection userConn = context.createConnection(USER1_1);
Statement userStmt = context.createStatement(userConn);
context.assertAuthzException(userStmt, "insert overwrite table " + DB1
+ ".table_2 select * from " + DB1 + ".table_1");
@@ -495,7 +495,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
.write(context.getPolicyFile());
// create dbs
- Connection adminCon = context.createConnection(ADMIN1, "foo");
+ Connection adminCon = context.createConnection(ADMIN1);
Statement adminStmt = context.createStatement(adminCon);
String dbName = "db1";
adminStmt.execute("use default");
@@ -522,7 +522,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
adminStmt.close();
adminCon.close();
- Connection userConn = context.createConnection(USER2_1, "foo");
+ Connection userConn = context.createConnection(USER2_1);
Statement userStmt = context.createStatement(userConn);
context.assertAuthzException(userStmt, "drop database " + dbName);
@@ -574,7 +574,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
dropDb(ADMIN1, DB1, DB2);
createDb(ADMIN1, DB1, DB2);
- Connection connection = context.createConnection(USER1_1, "password");
+ Connection connection = context.createConnection(USER1_1);
Statement statement = context.createStatement(connection);
// a
@@ -652,7 +652,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
// admin create two databases
dropDb(ADMIN1, DB1, DB2);
createDb(ADMIN1, DB1, DB2);
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement
.execute("CREATE TABLE " + DB1 + "." + TBL1 + "(id int)");
@@ -662,7 +662,7 @@ public class TestCrossDbOps extends AbstractTestWithStaticConfiguration {
.execute("CREATE TABLE " + DB2 + "." + TBL2 + "(id int)");
context.close();
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
// d
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestEndToEnd.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestEndToEnd.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestEndToEnd.java
index b31a135..26a9274 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestEndToEnd.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestEndToEnd.java
@@ -77,7 +77,7 @@ public class TestEndToEnd extends AbstractTestWithStaticConfiguration {
String tableName1 = "tb_1";
String tableName2 = "tb_2";
String viewName1 = "view_1";
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
// 1
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
@@ -105,7 +105,7 @@ public class TestEndToEnd extends AbstractTestWithStaticConfiguration {
.write(context.getPolicyFile());
// 4
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName1);
statement.execute("DROP TABLE IF EXISTS " + dbName1 + "." + tableName1);
@@ -119,7 +119,7 @@ public class TestEndToEnd extends AbstractTestWithStaticConfiguration {
connection.close();
// 7
- connection = context.createConnection(ADMIN1, "foo");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName2);
statement.execute("DROP TABLE IF EXISTS " + dbName1 + "." + tableName1);
@@ -129,7 +129,7 @@ public class TestEndToEnd extends AbstractTestWithStaticConfiguration {
connection.close();
// 8
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName2);
statement.execute("INSERT OVERWRITE TABLE " +
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestExportImportPrivileges.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestExportImportPrivileges.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestExportImportPrivileges.java
index 9b2ca02..4355721 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestExportImportPrivileges.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestExportImportPrivileges.java
@@ -72,7 +72,7 @@ public class TestExportImportPrivileges extends AbstractTestWithStaticConfigurat
createTable(ADMIN1, DB1, dataFile, TBL1);
// Negative test, user2 doesn't have access to write to dir
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("use " + DB1);
context.assertAuthzException(statement, "INSERT OVERWRITE DIRECTORY '" + dumpDir + "' SELECT * FROM " + TBL1);
@@ -82,7 +82,7 @@ public class TestExportImportPrivileges extends AbstractTestWithStaticConfigurat
// Negative test, user2 doesn't have access to dir that's similar to scratch dir
String scratchLikeDir = context.getProperty(HiveConf.ConfVars.SCRATCHDIR.varname) + "_foo";
dfs.assertCreateDir(scratchLikeDir);
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("use " + DB1);
context.assertAuthzException(statement, "INSERT OVERWRITE DIRECTORY '" + scratchLikeDir + "/bar' SELECT * FROM " + TBL1);
@@ -90,7 +90,7 @@ public class TestExportImportPrivileges extends AbstractTestWithStaticConfigurat
connection.close();
// positive test, user1 has access to write to dir
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("use " + DB1);
assertTrue(statement.executeQuery("SELECT * FROM " + TBL1).next());
@@ -118,7 +118,7 @@ public class TestExportImportPrivileges extends AbstractTestWithStaticConfigurat
createTable(ADMIN1, DB1, dataFile, TBL1);
// Negative test, user2 doesn't have access to the file being loaded
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("use " + DB1);
context.assertAuthzException(statement, "EXPORT TABLE " + TBL1 + " TO '" + exportDir + "'");
@@ -126,7 +126,7 @@ public class TestExportImportPrivileges extends AbstractTestWithStaticConfigurat
connection.close();
// Positive test, user1 have access to the target directory
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("use " + DB1);
statement.execute("EXPORT TABLE " + TBL1 + " TO '" + exportDir + "'");
@@ -134,7 +134,7 @@ public class TestExportImportPrivileges extends AbstractTestWithStaticConfigurat
connection.close();
// Negative test, user2 doesn't have access to the directory loading from
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("use " + DB1);
context.assertAuthzException(statement, "IMPORT TABLE " + TBL2 + " FROM '" + exportDir + "'");
@@ -142,7 +142,7 @@ public class TestExportImportPrivileges extends AbstractTestWithStaticConfigurat
connection.close();
// Positive test, user1 have access to the target directory
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("use " + DB1);
statement.execute("IMPORT TABLE " + TBL2 + " FROM '" + exportDir + "'");
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataObjectRetrieval.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataObjectRetrieval.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataObjectRetrieval.java
index 39fe002..667ebb5 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataObjectRetrieval.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataObjectRetrieval.java
@@ -66,7 +66,7 @@ AbstractTestWithStaticConfiguration {
* The table is assumed to have two colums under_col int and value string.
*/
private void positiveDescribeShowTests(String user, String db, String table) throws Exception {
- Connection connection = context.createConnection(user, "password");
+ Connection connection = context.createConnection(user);
Statement statement = context.createStatement(connection);
statement.execute("USE " + db);
ResultSet rs = statement.executeQuery("DESCRIBE " + table);
@@ -114,7 +114,7 @@ AbstractTestWithStaticConfiguration {
* The table is assumed to have two columns under_col int and value string.
*/
private void negativeDescribeShowTests(String user, String db, String table) throws Exception {
- Connection connection = context.createConnection(user, "password");
+ Connection connection = context.createConnection(user);
Statement statement = context.createStatement(connection);
statement.execute("USE " + db);
context.assertAuthzException(statement, "DESCRIBE " + table);
@@ -228,7 +228,7 @@ AbstractTestWithStaticConfiguration {
dropDb(ADMIN1, DB1);
createDb(ADMIN1, DB1);
createTable(ADMIN1, DB1, dataFile, TBL1);
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("USE " + DB1);
statement.execute("DROP VIEW IF EXISTS " + VIEW1);
@@ -286,14 +286,14 @@ AbstractTestWithStaticConfiguration {
createDb(ADMIN1, DB1, DB2);
createTable(ADMIN1, DB1, dataFile, TBL1);
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
assertTrue(statement.executeQuery("DESCRIBE DATABASE " + DB1).next());
assertTrue(statement.executeQuery("DESCRIBE DATABASE EXTENDED " + DB1).next());
statement.close();
connection.close();
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
assertTrue(statement.executeQuery("DESCRIBE DATABASE " + DB1).next());
assertTrue(statement.executeQuery("DESCRIBE DATABASE EXTENDED " + DB1).next());
@@ -320,7 +320,7 @@ AbstractTestWithStaticConfiguration {
.write(context.getPolicyFile());
dropDb(ADMIN1, DB1, DB2);
createDb(ADMIN1, DB1, DB2);
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
assertTrue(statement.executeQuery("DESCRIBE DATABASE default").next());
statement.execute("USE " + DB1);
@@ -330,7 +330,7 @@ AbstractTestWithStaticConfiguration {
statement.close();
connection.close();
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
context.assertAuthzException(statement, "DESCRIBE DATABASE default");
context.assertAuthzException(statement, "DESCRIBE DATABASE " + DB1);
@@ -355,7 +355,7 @@ AbstractTestWithStaticConfiguration {
dropDb(ADMIN1, DB1);
createDb(ADMIN1, DB1);
createTable(ADMIN1, DB1, dataFile, TBL1);
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("USE " + DB1);
statement.execute("DROP INDEX IF EXISTS " + INDEX1 + " ON " + TBL1);
@@ -369,7 +369,7 @@ AbstractTestWithStaticConfiguration {
statement.execute("CREATE VIEW " + VIEW1 + " (value) AS SELECT value from " + TBL1 + " LIMIT 10");
statement.close();
connection.close();
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + DB1);
context.assertAuthzException(statement, "SHOW INDEX ON " + TBL1);
@@ -412,7 +412,7 @@ AbstractTestWithStaticConfiguration {
.write(context.getPolicyFile());
dropDb(ADMIN1, DB1);
createDb(ADMIN1, DB1);
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("USE " + DB1);
statement.execute("DROP TABLE IF EXISTS " + TBL1);
@@ -424,7 +424,7 @@ AbstractTestWithStaticConfiguration {
statement.execute("CREATE VIEW " + VIEW1 + " (value) AS SELECT value from " + TBL1 + " LIMIT 10");
statement.close();
connection.close();
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + DB1);
context.assertAuthzException(statement, "SHOW PARTITIONS " + TBL1);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataPermissions.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataPermissions.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataPermissions.java
index 8d1f4ac..d5e2f1a 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataPermissions.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMetadataPermissions.java
@@ -44,7 +44,7 @@ public class TestMetadataPermissions extends AbstractTestWithStaticConfiguration
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
- Connection adminCon = context.createConnection(ADMIN1, "foo");
+ Connection adminCon = context.createConnection(ADMIN1);
Statement adminStmt = context.createStatement(adminCon);
for (String dbName : new String[] { "db1", "db2" }) {
adminStmt.execute("USE default");
@@ -71,7 +71,7 @@ public class TestMetadataPermissions extends AbstractTestWithStaticConfiguration
@Test
public void testDescPrivilegesNegative() throws Exception {
String dbName = "db2";
- Connection connection = context.createConnection(USER2_1, "password");
+ Connection connection = context.createConnection(USER2_1);
Statement statement = context.createStatement(connection);
context.assertAuthzException(statement, "USE " + dbName);
// TODO when DESCRIBE db.table is supported tests should be uncommented
@@ -90,7 +90,7 @@ public class TestMetadataPermissions extends AbstractTestWithStaticConfiguration
@Test
public void testDescDbPrivilegesNegative() throws Exception {
String dbName = "db2";
- Connection connection = context.createConnection(USER2_1, "password");
+ Connection connection = context.createConnection(USER2_1);
Statement statement = context.createStatement(connection);
context.assertAuthzException(statement, "DESCRIBE DATABASE " + dbName);
context.assertAuthzException(statement, "DESCRIBE DATABASE EXTENDED " + dbName);
@@ -104,7 +104,7 @@ public class TestMetadataPermissions extends AbstractTestWithStaticConfiguration
*/
@Test
public void testDescDbPrivilegesPositive() throws Exception {
- Connection connection = context.createConnection(USER1_1, "password");
+ Connection connection = context.createConnection(USER1_1);
Statement statement = context.createStatement(connection);
for (String dbName : new String[] { "db1", "db2" }) {
statement.execute("USE " + dbName);
@@ -120,7 +120,7 @@ public class TestMetadataPermissions extends AbstractTestWithStaticConfiguration
*/
@Test
public void testDescPrivilegesPositive() throws Exception {
- Connection connection = context.createConnection(USER1_1, "password");
+ Connection connection = context.createConnection(USER1_1);
Statement statement = context.createStatement(connection);
for (String dbName : new String[] { "db1", "db2" }) {
statement.execute("USE " + dbName);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMovingToProduction.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMovingToProduction.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMovingToProduction.java
index f6e8d26..a53bffe 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMovingToProduction.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestMovingToProduction.java
@@ -85,7 +85,7 @@ public class TestMovingToProduction extends AbstractTestWithStaticConfiguration
String dbName2 = "proddb";
String tableName1 = "tb_1";
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("DROP DATABASE IF EXISTS " + dbName2 + " CASCADE");
@@ -98,7 +98,7 @@ public class TestMovingToProduction extends AbstractTestWithStaticConfiguration
connection.close();
// a
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName1);
statement.execute("DROP TABLE IF EXISTS " + tableName1);
@@ -128,7 +128,7 @@ public class TestMovingToProduction extends AbstractTestWithStaticConfiguration
statement.execute("DESCRIBE " + tableName1);
// c
- connection = context.createConnection(USER2_1, "foo");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
context.assertAuthzException(statement, "USE " + dbName2);
context.assertAuthzException(statement, "INSERT OVERWRITE TABLE "
@@ -139,7 +139,7 @@ public class TestMovingToProduction extends AbstractTestWithStaticConfiguration
connection.close();
// d
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName2);
context.assertAuthzException(statement, "DROP TABLE " + tableName1);
@@ -165,7 +165,7 @@ public class TestMovingToProduction extends AbstractTestWithStaticConfiguration
String dbName1 = "db_1";
String dbName2 = "proddb";
String tableName1 = "tb_1";
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("DROP DATABASE IF EXISTS " + dbName2 + " CASCADE");
@@ -178,7 +178,7 @@ public class TestMovingToProduction extends AbstractTestWithStaticConfiguration
connection.close();
// a
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("DROP TABLE IF EXISTS " + dbName1 + "." + tableName1);
statement.execute("create table " + dbName1 + "." + tableName1
@@ -204,7 +204,7 @@ public class TestMovingToProduction extends AbstractTestWithStaticConfiguration
statement.execute("DESCRIBE " + dbName2 + "." + tableName1));
// c
- connection = context.createConnection(USER2_1, "foo");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
context.assertAuthzException(statement, "INSERT OVERWRITE TABLE "
@@ -217,7 +217,7 @@ public class TestMovingToProduction extends AbstractTestWithStaticConfiguration
connection.close();
// d
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName2);
context.assertAuthzException(statement, "DROP TABLE " + tableName1);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDBConfiguration.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDBConfiguration.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDBConfiguration.java
index 89c57ae..80912a3 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDBConfiguration.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDBConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.sentry.provider.file.PolicyFile;
import org.apache.sentry.policy.db.SimpleDBPolicyEngine;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import com.google.common.io.Resources;
@@ -95,7 +94,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS db1 CASCADE");
@@ -115,7 +114,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE db1");
// test user1 can execute query on tbl1
@@ -129,7 +128,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
// test per-db file for db2
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("USE db2");
// test user2 can execute query on tbl2
@@ -143,7 +142,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
//test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE db1 CASCADE");
statement.execute("DROP DATABASE db2 CASCADE");
@@ -192,7 +191,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS db1 CASCADE");
@@ -227,14 +226,14 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE db1");
// test user1 can execute query on tbl1
verifyCount(statement, "SELECT COUNT(*) FROM tbl1");
connection.close();
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("USE db2");
// test user1 can execute query on tbl1
@@ -242,14 +241,14 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// verify no access to db3 due to badly formatted rule in db3 policy file
- connection = context.createConnection(USER3_1, "password");
+ connection = context.createConnection(USER3_1);
statement = context.createStatement(connection);
context.assertAuthzException(statement, "USE db3");
// test user1 can execute query on tbl1
context.assertAuthzException(statement, "SELECT COUNT(*) FROM db3.tbl3");
connection.close();
- connection = context.createConnection(USER4_1, "password");
+ connection = context.createConnection(USER4_1);
statement = context.createStatement(connection);
statement.execute("USE db4");
// test user1 can execute query on tbl1
@@ -257,7 +256,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
//test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE db1 CASCADE");
statement.execute("DROP DATABASE db2 CASCADE");
@@ -291,7 +290,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
// by then.
System.setProperty(SimpleDBPolicyEngine.ACCESS_ALLOW_URI_PER_DB_POLICYFILE, "true");
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS db1 CASCADE");
@@ -311,7 +310,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE db1");
// test user1 can execute query on tbl1
@@ -324,7 +323,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// test per-db file for db2
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("USE db2");
// test user2 can execute query on tbl2
@@ -341,7 +340,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
//test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE db1 CASCADE");
statement.execute("DROP DATABASE db2 CASCADE");
@@ -363,7 +362,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("USE default");
@@ -378,14 +377,14 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// user_1 should be able to access default
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE default");
statement.close();
connection.close();
// user_2 should NOT be able to access default since it does have access to any other object
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
context.assertAuthzException(statement, "USE default");
statement.close();
@@ -420,7 +419,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
.write(defaultPolicyFileHandle);
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("USE default");
statement.execute("DROP TABLE IF EXISTS dtab");
@@ -442,7 +441,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// user_1 should be able to switch to default, but not the tables from default
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE db1");
statement.execute("USE default");
@@ -454,7 +453,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// user_2 should be able to access default and select from default's tables
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("USE db2");
statement.execute("USE default");
@@ -465,7 +464,7 @@ public class TestPerDBConfiguration extends AbstractTestWithStaticConfiguration
connection.close();
// user_3 should NOT be able to switch to default since it doesn't have access to any objects
- connection = context.createConnection(USER3_1, "password");
+ connection = context.createConnection(USER3_1);
statement = context.createStatement(connection);
context.assertAuthzException(statement, "USE default");
statement.close();
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDatabasePolicyFile.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDatabasePolicyFile.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDatabasePolicyFile.java
index 5e6b03c..805d60f 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDatabasePolicyFile.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPerDatabasePolicyFile.java
@@ -105,7 +105,7 @@ public class TestPerDatabasePolicyFile extends AbstractTestWithStaticConfigurati
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
createSampleDbTable(statement, "db1", "tbl1");
createSampleDbTable(statement, "db2", "tbl1");
@@ -125,7 +125,7 @@ public class TestPerDatabasePolicyFile extends AbstractTestWithStaticConfigurati
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
// test user can query table
context.assertAuthzException(statement, "USE db1");
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegeAtTransform.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegeAtTransform.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegeAtTransform.java
index 92b4485..93a3704 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegeAtTransform.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegeAtTransform.java
@@ -78,7 +78,7 @@ public class TestPrivilegeAtTransform extends AbstractTestWithStaticConfiguratio
String dbName1 = "db_1";
String tableName1 = "tb_1";
String query = "select TRANSFORM(a.under_col, a.value) USING 'cat' AS (tunder_col, tvalue) FROM " + dbName1 + "." + tableName1 + " a";
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("CREATE DATABASE " + dbName1);
@@ -92,7 +92,7 @@ public class TestPrivilegeAtTransform extends AbstractTestWithStaticConfiguratio
statement.close();
connection.close();
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
// 3
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtDatabaseScope.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtDatabaseScope.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtDatabaseScope.java
index d5c4611..82d73e5 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtDatabaseScope.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtDatabaseScope.java
@@ -31,7 +31,6 @@ import java.util.Map;
import junit.framework.Assert;
-import org.apache.sentry.binding.hive.conf.HiveAuthzConf.AuthzConfVars;
import org.apache.sentry.provider.file.PolicyFile;
import org.junit.After;
import org.junit.Before;
@@ -89,7 +88,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
statement.execute("DROP DATABASE IF EXISTS DB_2 CASCADE");
@@ -99,7 +98,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
// test user can create table
statement.execute("CREATE TABLE DB_1.TAB_1(A STRING)");
@@ -167,7 +166,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
connection.close();
//test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.execute("DROP DATABASE DB_2 CASCADE");
@@ -201,7 +200,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
statement.execute("DROP DATABASE IF EXISTS DB_2 CASCADE");
@@ -217,7 +216,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
// test user can switch db
statement.execute("USE DB_1");
@@ -273,7 +272,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
statement.close();
connection.close();
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
try {
statement.execute("CREATE EXTERNAL TABLE EXT_TAB_1(A STRING) STORED AS TEXTFILE LOCATION 'file:"+
@@ -287,7 +286,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
connection.close();
//test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.execute("DROP DATABASE DB_2 CASCADE");
@@ -319,7 +318,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
statement.execute("CREATE DATABASE DB_1");
@@ -332,13 +331,13 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
context.close();
// user1 should be able to connect db_1
- connection = context.createConnection(USER1_1, "hive");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("use DB_1");
context.close();
// user2 should not be able to connect db_1
- connection = context.createConnection(USER2_1, "hive");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
try {
statement.execute("use DB_1");
@@ -350,7 +349,7 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
context.close();
// user3 who is not listed in policy file should not be able to connect db_2
- connection = context.createConnection(USER3_1, "hive");
+ connection = context.createConnection(USER3_1);
statement = context.createStatement(connection);
try {
statement.execute("use DB_2");
@@ -380,22 +379,22 @@ public class TestPrivilegesAtDatabaseScope extends AbstractTestWithStaticConfigu
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("use default");
context.close();
- connection = context.createConnection(USER1_1, "hive");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("use default");
context.close();
- connection = context.createConnection(USER2_1, "hive");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("use default");
context.close();
- connection = context.createConnection(USER3_1, "hive");
+ connection = context.createConnection(USER3_1);
statement = context.createStatement(connection);
statement.execute("use default");
context.close();
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtFunctionScope.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtFunctionScope.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtFunctionScope.java
index 92c1dd4..976c3e9 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtFunctionScope.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtFunctionScope.java
@@ -81,7 +81,7 @@ public class TestPrivilegesAtFunctionScope extends AbstractTestWithStaticConfigu
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("CREATE DATABASE " + dbName1);
@@ -96,7 +96,7 @@ public class TestPrivilegesAtFunctionScope extends AbstractTestWithStaticConfigu
context.close();
// user1 should be able create/drop temp functions
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName1);
statement.execute(
@@ -106,7 +106,7 @@ public class TestPrivilegesAtFunctionScope extends AbstractTestWithStaticConfigu
context.close();
// user2 has select privilege on one of the tables in db2, should be able create/drop temp functions
- connection = context.createConnection(USER2_1, "foo");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName1);
statement.execute(
@@ -116,7 +116,7 @@ public class TestPrivilegesAtFunctionScope extends AbstractTestWithStaticConfigu
context.close();
// user3 shouldn't be able to create/drop temp functions since it doesn't have permission for jar
- connection = context.createConnection(USER3_1, "foo");
+ connection = context.createConnection(USER3_1);
statement = context.createStatement(connection);
try {
statement.execute("USE " + dbName1);
@@ -129,7 +129,7 @@ public class TestPrivilegesAtFunctionScope extends AbstractTestWithStaticConfigu
context.close();
// user4 (not part of any group ) shouldn't be able to create/drop temp functions
- connection = context.createConnection(USER4_1, "foo");
+ connection = context.createConnection(USER4_1);
statement = context.createStatement(connection);
try {
statement.execute("USE default");
@@ -158,7 +158,7 @@ public class TestPrivilegesAtFunctionScope extends AbstractTestWithStaticConfigu
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = connection.createStatement();
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("CREATE DATABASE " + dbName1);
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java
index 92ec6f5..0198a6f 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java
@@ -84,7 +84,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
statement.execute("CREATE DATABASE DB_1");
@@ -99,7 +99,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
// test user can insert
@@ -128,7 +128,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// connect as admin and drop tab_1
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
statement.execute("DROP TABLE TAB_1");
@@ -136,7 +136,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// negative test: connect as user1 and try to recreate tab_1
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
try {
@@ -150,7 +150,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.close();
@@ -180,7 +180,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
statement.execute("CREATE DATABASE DB_1");
@@ -196,7 +196,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
// test user can execute insert on table
@@ -238,7 +238,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.close();
@@ -268,7 +268,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
@@ -285,7 +285,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
// test user can execute query on table
@@ -327,7 +327,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.close();
@@ -356,7 +356,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
@@ -375,7 +375,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
// test user can execute query TAB_1 JOIN TAB_2
@@ -404,7 +404,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.close();
@@ -434,7 +434,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
@@ -453,7 +453,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
// test user can execute query on TAB_2
@@ -490,7 +490,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.close();
@@ -519,7 +519,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
@@ -538,7 +538,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
// test user can execute query on TAB_2
@@ -591,7 +591,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.close();
@@ -620,7 +620,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
@@ -639,7 +639,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE DB_1");
@@ -669,10 +669,10 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
connection.close();
// test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.close();
connection.close();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java
index e40eec7..9e9aec3 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java
@@ -91,7 +91,7 @@ public class TestRuntimeMetadataRetrieval
String user1TableNames[] = {"tb_1", "tb_2", "tb_3"};
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("CREATE DATABASE " + dbName1);
@@ -104,7 +104,7 @@ public class TestRuntimeMetadataRetrieval
validateTables(rs, dbName1, tableNamesValidation);
statement.close();
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName1);
// User1 should see tables with any level of access
@@ -134,7 +134,7 @@ public class TestRuntimeMetadataRetrieval
String user1TableNames[] = {"tb_1", "tb_2", "tb_3", "tb_4"};
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("CREATE DATABASE " + dbName1);
@@ -146,7 +146,7 @@ public class TestRuntimeMetadataRetrieval
validateTables(rs, dbName1, tableNamesValidation);
statement.close();
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName1);
// User1 should see tables with any level of access
@@ -178,7 +178,7 @@ public class TestRuntimeMetadataRetrieval
String adminTableNames[] = {"tb_3", "newtab_3", "tb_2", "tb_1"};
String user1TableNames[] = {"newtab_3"};
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("CREATE DATABASE " + dbName1);
@@ -190,7 +190,7 @@ public class TestRuntimeMetadataRetrieval
validateTables(rs, dbName1, tableNamesValidation);
statement.close();
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName1);
// User1 should see tables with any level of access
@@ -220,7 +220,7 @@ public class TestRuntimeMetadataRetrieval
String adminTableNames[] = {"tb_3", "newtab_3", "tb_1", "tb_2"};
String user1TableNames[] = {"tb_3", "newtab_3", "tb_1", "tb_2"};
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS " + dbName1 + " CASCADE");
statement.execute("CREATE DATABASE " + dbName1);
@@ -232,7 +232,7 @@ public class TestRuntimeMetadataRetrieval
validateTables(rs, dbName1, tableNamesValidation);
statement.close();
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + dbName1);
// User1 should see tables with any level of access
@@ -254,11 +254,11 @@ public class TestRuntimeMetadataRetrieval
.addRolesToGroup(USERGROUP1, "db_priv")
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
createTabs(statement, "default", tableNames);
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
// User1 should see tables with any level of access
ResultSet rs = statement.executeQuery("SHOW TABLES");
@@ -284,7 +284,7 @@ public class TestRuntimeMetadataRetrieval
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
// create all dbs
createDBs(statement, dbNames);
@@ -295,7 +295,7 @@ public class TestRuntimeMetadataRetrieval
validateDBs(rs, dbNamesValidation);
rs.close();
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
rs = statement.executeQuery("SHOW DATABASES");
dbNamesValidation.addAll(Arrays.asList(user1DbNames));
@@ -326,7 +326,7 @@ public class TestRuntimeMetadataRetrieval
// verify by SQL
// 1, 2
- Connection connection = context.createConnection(ADMIN1, "foo");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
createDBs(statement, dbNames); // create all dbs
ResultSet rs = statement.executeQuery("SHOW DATABASES");
@@ -335,7 +335,7 @@ public class TestRuntimeMetadataRetrieval
validateDBs(rs, dbNamesValidation); // admin should see all dbs
rs.close();
- connection = context.createConnection(USER1_1, "foo");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
rs = statement.executeQuery("SHOW DATABASES");
dbNamesValidation.addAll(Arrays.asList(user1DbNames));
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
index b34a8d9..62db36a 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java
@@ -81,7 +81,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
}
for (String user : new String[] { USER1_1, USER1_2 }) {
for (String dbName : new String[] { "db1", "db2" }) {
- Connection userConn = context.createConnection(user, "foo");
+ Connection userConn = context.createConnection(user);
String tabName = user + "_tab1";
Statement userStmt = context.createStatement(userConn);
// Positive case: test user1 and user2 has
@@ -111,7 +111,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
policyFile
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
- Connection adminCon = context.createConnection(ADMIN1, "password");
+ Connection adminCon = context.createConnection(ADMIN1);
Statement adminStmt = context.createStatement(adminCon);
String dbName = "db1";
adminStmt.execute("use default");
@@ -146,7 +146,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
.addRolesToGroup(USERGROUP1, "db1_tab2_all")
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
- Connection adminCon = context.createConnection(ADMIN1, "password");
+ Connection adminCon = context.createConnection(ADMIN1);
Statement adminStmt = context.createStatement(adminCon);
String dbName = "db1";
adminStmt.execute("use default");
@@ -157,7 +157,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
adminStmt.execute("create table table_2 (id int)");
adminStmt.close();
adminCon.close();
- Connection userConn = context.createConnection(USER1_1, "password");
+ Connection userConn = context.createConnection(USER1_1);
Statement userStmt = context.createStatement(userConn);
userStmt.execute("use " + dbName);
// user1 doesn't have select privilege on table_1, so insert/select should fail
@@ -193,7 +193,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
.setUserGroupMapping(StaticUserGroup.getStaticMapping())
.write(context.getPolicyFile());
// create dbs
- Connection adminCon = context.createConnection(ADMIN1, "foo");
+ Connection adminCon = context.createConnection(ADMIN1);
Statement adminStmt = context.createStatement(adminCon);
String dbName = "db1";
adminStmt.execute("use default");
@@ -211,7 +211,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
adminStmt.close();
adminCon.close();
- Connection userConn = context.createConnection(USER2_1, "foo");
+ Connection userConn = context.createConnection(USER2_1);
Statement userStmt = context.createStatement(userConn);
userStmt.execute("use " + dbName);
@@ -271,7 +271,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
dropDb(ADMIN1, DB1, DB2);
createDb(ADMIN1, DB1, DB2);
- Connection connection = context.createConnection(USER1_1, "password");
+ Connection connection = context.createConnection(USER1_1);
Statement statement = context.createStatement(connection);
// a
@@ -343,7 +343,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
dropDb(ADMIN1, DB1);
createDb(ADMIN1, DB1);
createTable(ADMIN1, DB1, dataFile, TBL1);
- Connection connection = context.createConnection(ADMIN1, "password");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("USE " + DB1);
statement.execute("DROP INDEX IF EXISTS " + INDEX1 + " ON " + TBL1);
@@ -351,7 +351,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
+ " (under_col) as 'COMPACT' WITH DEFERRED REBUILD");
statement.close();
connection.close();
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
statement.execute("USE " + DB1);
context.assertAuthzException(statement, "SELECT * FROM " + TBL1 + " WHERE under_col == 5");
@@ -405,7 +405,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
createDb(ADMIN1, DB1);
createTable(USER1_1, DB1, dataFile, TBL1, TBL2);
- Connection connection = context.createConnection(USER1_1, "password");
+ Connection connection = context.createConnection(USER1_1);
Statement statement = context.createStatement(connection);
// c
statement.execute("USE " + DB1);
@@ -423,7 +423,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
statement.close();
connection.close();
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
// a
@@ -469,7 +469,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
dropDb(ADMIN1, DB1);
createDb(ADMIN1, DB1);
createTable(ADMIN1, DB1, dataFile, TBL1);
- Connection connection = context.createConnection(USER1_1, "password");
+ Connection connection = context.createConnection(USER1_1);
Statement statement = context.createStatement(connection);
statement.execute("USE " + DB1);
statement.execute("INSERT OVERWRITE LOCAL DIRECTORY 'file://" + allowedDir.getPath() + "' SELECT * FROM " + TBL1);
@@ -506,7 +506,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
createTable(ADMIN1, DB2, dataFile, TBL2, TBL3);
// a
- Connection connection = context.createConnection(USER1_1, "password");
+ Connection connection = context.createConnection(USER1_1);
Statement statement = context.createStatement(connection);
statement.execute("USE " + DB1);
statement.execute("CREATE TABLE " + rTab1 + " AS SELECT * FROM " + DB2 + "." + TBL2);
@@ -540,7 +540,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
PolicyFiles.copyFilesToDir(fileSystem, dfs.getBaseDir(), db2PolicyFileHandle);
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS db1 CASCADE");
@@ -561,7 +561,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
// test per-db file for db2
- connection = context.createConnection(USER2_1, "password");
+ connection = context.createConnection(USER2_1);
statement = context.createStatement(connection);
// test user2 can use db2
statement.execute("USE db2");
@@ -571,7 +571,7 @@ public class TestSandboxOps extends AbstractTestWithStaticConfiguration {
connection.close();
//test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE db1 CASCADE");
statement.execute("DROP DATABASE db2 CASCADE");
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/b9aa0b7a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSentryOnFailureHookLoading.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSentryOnFailureHookLoading.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSentryOnFailureHookLoading.java
index cb96cee..8222590 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSentryOnFailureHookLoading.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSentryOnFailureHookLoading.java
@@ -92,7 +92,7 @@ public class TestSentryOnFailureHookLoading extends AbstractTestWithHiveServer {
.write(context.getPolicyFile());
// setup db objects needed by the test
- Connection connection = context.createConnection(ADMIN1, "hive");
+ Connection connection = context.createConnection(ADMIN1);
Statement statement = context.createStatement(connection);
statement.execute("DROP DATABASE IF EXISTS DB_1 CASCADE");
statement.execute("DROP DATABASE IF EXISTS DB_2 CASCADE");
@@ -102,7 +102,7 @@ public class TestSentryOnFailureHookLoading extends AbstractTestWithHiveServer {
connection.close();
// test execution
- connection = context.createConnection(USER1_1, "password");
+ connection = context.createConnection(USER1_1);
statement = context.createStatement(connection);
//negative test case: user can't drop another user's database
@@ -118,7 +118,7 @@ public class TestSentryOnFailureHookLoading extends AbstractTestWithHiveServer {
connection.close();
//test cleanup
- connection = context.createConnection(ADMIN1, "hive");
+ connection = context.createConnection(ADMIN1);
statement = context.createStatement(connection);
statement.execute("DROP DATABASE DB_1 CASCADE");
statement.execute("DROP DATABASE DB_2 CASCADE");