Skip to content

Commit

Permalink
Merge pull request #2856 from atlanhq/persona-disable-issue
Browse files Browse the repository at this point in the history 
PLT-860 Persona/Purpose disable/enable issue
  • Loading branch information
@nikhilbonte21
nikhilbonte21 authored Feb 21, 2024
2 parents 776d949 + 4bfef57 commit ca7a4e7
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 21 deletions.
19 changes: 13 additions & 6 deletions ...pache/atlas/repository/store/graph/v2/preprocessor/accesscontrol/PersonaPreProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,16 @@
import org.apache.atlas.auth.client.keycloak.AtlasKeycloakClient;
import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.model.instance.AtlasObjectId;
import org.apache.atlas.model.instance.AtlasRelatedObjectId;
import org.apache.atlas.model.instance.AtlasRelationship;
import org.apache.atlas.model.instance.AtlasStruct;
import org.apache.atlas.model.instance.EntityMutations;
import org.apache.atlas.repository.graphdb.AtlasGraph;
import org.apache.atlas.repository.graphdb.AtlasVertex;
import org.apache.atlas.repository.store.aliasstore.ESAliasStore;
import org.apache.atlas.repository.store.aliasstore.IndexAliasStore;
import org.apache.atlas.repository.store.graph.AtlasEntityStore;
import org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2;
import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
import org.apache.atlas.repository.store.graph.v2.EntityMutationContext;
import org.apache.atlas.repository.store.graph.v2.preprocessor.PreProcessor;
Expand Down Expand Up @@ -186,18 +189,22 @@ private void processUpdatePersona(EntityMutationContext context, AtlasStruct ent
private void updatePoliciesIsEnabledAttr(EntityMutationContext context, AtlasEntity existingPersonaEntity,
boolean enable) throws AtlasBaseException {

List<AtlasObjectId> policies = (List<AtlasObjectId>) existingPersonaEntity.getRelationshipAttribute(REL_ATTR_POLICIES);
List<AtlasRelatedObjectId> policies = (List<AtlasRelatedObjectId>) existingPersonaEntity.getRelationshipAttribute(REL_ATTR_POLICIES);

if (CollectionUtils.isNotEmpty(policies)) {
AtlasEntityType entityType = typeRegistry.getEntityTypeByName(POLICY_ENTITY_TYPE);

for (AtlasObjectId policy : policies) {
AtlasVertex policyVertex = entityRetriever.getEntityVertex(policy.getGuid());
for (AtlasRelatedObjectId policy : policies) {
if (policy.getRelationshipStatus() == AtlasRelationship.Status.ACTIVE) {
AtlasVertex policyVertex = entityRetriever.getEntityVertex(policy.getGuid());

AtlasEntity policyToBeUpdated = entityRetriever.toAtlasEntity(policyVertex);
policyToBeUpdated.setAttribute(ATTR_POLICY_IS_ENABLED, enable);
if (AtlasGraphUtilsV2.getState(policyVertex) == AtlasEntity.Status.ACTIVE) {
AtlasEntity policyToBeUpdated = entityRetriever.toAtlasEntity(policyVertex);
policyToBeUpdated.setAttribute(ATTR_POLICY_IS_ENABLED, enable);

context.addUpdated(policyToBeUpdated.getGuid(), policyToBeUpdated, entityType, policyVertex);
context.addUpdated(policyToBeUpdated.getGuid(), policyToBeUpdated, entityType, policyVertex);
}
}
}
}
}
Expand Down
41 changes: 26 additions & 15 deletions ...pache/atlas/repository/store/graph/v2/preprocessor/accesscontrol/PurposePreProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@
import org.apache.atlas.exception.AtlasBaseException;
import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.model.instance.AtlasObjectId;
import org.apache.atlas.model.instance.AtlasRelatedObjectId;
import org.apache.atlas.model.instance.AtlasRelationship;
import org.apache.atlas.model.instance.AtlasStruct;
import org.apache.atlas.model.instance.EntityMutations;
import org.apache.atlas.repository.graphdb.AtlasGraph;
import org.apache.atlas.repository.graphdb.AtlasVertex;
import org.apache.atlas.repository.store.aliasstore.ESAliasStore;
import org.apache.atlas.repository.store.aliasstore.IndexAliasStore;
import org.apache.atlas.repository.store.graph.AtlasEntityStore;
import org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2;
import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
import org.apache.atlas.repository.store.graph.v2.EntityMutationContext;
import org.apache.atlas.repository.store.graph.v2.preprocessor.PreProcessor;
Expand Down Expand Up @@ -145,23 +148,27 @@ private void processUpdatePurpose(EntityMutationContext context,
if (!CollectionUtils.isEmpty(newTags) && !CollectionUtils.isEqualCollection(newTags, getPurposeTags(existingPurposeEntity))) {
validateUniquenessByTags(graph, newTags, PURPOSE_ENTITY_TYPE);

List<AtlasObjectId> policies = (List<AtlasObjectId>) existingPurposeEntity.getRelationshipAttribute(REL_ATTR_POLICIES);
List<AtlasRelatedObjectId> policies = (List<AtlasRelatedObjectId>) existingPurposeEntity.getRelationshipAttribute(REL_ATTR_POLICIES);

if (CollectionUtils.isNotEmpty(policies)) {
AtlasEntityType entityType = typeRegistry.getEntityTypeByName(POLICY_ENTITY_TYPE);
List<String> newTagsResources = newTags.stream().map(x -> "tag:" + x).collect(Collectors.toList());

for (AtlasObjectId policy : policies) {
AtlasVertex policyVertex = entityRetriever.getEntityVertex(policy.getGuid());
for (AtlasRelatedObjectId policy : policies) {
if (policy.getRelationshipStatus() == AtlasRelationship.Status.ACTIVE) {
AtlasVertex policyVertex = entityRetriever.getEntityVertex(policy.getGuid());

policyVertex.removeProperty(ATTR_POLICY_RESOURCES);
if (AtlasGraphUtilsV2.getState(policyVertex) == AtlasEntity.Status.ACTIVE) {
policyVertex.removeProperty(ATTR_POLICY_RESOURCES);

AtlasEntity policyToBeUpdated = entityRetriever.toAtlasEntity(policyVertex);
policyToBeUpdated.setAttribute(ATTR_POLICY_RESOURCES, newTagsResources);
AtlasEntity policyToBeUpdated = entityRetriever.toAtlasEntity(policyVertex);
policyToBeUpdated.setAttribute(ATTR_POLICY_RESOURCES, newTagsResources);

context.addUpdated(policyToBeUpdated.getGuid(), policyToBeUpdated, entityType, policyVertex);
context.addUpdated(policyToBeUpdated.getGuid(), policyToBeUpdated, entityType, policyVertex);

existingPurposeExtInfo.addReferredEntity(policyToBeUpdated);
existingPurposeExtInfo.addReferredEntity(policyToBeUpdated);
}
}
}
}

Expand All @@ -173,21 +180,25 @@ private void processUpdatePurpose(EntityMutationContext context,
RequestContext.get().endMetricRecord(metricRecorder);
}

private void updatePoliciesIsEnabledAttr(EntityMutationContext context, AtlasEntity existingPersonaEntity,
private void updatePoliciesIsEnabledAttr(EntityMutationContext context, AtlasEntity existingPurposeEntity,
boolean enable) throws AtlasBaseException {

List<AtlasObjectId> policies = (List<AtlasObjectId>) existingPersonaEntity.getRelationshipAttribute(REL_ATTR_POLICIES);
List<AtlasRelatedObjectId> policies = (List<AtlasRelatedObjectId>) existingPurposeEntity.getRelationshipAttribute(REL_ATTR_POLICIES);

if (CollectionUtils.isNotEmpty(policies)) {
AtlasEntityType entityType = typeRegistry.getEntityTypeByName(POLICY_ENTITY_TYPE);

for (AtlasObjectId policy : policies) {
AtlasVertex policyVertex = entityRetriever.getEntityVertex(policy.getGuid());
for (AtlasRelatedObjectId policy : policies) {
if (policy.getRelationshipStatus() == AtlasRelationship.Status.ACTIVE) {
AtlasVertex policyVertex = entityRetriever.getEntityVertex(policy.getGuid());

AtlasEntity policyToBeUpdated = entityRetriever.toAtlasEntity(policyVertex);
policyToBeUpdated.setAttribute(ATTR_POLICY_IS_ENABLED, enable);
if (AtlasGraphUtilsV2.getState(policyVertex) == AtlasEntity.Status.ACTIVE) {
AtlasEntity policyToBeUpdated = entityRetriever.toAtlasEntity(policyVertex);
policyToBeUpdated.setAttribute(ATTR_POLICY_IS_ENABLED, enable);

context.addUpdated(policyToBeUpdated.getGuid(), policyToBeUpdated, entityType, policyVertex);
context.addUpdated(policyToBeUpdated.getGuid(), policyToBeUpdated, entityType, policyVertex);
}
}
}
}
}
Expand Down

0 comments on commit ca7a4e7

Please sign in to comment.