Repository: incubator-ranger Updated Branches: refs/heads/tag-policy 493b8d9c4 -> 747105c0b
RANGER-274: updated tagged-resource to associate with component-service instead of tag-serviced Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/747105c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/747105c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/747105c0 Branch: refs/heads/tag-policy Commit: 747105c0bdfd4ce31fddbf3788a834ab24f6ce07 Parents: 493b8d9 Author: Madhan Neethiraj <[email protected]> Authored: Thu Jul 9 01:03:13 2015 +0530 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Jul 9 07:27:25 2015 +0530 ---------------------------------------------------------------------- .../ranger/admin/client/RangerAdminClient.java | 12 ++-- .../admin/client/RangerAdminRESTClient.java | 51 +++++++---------- .../RangerAdminTagRetriever.java | 16 +++--- .../RangerTagFileStoreRetriever.java | 10 ++-- .../contextenricher/RangerTagProvider.java | 5 +- .../plugin/model/RangerTaggedResource.java | 7 ++- .../plugin/model/RangerTaggedResourceKey.java | 27 +++------ .../ranger/plugin/store/TagPredicateUtil.java | 39 +------------ .../apache/ranger/plugin/store/TagStore.java | 13 ++--- .../ranger/plugin/store/file/TagFileStore.java | 59 ++++++++++---------- .../apache/ranger/plugin/util/SearchFilter.java | 1 - .../ranger/services/tag/RangerServiceTag.java | 9 +-- .../client/RangerAdminJersey2RESTClient.java | 21 +++---- .../java/org/apache/ranger/rest/TagREST.java | 48 +++++++--------- .../apache/ranger/rest/TagRESTConstants.java | 3 +- 15 files changed, 119 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java index b239b8e..d1c7135 100644 --- a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java +++ b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminClient.java @@ -38,17 +38,15 @@ public interface RangerAdminClient { void revokeAccess(GrantRevokeRequest request) throws Exception; - TagServiceResources getTaggedResources(String tagServiceName, String componentType, Long lastTimestamp) throws Exception; + TagServiceResources getTaggedResources(Long lastTimestamp) throws Exception; - List<String> getTagNames(String tagServiceName, String componentType, String tagNamePattern) throws Exception; + List<String> getTagNames(String tagNamePattern) throws Exception; - TagServiceResources getAllTaggedResources() throws Exception; + List<RangerTaggedResource> setTagsForResources(List<RangerTaggedResourceKey> keys, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception; - List<RangerTaggedResource> setResources(List<RangerTaggedResourceKey> keys, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception; + RangerTaggedResource setTagsForResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception; - RangerTaggedResource setResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception; - - RangerTaggedResource updateResourceTags(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tagsToAdd, + RangerTaggedResource updateTagsForResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tagsToAdd, List<RangerTaggedResource.RangerResourceTag> tagsToDelete) throws Exception; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java index 321e4b2..6739753 100644 --- a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java +++ b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java @@ -24,7 +24,6 @@ import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.GenericType; import com.sun.jersey.api.client.WebResource; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.security.AccessControlException; @@ -198,16 +197,15 @@ public class RangerAdminRESTClient implements RangerAdminClient { } @Override - public TagServiceResources getTaggedResources(String tagServiceName, String componentType, Long lastTimestamp) throws Exception { + public TagServiceResources getTaggedResources(Long lastTimestamp) throws Exception { if(LOG.isDebugEnabled()) { - LOG.debug("==> RangerAdminRESTClient.getTaggedResources(" + tagServiceName + ", " + componentType + ", " + lastTimestamp + "): "); + LOG.debug("==> RangerAdminRESTClient.getTaggedResources(" + lastTimestamp + "): "); } TagServiceResources ret; WebResource webResource = createWebResource(RangerRESTUtils.REST_URL_GET_UPDATED_TAGGED_RESOURCES) - .queryParam(RangerRESTUtils.TAG_SERVICE_NAME_PARAM, tagServiceName) - .queryParam(RangerRESTUtils.COMPONENT_TYPE_PARAM, componentType) + .queryParam(RangerRESTUtils.TAG_SERVICE_NAME_PARAM, serviceName) .queryParam(RangerRESTUtils.TAG_TIMESTAMP_PARAM, Long.toString(lastTimestamp.longValue())); ClientResponse response = webResource.accept(RangerRESTUtils.REST_MIME_TYPE_JSON).get(ClientResponse.class); @@ -216,36 +214,31 @@ public class RangerAdminRESTClient implements RangerAdminClient { } else { RESTResponse resp = RESTResponse.fromClientResponse(response); LOG.error("Error getting taggedResources. request=" + webResource.toString() - + ", response=" + resp.toString() + ", serviceName=" + tagServiceName + ", componentType=" + componentType + + ", response=" + resp.toString() + ", serviceName=" + serviceName + ", " + "lastTimestamp=" + lastTimestamp); throw new Exception(resp.getMessage()); } if(LOG.isDebugEnabled()) { - LOG.debug("<==> RangerAdminRESTClient.getTaggedResources(" + tagServiceName + ", " + componentType + ", " + lastTimestamp + "): "); + LOG.debug("<==> RangerAdminRESTClient.getTaggedResources(" + lastTimestamp + "): "); } return ret; } @Override - public List<String> getTagNames(String tagServiceName, String componentType, String tagNamePattern) throws Exception { + public List<String> getTagNames(String tagNamePattern) throws Exception { if(LOG.isDebugEnabled()) { - LOG.debug("==> RangerAdminRESTClient.getTagNames(" + tagServiceName + ", " + componentType - + ", " + tagNamePattern + "): "); + LOG.debug("==> RangerAdminRESTClient.getTagNames(" + tagNamePattern + "): "); } List<String> ret = null; String emptyString = ""; WebResource webResource = createWebResource(RangerRESTUtils.REST_URL_LOOKUP_TAG_NAMES) - .queryParam(RangerRESTUtils.TAG_SERVICE_NAME_PARAM, tagServiceName) + .queryParam(RangerRESTUtils.TAG_SERVICE_NAME_PARAM, serviceName) .queryParam(RangerRESTUtils.TAG_PATTERN_PARAM, tagNamePattern); - if (StringUtils.isNotBlank(componentType)) { - webResource.queryParam(RangerRESTUtils.COMPONENT_TYPE_PARAM, componentType); - } - ClientResponse response = webResource.accept(RangerRESTUtils.REST_MIME_TYPE_JSON).get(ClientResponse.class); if(response != null && response.getStatus() == 200) { @@ -253,28 +246,22 @@ public class RangerAdminRESTClient implements RangerAdminClient { } else { RESTResponse resp = RESTResponse.fromClientResponse(response); LOG.error("Error getting taggedResources. request=" + webResource.toString() - + ", response=" + resp.toString() + ", serviceName=" + tagServiceName + ", componentType=" + componentType + + ", response=" + resp.toString() + ", serviceName=" + serviceName + ", " + "tagNamePattern=" + tagNamePattern); throw new Exception(resp.getMessage()); } if(LOG.isDebugEnabled()) { - LOG.debug("<== RangerAdminRESTClient.getTagNames(" + serviceName + ", " + componentType + ", " + tagNamePattern + "): " + ret); + LOG.debug("<== RangerAdminRESTClient.getTagNames(" + tagNamePattern + "): " + ret); } return ret; } @Override - public TagServiceResources getAllTaggedResources() throws Exception { - String emptyString = ""; - return getTaggedResources(emptyString, emptyString, 0L); - } - - @Override - public List<RangerTaggedResource> setResources(List<RangerTaggedResourceKey> keys, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception { + public List<RangerTaggedResource> setTagsForResources(List<RangerTaggedResourceKey> keys, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception { if(LOG.isDebugEnabled()) { - LOG.debug("==> RangerAdminRESTClient.setResources()"); + LOG.debug("==> RangerAdminRESTClient.setTagsForResources()"); } List<RangerTaggedResource> ret = null; @@ -293,16 +280,16 @@ public class RangerAdminRESTClient implements RangerAdminClient { throw new Exception(resp.getMessage()); } if(LOG.isDebugEnabled()) { - LOG.debug("<== RangerAdminRESTClient.setResource()"); + LOG.debug("<== RangerAdminRESTClient.setTagsForResources()"); } return ret; } @Override - public RangerTaggedResource setResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception { + public RangerTaggedResource setTagsForResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception { if(LOG.isDebugEnabled()) { - LOG.debug("==> RangerAdminRESTClient.setResource()"); + LOG.debug("==> RangerAdminRESTClient.setTagsForResource()"); } RangerTaggedResource ret = null; @@ -321,17 +308,17 @@ public class RangerAdminRESTClient implements RangerAdminClient { throw new Exception(resp.getMessage()); } if(LOG.isDebugEnabled()) { - LOG.debug("<== RangerAdminRESTClient.setResource()"); + LOG.debug("<== RangerAdminRESTClient.setTagsForResource()"); } return ret; } @Override - public RangerTaggedResource updateResourceTags(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tagsToAdd, + public RangerTaggedResource updateTagsForResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tagsToAdd, List<RangerTaggedResource.RangerResourceTag> tagsToDelete) throws Exception { if(LOG.isDebugEnabled()) { - LOG.debug("==> RangerAdminRESTClient.updateResourceTags()"); + LOG.debug("==> RangerAdminRESTClient.updateTagsForResource()"); } RangerTaggedResource ret = null; @@ -350,7 +337,7 @@ public class RangerAdminRESTClient implements RangerAdminClient { throw new Exception(resp.getMessage()); } if(LOG.isDebugEnabled()) { - LOG.debug("<== RangerAdminRESTClient.updateResourceTags()"); + LOG.debug("<== RangerAdminRESTClient.updateTagsForResource()"); } return ret; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAdminTagRetriever.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAdminTagRetriever.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAdminTagRetriever.java index 3f10650..3d7ef1c 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAdminTagRetriever.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAdminTagRetriever.java @@ -38,20 +38,18 @@ public class RangerAdminTagRetriever extends RangerTagRefresher { private static String propertyPrefixPreamble = "ranger.plugin."; private static String appId = "tag-retriever"; - private final String componentType; - private final String tagServiceName; + private final String serviceName; private final String propertyPrefix; private RangerTagReceiver receiver; private RangerAdminClient adminClient; private Long lastTimestamp; - public RangerAdminTagRetriever(final String componentType, final String tagServiceName, final long pollingIntervalMs, final RangerTagReceiver enricher) { + public RangerAdminTagRetriever(final String serviceName, final long pollingIntervalMs, final RangerTagReceiver enricher) { super(pollingIntervalMs); - this.componentType = componentType; - this.tagServiceName = tagServiceName; + this.serviceName = serviceName; setReceiver(enricher); - propertyPrefix = propertyPrefixPreamble + componentType; + propertyPrefix = propertyPrefixPreamble + serviceName; this.lastTimestamp = 0L; } @@ -62,11 +60,11 @@ public class RangerAdminTagRetriever extends RangerTagRefresher { String useTestTagProvider = options.get("useTestTagProvider"); if (useTestTagProvider != null && useTestTagProvider.equals("true")) { - adminClient = RangerServiceTag.createAdminClient(tagServiceName); + adminClient = RangerServiceTag.createAdminClient(serviceName); } } if (adminClient == null) { - adminClient = RangerBasePlugin.createAdminClient(tagServiceName, appId, propertyPrefix); + adminClient = RangerBasePlugin.createAdminClient(serviceName, appId, propertyPrefix); } } @@ -83,7 +81,7 @@ public class RangerAdminTagRetriever extends RangerTagRefresher { try { long before = new Date().getTime(); - TagServiceResources taggedResources = adminClient.getTaggedResources(tagServiceName, componentType, lastTimestamp); + TagServiceResources taggedResources = adminClient.getTaggedResources(lastTimestamp); resources = taggedResources.getTaggedResources(); lastTimestamp = before; } catch (Exception exp) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagFileStoreRetriever.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagFileStoreRetriever.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagFileStoreRetriever.java index acaac75..7d6193d 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagFileStoreRetriever.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagFileStoreRetriever.java @@ -34,17 +34,15 @@ import java.util.Map; public class RangerTagFileStoreRetriever extends RangerTagRefresher { private static final Log LOG = LogFactory.getLog(RangerTagFileStoreRetriever.class); - private final String componentType; - private final String tagServiceName; + private final String serviceName; private RangerTagReceiver receiver; private TagStore tagStore; private Long lastTimestamp; - public RangerTagFileStoreRetriever(final String componentType, final String tagServiceName, final long pollingIntervalMs, final RangerTagReceiver enricher) { + public RangerTagFileStoreRetriever(final String serviceName, final long pollingIntervalMs, final RangerTagReceiver enricher) { super(pollingIntervalMs); - this.componentType = componentType; - this.tagServiceName = tagServiceName; + this.serviceName = serviceName; this.lastTimestamp = 0L; setReceiver(enricher); } @@ -66,7 +64,7 @@ public class RangerTagFileStoreRetriever extends RangerTagRefresher { try { long before = new Date().getTime(); - TagServiceResources tagServiceResources = tagStore.getResources(tagServiceName, componentType, lastTimestamp); + TagServiceResources tagServiceResources = tagStore.getResources(serviceName, lastTimestamp); resources = tagServiceResources.getTaggedResources(); lastTimestamp = before; } catch (Exception exp) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java index 9c4f6f9..a5833e4 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java @@ -22,7 +22,6 @@ package org.apache.ranger.plugin.contextenricher; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerTaggedResource; import org.apache.ranger.plugin.policyengine.RangerAccessRequest; import org.apache.ranger.plugin.policyengine.RangerAccessResource; @@ -62,10 +61,10 @@ public class RangerTagProvider extends RangerAbstractContextEnricher implements long pollingIntervalMs = getLongOption("pollingInterval", 60 * 1000); if (tagProviderTypeString.equals(TagProviderTypeEnum.FILESTORE_BASED_TAG_PROVIDER.toString())) { - tagRefresher = new RangerTagFileStoreRetriever(serviceDef.getName(), serviceName, pollingIntervalMs, this); + tagRefresher = new RangerTagFileStoreRetriever(serviceName, pollingIntervalMs, this); tagProviderType = TagProviderTypeEnum.FILESTORE_BASED_TAG_PROVIDER; } else if (tagProviderTypeString.equals(TagProviderTypeEnum.RANGER_ADMIN_TAG_PROVIDER.toString())) { - tagRefresher = new RangerAdminTagRetriever(serviceDef.getName(), serviceName, pollingIntervalMs, this); + tagRefresher = new RangerAdminTagRetriever(serviceName, pollingIntervalMs, this); tagProviderType = TagProviderTypeEnum.RANGER_ADMIN_TAG_PROVIDER; } else if (tagProviderTypeString.equals(TagProviderTypeEnum.EXTERNAL_SYSTEM_TAG_PROVIDER.toString())) { // TODO http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java index b6927ad..da74003 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java @@ -46,7 +46,7 @@ import java.util.*; public class RangerTaggedResource extends RangerBaseModelObject { private static final long serialVersionUID = 1L; - private RangerTaggedResourceKey key; + private RangerTaggedResourceKey key; private List<RangerResourceTag> tags; public RangerTaggedResource(RangerTaggedResourceKey key, List<RangerResourceTag> tags) { @@ -118,9 +118,10 @@ public class RangerTaggedResource extends RangerBaseModelObject { @XmlAccessorType(XmlAccessType.FIELD) public static class RangerResourceTag implements java.io.Serializable { + private static final long serialVersionUID = 1L; - private String name = null; - private Map<String, String> attributeValues = null; + private String name = null; + private Map<String, String> attributeValues = null; public RangerResourceTag(String name, Map<String, String> attributeValues) { super(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResourceKey.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResourceKey.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResourceKey.java index 649c27d..b98219b 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResourceKey.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResourceKey.java @@ -25,32 +25,24 @@ import java.util.Map; public class RangerTaggedResourceKey implements java.io.Serializable { private static final long serialVersionUID = 1L; - private String componentType = null; // one of any supported by any component - private String tagServiceName = null; - private Map<String, RangerPolicy.RangerPolicyResource> resourceSpec = null; + private String serviceName = null; + private Map<String, RangerPolicy.RangerPolicyResource> resourceSpec = null; - public RangerTaggedResourceKey() { this(null, null, null); } + public RangerTaggedResourceKey() { this(null, null); } - public RangerTaggedResourceKey(String componentType, String tagServiceName, Map<String, RangerPolicy.RangerPolicyResource> resourceSpec) { + public RangerTaggedResourceKey(String serviceName, Map<String, RangerPolicy.RangerPolicyResource> resourceSpec) { super(); - setComponentType(componentType); - setTagServiceName(tagServiceName); + setServiceName(serviceName); setResourceSpec(resourceSpec); } - public String getComponentType() { return componentType;} - - public String getTagServiceName() { return tagServiceName; } + public String getServiceName() { return serviceName; } public Map<String, RangerPolicy.RangerPolicyResource> getResourceSpec() { return resourceSpec; } - public void setComponentType(String componentType) { - this.componentType = componentType; - } - - public void setTagServiceName(String tagServiceName) { - this.tagServiceName = tagServiceName; + public void setServiceName(String serviceName) { + this.serviceName = serviceName; } public void setResourceSpec(Map<String, RangerPolicy.RangerPolicyResource> resourceSpec) { @@ -70,8 +62,7 @@ public class RangerTaggedResourceKey implements java.io.Serializable { sb.append("{ "); - sb.append("componentType={").append(componentType).append("} "); - sb.append("tagServiceName={").append(tagServiceName).append("} "); + sb.append("tagServiceName={").append(serviceName).append("} "); sb.append("resourceSpec={"); if(resourceSpec != null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/store/TagPredicateUtil.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/TagPredicateUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/TagPredicateUtil.java index dda2779..a7cee87 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/TagPredicateUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/TagPredicateUtil.java @@ -19,16 +19,12 @@ package org.apache.ranger.plugin.store; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; -import org.apache.commons.collections.PredicateUtils; import org.apache.commons.lang.StringUtils; -import org.apache.ranger.plugin.model.RangerBaseModelObject; import org.apache.ranger.plugin.model.RangerTaggedResource; import org.apache.ranger.plugin.model.RangerTagDef; import org.apache.ranger.plugin.util.SearchFilter; -import java.util.ArrayList; import java.util.List; public class TagPredicateUtil extends AbstractPredicateUtil { @@ -43,7 +39,6 @@ public class TagPredicateUtil extends AbstractPredicateUtil { addPredicateForTagDefName(filter.getParam(SearchFilter.TAG_DEF_NAME), predicates); addPredicateForTagResourceServiceName(filter.getParam(SearchFilter.TAG_RESOURCE_SERVICE_NAME), predicates); - addPredicateForTagResourceComponentType(filter.getParam(SearchFilter.TAG_RESOURCE_COMPONENT_TYPE), predicates); addPredicateForTagResourceTimestamp(filter.getParamAsLong(SearchFilter.TAG_RESOURCE_TIMESTAMP), predicates); addPredicateForTagResourceId(filter.getParam(SearchFilter.TAG_RESOURCE_ID), predicates); @@ -131,39 +126,7 @@ public class TagPredicateUtil extends AbstractPredicateUtil { if (object instanceof RangerTaggedResource) { RangerTaggedResource rangerResource = (RangerTaggedResource) object; - ret = StringUtils.equals(name, rangerResource.getKey().getTagServiceName()); - } - - return ret; - } - }; - - if (predicates != null) { - predicates.add(ret); - } - - return ret; - } - - private Predicate addPredicateForTagResourceComponentType(final String type, List<Predicate> predicates) { - if (type == null || StringUtils.isEmpty(type)) { - return null; - } - - Predicate ret = new Predicate() { - @Override - public boolean evaluate(Object object) { - - boolean ret = false; - - if (object == null) { - return ret; - } - - if (object instanceof RangerTaggedResource) { - RangerTaggedResource rangerResource = (RangerTaggedResource) object; - - ret = StringUtils.equals(type, rangerResource.getKey().getComponentType()); + ret = StringUtils.equals(name, rangerResource.getKey().getServiceName()); } return ret; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/store/TagStore.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/TagStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/TagStore.java index 9200ee2..d909e56 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/TagStore.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/TagStore.java @@ -19,7 +19,6 @@ package org.apache.ranger.plugin.store; -import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerTaggedResourceKey; import org.apache.ranger.plugin.model.RangerTaggedResource; import org.apache.ranger.plugin.model.RangerTagDef; @@ -27,8 +26,6 @@ import org.apache.ranger.plugin.util.SearchFilter; import org.apache.ranger.plugin.util.TagServiceResources; import java.util.List; -import java.util.Map; -import java.util.Set; /** * Interface to backing store for the top-level TAG model objects @@ -53,23 +50,23 @@ public interface TagStore { PList<RangerTagDef> getPaginatedTagDefs(SearchFilter filter) throws Exception; - RangerTaggedResource createResource(RangerTaggedResource resource, boolean createOrUpdate) throws Exception; + RangerTaggedResource createTaggedResource(RangerTaggedResource resource, boolean createOrUpdate) throws Exception; - RangerTaggedResource updateResource(RangerTaggedResource resource) throws Exception; + RangerTaggedResource updateTaggedResource(RangerTaggedResource resource) throws Exception; void deleteResource(Long id) throws Exception; RangerTaggedResource getResource(Long id) throws Exception; - TagServiceResources getResources(String tagServiceName, String componentType, Long lastTimestamp) throws Exception; + TagServiceResources getResources(String serviceName, Long lastTimestamp) throws Exception; List<RangerTaggedResource> getResources(SearchFilter filter) throws Exception; PList<RangerTaggedResource> getPaginatedResources(SearchFilter filter) throws Exception; - List<String> getTags(String tagServiceName, String serviceType) throws Exception; + List<String> getTags(String serviceName) throws Exception; - List<String> lookupTags(String tagServiceName, String serviceType, String tagNamePattern) throws Exception; + List<String> lookupTags(String serviceName, String tagNamePattern) throws Exception; RangerTaggedResource getResource(RangerTaggedResourceKey key) throws Exception; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/store/file/TagFileStore.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/TagFileStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/TagFileStore.java index 6913212..24a49bd 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/TagFileStore.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/TagFileStore.java @@ -287,7 +287,7 @@ public class TagFileStore extends AbstractTagStore { } @Override - public RangerTaggedResource createResource(RangerTaggedResource resource, boolean createOrUpdate) throws Exception { + public RangerTaggedResource createTaggedResource(RangerTaggedResource resource, boolean createOrUpdate) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("==> TagFileStore.createResource(" + resource + ")"); } @@ -322,7 +322,7 @@ public class TagFileStore extends AbstractTagStore { try { if (updateResource) { - ret = updateResource(resource); + ret = updateTaggedResource(resource); } else { preCreate(resource); @@ -346,7 +346,7 @@ public class TagFileStore extends AbstractTagStore { } @Override - public RangerTaggedResource updateResource(RangerTaggedResource resource) throws Exception { + public RangerTaggedResource updateTaggedResource(RangerTaggedResource resource) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("==> TagFileStore.updateResource(" + resource + ")"); } @@ -361,9 +361,8 @@ public class TagFileStore extends AbstractTagStore { try { preUpdate(existing); - existing.getKey().setComponentType(resource.getKey().getComponentType()); existing.getKey().setResourceSpec(resource.getKey().getResourceSpec()); - existing.getKey().setTagServiceName(resource.getKey().getTagServiceName()); + existing.getKey().setServiceName(resource.getKey().getServiceName()); existing.setTags(resource.getTags()); ret = fileStoreUtil.saveToFile(existing, new Path(fileStoreUtil.getDataFile(FILE_PREFIX_TAG_RESOURCE, existing.getId())), true); @@ -437,7 +436,7 @@ public class TagFileStore extends AbstractTagStore { public RangerTaggedResource getResource(RangerTaggedResourceKey key) throws Exception { if (LOG.isDebugEnabled()) { - LOG.debug("==> TagFileStore.getResource( " + key.getTagServiceName() + ", " + key.getComponentType() + " )"); + LOG.debug("==> TagFileStore.getResource( " + key.getServiceName() + " )"); } if (this.svcStore == null) { @@ -450,20 +449,28 @@ public class TagFileStore extends AbstractTagStore { throw new Exception("TagFileStore.getResources() - parameter 'key' is null."); } + RangerService service = null; + try { + service = svcStore.getServiceByName(key.getServiceName()); + } catch(Exception excp) { + LOG.error("TagFileStore.getResource - failed to get service " + key.getServiceName()); + throw new Exception("Invalid service: " + key.getServiceName()); + } + RangerServiceDef serviceDef = null; try { - serviceDef = svcStore.getServiceDefByName(key.getComponentType()); + serviceDef = svcStore.getServiceDefByName(service.getType()); } catch (Exception exception) { - LOG.error("TagFileStore.getResource - failed to get serviceDef for " + key.getComponentType()); - throw new Exception("Invalid component-type: " + key.getComponentType()); + LOG.error("TagFileStore.getResource - failed to get serviceDef for " + service.getType()); + throw new Exception("Invalid component-type: " + service.getType()); } List<RangerTaggedResource> resources = null; if (MapUtils.isNotEmpty(key.getResourceSpec())) { - TagServiceResources tagServiceResources = getResources(key.getTagServiceName(), key.getComponentType(), 0L); + TagServiceResources tagServiceResources = getResources(key.getServiceName(), 0L); resources = tagServiceResources.getTaggedResources(); List<RangerTaggedResource> notMatchedResources = new ArrayList<>(); @@ -498,27 +505,23 @@ public class TagFileStore extends AbstractTagStore { RangerTaggedResource ret = (resources == null || CollectionUtils.isEmpty(resources)) ? null : resources.get(0); if (LOG.isDebugEnabled()) { - LOG.debug("==> TagFileStore.getResource( " + key.getTagServiceName() + ", " + key.getComponentType() + " )" + ret); + LOG.debug("==> TagFileStore.getResource( " + key.getServiceName() + " )" + ret); } return ret; } @Override - public TagServiceResources getResources(String tagServiceName, String componentType, Long lastTimeStamp) throws Exception { + public TagServiceResources getResources(String serviceName, Long lastTimeStamp) throws Exception { if (LOG.isDebugEnabled()) { - LOG.debug("==> TagFileStore.getResources(" + tagServiceName + ", " + componentType + ", " + lastTimeStamp + ")"); + LOG.debug("==> TagFileStore.getResources(" + serviceName + ", " + lastTimeStamp + ")"); } List<RangerTaggedResource> taggedResources; SearchFilter filter = new SearchFilter(); - if (StringUtils.isNotBlank(tagServiceName)) { - filter.setParam(SearchFilter.TAG_RESOURCE_SERVICE_NAME, tagServiceName); - } - - if (StringUtils.isNotBlank(componentType)) { - filter.setParam(SearchFilter.TAG_RESOURCE_COMPONENT_TYPE, componentType); + if (StringUtils.isNotBlank(serviceName)) { + filter.setParam(SearchFilter.TAG_RESOURCE_SERVICE_NAME, serviceName); } if (lastTimeStamp != null) { @@ -528,7 +531,7 @@ public class TagFileStore extends AbstractTagStore { taggedResources = getResources(filter); if (LOG.isDebugEnabled()) { - LOG.debug("<== TagFileStore.getResources(" + tagServiceName + ", " + componentType + ", " + lastTimeStamp + ")"); + LOG.debug("<== TagFileStore.getResources(" + serviceName + ", " + lastTimeStamp + ")"); } @@ -660,15 +663,15 @@ public class TagFileStore extends AbstractTagStore { } @Override - public List<String> getTags(String tagServiceName, String componentType) throws Exception { + public List<String> getTags(String serviceName) throws Exception { if (LOG.isDebugEnabled()) { - LOG.debug("==> TagFileStore.getTags(" + tagServiceName + ", " + componentType + ")"); + LOG.debug("==> TagFileStore.getTags(" + serviceName + ")"); } SortedSet<String> tagNameSet = new TreeSet<String>(); - TagServiceResources tagServiceResources = getResources(tagServiceName, componentType, 0L); + TagServiceResources tagServiceResources = getResources(serviceName, 0L); List<RangerTaggedResource> resources = tagServiceResources.getTaggedResources(); if (CollectionUtils.isNotEmpty(resources)) { @@ -684,20 +687,20 @@ public class TagFileStore extends AbstractTagStore { } if (LOG.isDebugEnabled()) { - LOG.debug("<== TagFileStore.getTags(" + tagServiceName + ", " + componentType + ")"); + LOG.debug("<== TagFileStore.getTags(" + serviceName + ")"); } return new ArrayList<String>(tagNameSet); } @Override - public List<String> lookupTags(String tagServiceName, String componentType, String tagNamePattern) throws Exception { + public List<String> lookupTags(String serviceName, String tagNamePattern) throws Exception { if (LOG.isDebugEnabled()) { - LOG.debug("==> TagFileStore.lookupTags(" + tagServiceName + ", " + componentType + ", " + tagNamePattern + ")"); + LOG.debug("==> TagFileStore.lookupTags(" + serviceName + ", " + tagNamePattern + ")"); } - List<String> tagNameList = getTags(tagServiceName, componentType); + List<String> tagNameList = getTags(serviceName); List<String> matchedTagList = new ArrayList<String>(); if (CollectionUtils.isNotEmpty(tagNameList)) { @@ -717,7 +720,7 @@ public class TagFileStore extends AbstractTagStore { } if (LOG.isDebugEnabled()) { - LOG.debug("<== TagFileStore.lookupTags(" + tagServiceName + ", " + componentType + ", " + tagNamePattern + ")"); + LOG.debug("<== TagFileStore.lookupTags(" + serviceName + ", " + tagNamePattern + ")"); } return matchedTagList; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java index 2585138..154d1c3 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java @@ -54,7 +54,6 @@ public class SearchFilter { public static final String TAG_DEF_NAME = "tagDefName"; // search public static final String TAG_RESOURCE_ID = "tagResourceId"; // search public static final String TAG_RESOURCE_SERVICE_NAME = "tagResourceServiceName"; // search - public static final String TAG_RESOURCE_COMPONENT_TYPE = "tagResourceComponentType"; // search public static final String TAG_RESOURCE_TIMESTAMP = "tagResourceTimestamp"; // search http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java index c6dc334..9a5f656 100644 --- a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java +++ b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java @@ -2,9 +2,7 @@ package org.apache.ranger.services.tag; import java.util.*; -import org.apache.commons.collections.MapUtils; import org.apache.ranger.admin.client.RangerAdminClient; -import org.apache.ranger.admin.client.RangerAdminRESTClient; import org.apache.ranger.plugin.model.RangerService; import org.apache.ranger.plugin.model.RangerServiceDef; import org.apache.ranger.plugin.service.RangerBasePlugin; @@ -12,9 +10,6 @@ import org.apache.ranger.plugin.service.RangerBaseService; import org.apache.ranger.plugin.service.ResourceLookupContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.ranger.plugin.store.ServiceStore; -import org.apache.ranger.plugin.store.TagStore; -import org.apache.ranger.plugin.store.file.TagFileStore; public class RangerServiceTag extends RangerBaseService { @@ -49,7 +44,7 @@ public class RangerServiceTag extends RangerBaseService { RangerAdminClient adminClient = createAdminClient(serviceName); try { - adminClient.getTagNames(serviceName, null, ".*"); // Don't care about componentType + adminClient.getTagNames(".*"); connectivityStatus = true; } catch (Exception e) { LOG.error("RangerServiceTag.validateConfig() Error:" + e); @@ -108,7 +103,7 @@ public class RangerServiceTag extends RangerBaseService { RangerAdminClient adminClient = createAdminClient(serviceName); - tagNameList = adminClient.getTagNames(serviceName, null, tagNamePattern); // Don't care about componentType + tagNameList = adminClient.getTagNames(tagNamePattern); tagNameList.removeAll(userProvidedTagList); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java ---------------------------------------------------------------------- diff --git a/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java b/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java index f5ac163..1ebb52f 100644 --- a/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java +++ b/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java @@ -204,12 +204,12 @@ public class RangerAdminJersey2RESTClient implements RangerAdminClient { } @Override - public TagServiceResources getTaggedResources(String tagServiceName, String componentType, Long lastTimestamp) throws Exception { + public TagServiceResources getTaggedResources(Long lastTimestamp) throws Exception { throw new Exception("RangerAdminjersey2RESTClient.getTaggedResource() -- *** NOT IMPLEMENTED *** "); } @Override - public List<String> getTagNames(String tagServiceName, String componentType, String tagNamePattern) throws Exception { + public List<String> getTagNames(String tagNamePattern) throws Exception { throw new Exception("RangerAdminjersey2RESTClient.getTagNames() -- *** NOT IMPLEMENTED *** "); } @@ -224,24 +224,19 @@ public class RangerAdminJersey2RESTClient implements RangerAdminClient { } @Override - public TagServiceResources getAllTaggedResources() throws Exception { - throw new Exception("RangerAdminjersey2RESTClient.getAllTaggedResources() -- *** NOT IMPLEMENTED *** "); + public List<RangerTaggedResource> setTagsForResources(List<RangerTaggedResourceKey> keys, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception { + throw new Exception("RangerAdminjersey2RESTClient.setTagsForResources() -- *** NOT IMPLEMENTED *** "); } @Override - public List<RangerTaggedResource> setResources(List<RangerTaggedResourceKey> keys, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception { - throw new Exception("RangerAdminjersey2RESTClient.setResources() -- *** NOT IMPLEMENTED *** "); + public RangerTaggedResource setTagsForResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception { + throw new Exception("RangerAdminjersey2RESTClient.setTagsForResource() -- *** NOT IMPLEMENTED *** "); } @Override - public RangerTaggedResource setResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tags) throws Exception { - throw new Exception("RangerAdminjersey2RESTClient.setResource() -- *** NOT IMPLEMENTED *** "); - } - - @Override - public RangerTaggedResource updateResourceTags(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tagsToAdd, + public RangerTaggedResource updateTagsForResource(RangerTaggedResourceKey key, List<RangerTaggedResource.RangerResourceTag> tagsToAdd, List<RangerTaggedResource.RangerResourceTag> tagsToDelete) throws Exception { - throw new Exception("RangerAdminjersey2RESTClient.updateResourceTags() -- *** NOT IMPLEMENTED *** "); + throw new Exception("RangerAdminjersey2RESTClient.updateTagsForResource() -- *** NOT IMPLEMENTED *** "); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java b/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java index 4d97826..3f2062a 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/TagREST.java @@ -24,13 +24,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ranger.biz.ServiceDBStore; import org.apache.ranger.common.RESTErrorUtil; -import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerTaggedResourceKey; import org.apache.ranger.plugin.model.RangerTaggedResource; import org.apache.ranger.plugin.model.RangerTagDef; import org.apache.ranger.plugin.store.TagStore; import org.apache.ranger.plugin.store.file.TagFileStore; -import org.apache.ranger.plugin.store.rest.ServiceRESTStore; import org.apache.ranger.plugin.util.SearchFilter; import org.apache.ranger.plugin.util.TagServiceResources; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +42,6 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.*; import java.util.ArrayList; -import java.util.Date; import java.util.List; @Path(TagRESTConstants.TAGDEF_NAME_AND_VERSION) @@ -238,7 +235,7 @@ public class TagREST { try { //RangerResourceValidator validator = validatorFactory.getResourceValidator(tagStore); //validator.validate(resource, Action.CREATE); - ret = tagStore.createResource(resource, false); + ret = tagStore.createTaggedResource(resource, false); } catch(Exception excp) { LOG.error("createResource(" + resource + ") failed", excp); @@ -272,7 +269,7 @@ public class TagREST { try { //RangerResourceValidator validator = validatorFactory.getResourceValidator(tagStore); //validator.validate(resource, Action.UPDATE); - ret = tagStore.updateResource(resource); + ret = tagStore.updateTaggedResource(resource); } catch(Exception excp) { LOG.error("updateResource(" + id + ") failed", excp); @@ -326,7 +323,7 @@ public class TagREST { try { //RangerResourceValidator validator = validatorFactory.getResourceValidator(tagStore); //validator.validate(resource, Action.UPDATE); - ret = tagStore.updateResource(oldResource); + ret = tagStore.updateTaggedResource(oldResource); } catch (Exception excp) { LOG.error("updateResource(" + id + ") failed", excp); @@ -399,25 +396,24 @@ public class TagREST { @GET @Path(TagRESTConstants.RESOURCES_UPDATED_RESOURCE) @Produces({ "application/json", "application/xml" }) - public TagServiceResources getResources(@QueryParam(TagRESTConstants.TAG_SERVICE_NAME_PARAM) String tagServiceName, - @QueryParam(TagRESTConstants.COMPONENT_TYPE_PARAM) String componentType, + public TagServiceResources getResources(@QueryParam(TagRESTConstants.SERVICE_NAME_PARAM) String serviceName, @QueryParam(TagRESTConstants.TAG_TIMESTAMP_PARAM) Long lastTimestamp) { if(LOG.isDebugEnabled()) { - LOG.debug("==> TagREST.getResources(" + tagServiceName + ", " + componentType + ", " + lastTimestamp + ")"); + LOG.debug("==> TagREST.getResources(" + serviceName + ", " + lastTimestamp + ")"); } TagServiceResources ret = null; try { - ret = tagStore.getResources(tagServiceName, componentType, lastTimestamp); + ret = tagStore.getResources(serviceName, lastTimestamp); } catch(Exception excp) { - LOG.error("getResources(" + tagServiceName + ", " + componentType + ") failed", excp); + LOG.error("getResources(" + serviceName + ") failed", excp); throw restErrorUtil.createRESTException(HttpServletResponse.SC_BAD_REQUEST, excp.getMessage(), true); } if(LOG.isDebugEnabled()) { - LOG.debug("<==> TagREST.getResources(" + tagServiceName + ", " + componentType + ", " + lastTimestamp + ")"); + LOG.debug("<==> TagREST.getResources(" + serviceName + ", " + lastTimestamp + ")"); } return ret; @@ -428,24 +424,23 @@ public class TagREST { @GET @Path(TagRESTConstants.TAGNAMES_RESOURCE) @Produces({ "application/json", "application/xml" }) - public List<String> getTagNames(@QueryParam(TagRESTConstants.TAG_SERVICE_NAME_PARAM) String tagServiceName, - @DefaultValue("") @QueryParam(TagRESTConstants.COMPONENT_TYPE_PARAM) String componentType) { + public List<String> getTagNames(@QueryParam(TagRESTConstants.SERVICE_NAME_PARAM) String serviceName) { if(LOG.isDebugEnabled()) { - LOG.debug("==> TagREST.getTagNames(" + tagServiceName + ")"); + LOG.debug("==> TagREST.getTagNames(" + serviceName + ")"); } List<String> tagNames = null; try { - tagNames = tagStore.getTags(tagServiceName, componentType); + tagNames = tagStore.getTags(serviceName); } catch(Exception excp) { - LOG.error("getTags(" + tagServiceName + ") failed", excp); + LOG.error("getTags(" + serviceName + ") failed", excp); throw restErrorUtil.createRESTException(HttpServletResponse.SC_BAD_REQUEST, excp.getMessage(), true); } if(LOG.isDebugEnabled()) { - LOG.debug("<== TagREST.getTagNames(" + tagServiceName + ")"); + LOG.debug("<== TagREST.getTagNames(" + serviceName + ")"); } return tagNames; } @@ -456,24 +451,23 @@ public class TagREST { @GET @Path(TagRESTConstants.LOOKUP_TAGS_RESOURCE) @Produces({ "application/json", "application/xml" }) - public List<String> lookupTags(@QueryParam(TagRESTConstants.TAG_SERVICE_NAME_PARAM) String tagServiceName, - @DefaultValue("") @QueryParam(TagRESTConstants.COMPONENT_TYPE_PARAM) String componentType, + public List<String> lookupTags(@QueryParam(TagRESTConstants.SERVICE_NAME_PARAM) String serviceName, @DefaultValue(".*") @QueryParam(TagRESTConstants.TAG_PATTERN_PARAM) String tagNamePattern) { if(LOG.isDebugEnabled()) { - LOG.debug("==> TagREST.lookupTags(" + tagServiceName + ", " + tagNamePattern + ")"); + LOG.debug("==> TagREST.lookupTags(" + serviceName + ", " + tagNamePattern + ")"); } List<String> matchingTagNames = null; try { - matchingTagNames = tagStore.lookupTags(tagServiceName, componentType, tagNamePattern); + matchingTagNames = tagStore.lookupTags(serviceName, tagNamePattern); } catch(Exception excp) { - LOG.error("lookupTags(" + tagServiceName + ") failed", excp); + LOG.error("lookupTags(" + serviceName + ") failed", excp); throw restErrorUtil.createRESTException(HttpServletResponse.SC_BAD_REQUEST, excp.getMessage(), true); } if(LOG.isDebugEnabled()) { - LOG.debug("<== TagREST.lookupTags(" + tagServiceName + ")"); + LOG.debug("<== TagREST.lookupTags(" + serviceName + ")"); } return matchingTagNames; } @@ -487,7 +481,7 @@ public class TagREST { @Produces({ "application/json", "application/xml" }) public TagServiceResources getAllTaggedResources() throws Exception { String emptyString = ""; - return getResources(emptyString, emptyString, 0L); + return getResources(emptyString, 0L); } // to create or update a tagged resource with associated tags in RangerAdmin @@ -505,7 +499,7 @@ public class TagREST { RangerTaggedResource taggedResource = new RangerTaggedResource(key, tags); try { - ret = tagStore.createResource(taggedResource, true); // Create or Update + ret = tagStore.createTaggedResource(taggedResource, true); // Create or Update } catch(Exception excp) { LOG.error("setResource() failed", excp); LOG.error("Could not create taggedResource, " + taggedResource); @@ -584,7 +578,7 @@ public class TagREST { oldResource.setTags(tags); try { - ret = tagStore.updateResource(oldResource); + ret = tagStore.updateTaggedResource(oldResource); } catch (Exception excp) { LOG.error("updateResource(" + key + ") failed", excp); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/747105c0/security-admin/src/main/java/org/apache/ranger/rest/TagRESTConstants.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/TagRESTConstants.java b/security-admin/src/main/java/org/apache/ranger/rest/TagRESTConstants.java index 27a4671..02efcf3 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/TagRESTConstants.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/TagRESTConstants.java @@ -43,8 +43,7 @@ public class TagRESTConstants { static final String ACTION_REPLACE = "replace"; static final String ACTION_DELETE = "delete"; - public static final String TAG_SERVICE_NAME_PARAM = "tagservicename"; - public static final String COMPONENT_TYPE_PARAM = "componenttype"; + public static final String SERVICE_NAME_PARAM = "servicename"; public static final String TAG_TIMESTAMP_PARAM = "tagtimestamp"; public static final String TAG_PATTERN_PARAM = "tagpattern";
