Merge pull request #3272 from atlanhq/beta-DG-1530_2-helper

DG-1530 PR comment Fixes, Dev testing
atlanhq · Jun 21, 2024 · 0f70fb3 · 0f70fb3
2 parents 4b317be + 71ab329
commit 0f70fb3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 32 deletions.
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/aliasstore/ESAliasStore.java b/repository/src/main/java/org/apache/atlas/repository/store/aliasstore/ESAliasStore.java
@@ -40,7 +40,6 @@
 import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -213,9 +212,10 @@ private void personaPolicyToESDslClauses(List<AtlasEntity> policies,
                 } else if (getPolicyActions(policy).contains(ACCESS_READ_PERSONA_DOMAIN)) {
 
                     for (String asset : assets) {
-                        asset = validateAndConvertAsset(asset);
-                        if(!asset.equals(NEW_WILDCARD_DOMAIN_SUPER)) {
+                        if(!isAllDomain(asset)) {
                             terms.add(asset);
+                        } else {
+                            asset = NEW_WILDCARD_DOMAIN_SUPER;
                         }
                         allowClauseList.add(mapOf("wildcard", mapOf(QUALIFIED_NAME, asset + "*")));
                     }
@@ -248,10 +248,8 @@ private void personaPolicyToESDslClauses(List<AtlasEntity> policies,
         allowClauseList.add(mapOf("terms", mapOf(QUALIFIED_NAME, terms)));
     }
 
-    private String validateAndConvertAsset(String asset) {
-        if(asset.equals("*/super") || asset.equals("*"))
-            asset = NEW_WILDCARD_DOMAIN_SUPER;
-        return asset;
+    private boolean isAllDomain(String asset) {
+        return asset.equals("*/super") || asset.equals("*") || asset.equals(NEW_WILDCARD_DOMAIN_SUPER);
     }
     private Map<String, Object> esClausesToFilter(List<Map<String, Object>> allowClauseList) {
         if (CollectionUtils.isNotEmpty(allowClauseList)) {

diff --git a/.../java/org/apache/atlas/repository/store/graph/v2/preprocessor/AuthPolicyPreProcessor.java b/.../java/org/apache/atlas/repository/store/graph/v2/preprocessor/AuthPolicyPreProcessor.java
@@ -184,33 +184,18 @@ private void processCreatePolicy(AtlasStruct entity) throws AtlasBaseException {
         RequestContext.get().endMetricRecord(metricRecorder);
     }
 
+
     private void validateAndReduce(AtlasEntity policy) {
-        ArrayList<String> resources = (ArrayList<String>) policy.getAttribute(ATTR_POLICY_RESOURCES);
-        boolean hasAllDomainPattern = false;
-
-        for (int i = 0; i < resources.size(); i++) {
-            String[] resourceParts = resources.get(i).split(":");
-            String resource = resourceParts[resourceParts.length - 1];
-            if (resource.equals("*") || resource.equals("*/super") || resource.equals("default/domain/*/super")) {
-                resources.remove(i);
-                hasAllDomainPattern = true;
-                i--;
-            }
-        }
+        List<String> resources = (List<String>) policy.getAttribute(ATTR_POLICY_RESOURCES);
+        boolean hasAllDomainPattern = resources.stream().anyMatch(resource ->
+                resource.equals("entity:*") ||
+                        resource.equals("entity:*/super") ||
+                        resource.equals("entity:default/domain/*/super")
+        );
 
         if (hasAllDomainPattern) {
-            for (int i = 0; i < resources.size(); i++) {
-                String[] resourceParts = resources.get(i).split(":");
-                String resource = resourceParts[resourceParts.length - 1];
-                if (resource.matches("default/domain/.+/super(/.+)?")) {
-                    resources.remove(i);
-                    i--;
-                }
-            }
-            resources.add(ENTITY_DEFAULT_DOMAIN_SUPER);
+            policy.setAttribute(ATTR_POLICY_RESOURCES, Collections.singletonList("entity:default/domain/*/super"));
         }
-
-        policy.setAttribute(ATTR_POLICY_RESOURCES, resources);
     }
 
 

diff --git a/...e/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java b/...e/atlas/repository/store/graph/v2/preprocessor/datamesh/StakeholderTitlePreProcessor.java
@@ -115,13 +115,14 @@ private void processCreateStakeholderTitle(AtlasEntity entity) throws AtlasBaseE
             if (CollectionUtils.isEmpty(domainQualifiedNames)) {
                 throw new AtlasBaseException(BAD_REQUEST, "Please provide attribute " + ATTR_DOMAIN_QUALIFIED_NAMES);
             }
-            domainQualifiedNames.replaceAll(s -> s.equals(STAR) ? NEW_STAR : s);
-            if (domainQualifiedNames.contains(NEW_STAR)) {
+            if (domainQualifiedNames.contains(NEW_STAR) || domainQualifiedNames.contains(STAR)) {
                 if (domainQualifiedNames.size() > 1) {
 
                     domainQualifiedNames.clear();
                     domainQualifiedNames.add(NEW_STAR);
                     entity.setAttribute(ATTR_DOMAIN_QUALIFIED_NAMES, domainQualifiedNames);
+                } else {
+                    domainQualifiedNames.replaceAll(s -> s.equals(STAR) ? NEW_STAR : s);
                 }
 
                 String qualifiedName = format(PATTERN_QUALIFIED_NAME_ALL_DOMAINS, getUUID());