commit 6396e3a473fe8b2bc7282b402575299d9c09d8df
author Dhaval B. Shah <dhavalshah9131@gmail.com> Fri Dec 13 15:06:44 2019 +0530
committer Mehul Parikh <mehul@apache.org> Mon Dec 16 11:31:59 2019 +0530
tree 0ac717f3d1f48f8576620dd6cc8ddaae4b78cb57
parent 7bc6266e4d2c30e01fdaedc4b2c5e1d09ed7b79b

RANGER-2668 : Remove tag service linking for any service created in Ranger KMS

Signed-off-by: Mehul Parikh <mehul@apache.org>

security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java

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 @@
 			}
                          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;