SENTRY-1416: kafka-sentry tool's service name's default is different from KafkaSentryAuthorizer's default service name (Ashish Singh, reviewed by Sravya Tirukkovalur)
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/b4a593ef Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/b4a593ef Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/b4a593ef Branch: refs/heads/akolb-cli Commit: b4a593ef50fd25526f910d0083be1cc3032c41b3 Parents: 18634c1 Author: Ashish Singh <[email protected]> Authored: Fri Oct 13 09:35:25 2017 -0500 Committer: Sergio Pena <[email protected]> Committed: Fri Oct 13 09:35:25 2017 -0500 ---------------------------------------------------------------------- .../sentry/provider/db/generic/tools/SentryShellGeneric.java | 2 +- .../sentry/provider/db/generic/tools/TestSentryShellKafka.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/b4a593ef/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java index e3edc29..ab9d969 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java @@ -107,7 +107,7 @@ public class SentryShellGeneric extends SentryShellCommon { private String getService(Configuration conf) throws Exception { if (type == TYPE.kafka) { - return conf.get(KAFKA_SERVICE_NAME, "kafka1"); + return conf.get(KAFKA_SERVICE_NAME, AuthorizationComponent.KAFKA); } else if (type == TYPE.solr) { return conf.get(SOLR_SERVICE_NAME, "service1"); } http://git-wip-us.apache.org/repos/asf/sentry/blob/b4a593ef/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/tools/TestSentryShellKafka.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/tools/TestSentryShellKafka.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/tools/TestSentryShellKafka.java index f3febc3..c744ee3 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/tools/TestSentryShellKafka.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/tools/TestSentryShellKafka.java @@ -49,7 +49,7 @@ public class TestSentryShellKafka extends SentryGenericServiceIntegrationBase { private static String TEST_ROLE_NAME_2 = "testRole2"; private static String KAFKA = "kafka"; private String requestorName = ""; - private String service = "kafka1"; + private String service = "kafka"; @Before public void prepareForTest() throws Exception {
