You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2022/04/21 17:24:31 UTC
[ranger] branch master updated: RANGER-3600: Ranger service tags import request failure
This is an automated email from the ASF dual-hosted git repository.
pradeep 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 d0caa3d12 RANGER-3600: Ranger service tags import request failure
d0caa3d12 is described below
commit d0caa3d12076a556d23a1f0a9003c1d7f9eb1efb
Author: pradeep <pr...@apache.org>
AuthorDate: Wed Mar 2 16:44:30 2022 +0530
RANGER-3600: Ranger service tags import request failure
Change-Id: I0891c0fbe4116c209cfcb7b8597361b05faedfe2
---
.../org/apache/ranger/plugin/util/RangerServiceTagsDeltaUtil.java | 2 --
.../src/main/java/org/apache/ranger/rest/ServiceTagsProcessor.java | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerServiceTagsDeltaUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerServiceTagsDeltaUtil.java
index 76d5fd989..8d9241c1c 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerServiceTagsDeltaUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerServiceTagsDeltaUtil.java
@@ -212,8 +212,6 @@ public class RangerServiceTagsDeltaUtil {
serviceResource.setUpdatedBy(null);
serviceResource.setUpdateTime(null);
serviceResource.setGuid(null);
-
- serviceResource.setServiceName(null);
}
}
}
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceTagsProcessor.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceTagsProcessor.java
index 3897f48e2..b256e2838 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceTagsProcessor.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceTagsProcessor.java
@@ -175,7 +175,9 @@ public class ServiceTagsProcessor {
perf = RangerPerfTracer.getPerfTracer(PERF_LOG_ADD_OR_UPDATE, "tags.createOrUpdate_service_resource(" + resourceId + ")");
}
if (existing == null) {
-
+ if (StringUtils.isBlank(resource.getServiceName())) {
+ resource.setServiceName(serviceTags.getServiceName());
+ }
resourceInStore = tagStore.createServiceResource(resource);
} else if (StringUtils.isEmpty(resource.getServiceName()) || MapUtils.isEmpty(resource.getResourceElements())) {