[1/3] sentry git commit: SENTRY-1989: Bump Kafka version from 0.9 to 0.11.1

2017-10-23 Thread coheigea 
Repository: sentry
Updated Branches:
  refs/heads/akolb-cli db7cedcfa -> 36fb263c1


SENTRY-1989: Bump Kafka version from 0.9 to 0.11.1

Bump Kafka version to the latest version available. 0.9 was released last year 
(2016) and 0.11.1 is new in 2017

Here is the summary of code changes
1. Fixed the API incomatability
2. updated pom files to user updated version of kafka
3. Added new property to kafka server.
3. Refatored the the tests and commented one of the tests becausae of the known 
issue with the latest version of kafka.


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/fa78d259
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/fa78d259
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/fa78d259

Branch: refs/heads/akolb-cli
Commit: fa78d2590d24618f4eb8090742869e953538e9b1
Parents: e5381cd
Author: Kalyan Kumar Kalvagadda 
Authored: Fri Oct 20 11:27:55 2017 -0500
Committer: Kalyan Kumar Kalvagadda 
Committed: Fri Oct 20 11:47:12 2017 -0500

--
 pom.xml |   2 +-
 sentry-tests/sentry-tests-kafka/pom.xml |   2 +-
 .../sentry/tests/e2e/kafka/KafkaTestServer.java |   1 +
 .../sentry/tests/e2e/kafka/TestAclsCrud.java|   7 +-
 .../sentry/tests/e2e/kafka/TestAuthorize.java   | 225 +++
 5 files changed, 192 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/fa78d259/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ee85ddb..b1a04c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@ limitations under the License.
 8.1.19.v20160209
 2.5
 4.10
-0.9.0.0
+0.11.0.1
 0.9.3
 0.9.3
 1.2.16

http://git-wip-us.apache.org/repos/asf/sentry/blob/fa78d259/sentry-tests/sentry-tests-kafka/pom.xml
--
diff --git a/sentry-tests/sentry-tests-kafka/pom.xml 
b/sentry-tests/sentry-tests-kafka/pom.xml
index c65323d..d160f17 100644
--- a/sentry-tests/sentry-tests-kafka/pom.xml
+++ b/sentry-tests/sentry-tests-kafka/pom.xml
@@ -44,7 +44,7 @@ limitations under the License.
 
 
   org.apache.kafka
-  kafka_2.10
+  kafka_2.11
   ${kafka.version}
 
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/fa78d259/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
--
diff --git 
a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
 
