[ranger] branch master updated: RANGER-2668 : Remove tag service linking for any service created in Ranger KMS

[mehul]

This is an automated email from the ASF dual-hosted git repository.

mehul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 6396e3a  RANGER-2668 : Remove tag service linking for any service 
created in Ranger KMS
6396e3a is described below

commit 6396e3a473fe8b2bc7282b402575299d9c09d8df
Author: Dhaval B. Shah <dhavalshah9...@gmail.com>
AuthorDate: Fri Dec 13 15:06:44 2019 +0530

    RANGER-2668 : Remove tag service linking for any service created in Ranger 
KMS
    
    Signed-off-by: Mehul Parikh <me...@apache.org>
---
 .../src/main/java/org/apache/ranger/rest/ServiceREST.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java 
b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index 8ad020e..6d5d8f9 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@ -745,12 +745,16 @@ public class ServiceREST {
                        }
                          bizUtil.blockAuditorRoleUser();
 
-                       if (StringUtils.isBlank(service.getTagService()) && 
xxServiceDef != null && 
!StringUtils.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME, 
xxServiceDef.getName())) {
+                       if (StringUtils.isBlank(service.getTagService())
+                                       && xxServiceDef != null
+                                       && 
!StringUtils.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME, 
xxServiceDef.getName())
+                                       && 
!StringUtils.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KMS_NAME , 
xxServiceDef.getName())) {
                                if (LOG.isDebugEnabled()) {
                                        LOG.debug("Tag service may need to be 
created and linked with this service:[" + service.getName() + "]");
                                }
                                scheduleCreateOrGetTagService(service);
                        }
+
                        ret = svcStore.createService(service);
                } catch(WebApplicationException excp) {
                        throw excp;