(ranger) branch master updated: RANGER-4663: service creation should skip creation of default tag-service when tag-service name is specified

[madhan]

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

madhan 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 cff0530ad RANGER-4663: service creation should skip creation of 
default tag-service when tag-service name is specified
cff0530ad is described below

commit cff0530ad624b737bec105b2c34861231a6541a4
Author: Siddhesh Phatak <siddheshphata...@gmail.com>
AuthorDate: Tue Jan 23 17:22:48 2024 -0800

    RANGER-4663: service creation should skip creation of default tag-service 
when tag-service name is specified
    
    Signed-off-by: Madhan Neethiraj <mad...@apache.org>
---
 security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java | 3 ++-
 1 file changed, 2 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 1147d9b1a..a6c759234 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
@@ -764,7 +764,8 @@ public class ServiceREST {
 
                        String serviceType = xxServiceDef != null ? 
xxServiceDef.getName() : null;
 
-                       if 
(!StringUtils.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME, 
serviceType) &&
+                       if (StringUtils.isBlank(service.getTagService()) &&
+                               
!StringUtils.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME, 
serviceType) &&
                                
!StringUtils.equals(EMBEDDED_SERVICEDEF_GDS_NAME, serviceType) &&
                                
!StringUtils.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KMS_NAME , 
serviceType)) {
                                createOrGetLinkedServices(service);