b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
index faeb369..98d3b90 100644
--- 
a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
+++ 
b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
@@ -92,6 +92,7 @@ public class KafkaTestServer {
 props.put("delete.topic.enable", false);
 props.put("controlled.shutdown.retry.backoff.ms", "100");
 props.put("port", kafkaPort);
+props.put("offsets.topic.replication.factor", "1");
 props.put("authorizer.class.name", 
"org.apache.sentry.kafka.authorizer.SentryKafkaAuthorizer");
 props.put("sentry.kafka.site.url", "file://" + 
sentrySitePath.getAbsolutePath());
 props.put("allow.everyone.if.no.acl.found", "true");

http://git-wip-us.apache.org/repos/asf/sentry/blob/fa78d259/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
--
diff --git 
a/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
 
b/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
index a52c8d6..ac17f36 100644
--- 
a/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
+++ 
b/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
@@ -116,11 +116,16 @@ public class TestAclsCrud extends 
AbstractKafkaSentryTestBase {
 
 final String role1 = "role1";
 Set acls = new HashSet<>();
-final Acl acl = new Acl(new KafkaPrincipal("role", role1),
+Acl acl = new Acl(new KafkaPrincipal("role", role1),
 Allow$.MODULE$,
 "127.0.0.1",
 Operation$.MODULE$.fromString("READ"));
 acls.add(acl);
+acl = new Acl(new KafkaPrincipal("role", role1),
+Allow$.MODULE$,
+"127.0.0.1",
+Operation$.MODULE$.fromString("WRITE"));
+

sentry git commit: SENTRY-1989: Bump Kafka version from 0.9 to 0.11.1

2017-10-20 Thread kalyan 
Repository: sentry
Updated Branches:
  refs/heads/upstream_master [created] fa78d2590


SENTRY-1989: Bump Kafka version from 0.9 to 0.11.1

Bump Kafka version to the latest version available. 0.9 was released last year 
(2016) and 0.11.1 is new in 2017

Here is the summary of code changes
1. Fixed the API incomatability
2. updated pom files to user updated version of kafka
3. Added new property to kafka server.
3. Refatored the the tests and commented one of the tests becausae of the known 
issue with the latest version of kafka.


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/fa78d259
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/fa78d259
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/fa78d259

Branch: refs/heads/upstream_master
Commit: fa78d2590d24618f4eb8090742869e953538e9b1
Parents: e5381cd
Author: Kalyan Kumar Kalvagadda 
Authored: Fri Oct 20 11:27:55 2017 -0500
Committer: Kalyan Kumar Kalvagadda 
Committed: Fri Oct 20 11:47:12 2017 -0500

--
 pom.xml |   2 +-
 sentry-tests/sentry-tests-kafka/pom.xml |   2 +-
 .../sentry/tests/e2e/kafka/KafkaTestServer.java |   1 +
 .../sentry/tests/e2e/kafka/TestAclsCrud.java|   7 +-
 .../sentry/tests/e2e/kafka/TestAuthorize.java   | 225 +++
 5 files changed, 192 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/fa78d259/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ee85ddb..b1a04c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@ limitations under the License.
 8.1.19.v20160209
 2.5
 4.10
-0.9.0.0
+0.11.0.1
 0.9.3
 0.9.3
 1.2.16

http://git-wip-us.apache.org/repos/asf/sentry/blob/fa78d259/sentry-tests/sentry-tests-kafka/pom.xml
--
diff --git a/sentry-tests/sentry-tests-kafka/pom.xml 
b/sentry-tests/sentry-tests-kafka/pom.xml
index c65323d..d160f17 100644
--- a/sentry-tests/sentry-tests-kafka/pom.xml
+++ b/sentry-tests/sentry-tests-kafka/pom.xml
@@ -44,7 +44,7 @@ limitations under the License.
 
 
   org.apache.kafka
-  kafka_2.10
+  kafka_2.11
   ${kafka.version}
 
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/fa78d259/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
--
diff --git 
a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
 
b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
index faeb369..98d3b90 100644
--- 
a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
+++ 
b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
@@ -92,6 +92,7 @@ public class KafkaTestServer {
 props.put("delete.topic.enable", false);
 props.put("controlled.shutdown.retry.backoff.ms", "100");
 props.put("port", kafkaPort);
+props.put("offsets.topic.replication.factor", "1");
 props.put("authorizer.class.name", 
"org.apache.sentry.kafka.authorizer.SentryKafkaAuthorizer");
 props.put("sentry.kafka.site.url", "file://" + 
sentrySitePath.getAbsolutePath());
 props.put("allow.everyone.if.no.acl.found", "true");

http://git-wip-us.apache.org/repos/asf/sentry/blob/fa78d259/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
--
diff --git 
a/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
 
b/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
index a52c8d6..ac17f36 100644
--- 
a/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
+++ 
b/sentry-tests/sentry-tests-kafka/src/test/java/org/apache/sentry/tests/e2e/kafka/TestAclsCrud.java
@@ -116,11 +116,16 @@ public class TestAclsCrud extends 
AbstractKafkaSentryTestBase {
 
 final String role1 = "role1";
 Set acls = new HashSet<>();
-final Acl acl = new Acl(new KafkaPrincipal("role", role1),
+Acl acl = new Acl(new KafkaPrincipal("role", role1),
 Allow$.MODULE$,
 "127.0.0.1",
 Operation$.MODULE$.fromString("READ"));
 acls.add(acl);
+acl = new Acl(new KafkaPrincipal("role", role1),
+Allow$.MODULE$,
+"127.0.0.1",
+Operation$.MODULE$.fromString("WRITE"));
+