Sync beta

.github/workflows/maven.yml

@@ -31,7 +31,7 @@ on:
       - tagscanarymerge
       - fixlabels
       - interceptapis
-      - fix-redis-wiring
+      - revert-custom-metadata-changes
 
 jobs:
   build:

addons/policies/bootstrap_entity_policies.json

@@ -3758,7 +3758,7 @@
                 ],
                 "policyResourceCategory": "ENTITY",
                 "policyResources": [
-                    "entity-type:alpha_DQRuleTemplate",
+                    "entity-type:DataQualityTemplate",
                     "entity-classification:*",
                     "entity:*"
                 ],

addons/static/templates/policy_cache_transformer_persona.json

@@ -14,7 +14,7 @@
         {
           "policyConditionType": "excludeEntityTypes",
           "policyConditionValues": [
-            "alpha_DQRule"
+            "DataQualityRule"
           ]
         }
       ]
@@ -35,7 +35,7 @@
         {
           "policyConditionType": "excludeEntityTypes",
           "policyConditionValues": [
-            "alpha_DQRule"
+            "DataQualityRule"
           ]
         }
       ]
@@ -64,7 +64,7 @@
         {
           "policyConditionType": "excludeEntityTypes",
           "policyConditionValues": [
-            "alpha_DQRule"
+            "DataQualityRule"
           ]
         }
       ]
@@ -93,7 +93,7 @@
         {
           "policyConditionType": "excludeEntityTypes",
           "policyConditionValues": [
-            "alpha_DQRule"
+            "DataQualityRule"
           ]
         }
       ]
@@ -114,7 +114,7 @@
         {
           "policyConditionType": "excludeEntityTypes",
           "policyConditionValues": [
-            "alpha_DQRule"
+            "DataQualityRule"
           ]
         }
       ]
@@ -135,7 +135,7 @@
         {
           "policyConditionType": "excludeEntityTypes",
           "policyConditionValues": [
-            "alpha_DQRule"
+            "DataQualityRule"
           ]
         }
       ]
@@ -1263,7 +1263,7 @@
       "policyResourceCategory": "ENTITY",
       "resources": [
         "entity:{entity}/*/rule/*",
-        "entity-type:alpha_DQRule",
+        "entity-type:DataQualityRule",
         "entity-classification:*"
       ],
       "actions": ["entity-read"]
@@ -1275,7 +1275,7 @@
       "policyType": "ACCESS",
       "resources": [
         "entity:{entity}/*/rule/*",
-        "entity-type:alpha_DQRule",
+        "entity-type:DataQualityRule",
         "entity-classification:*"
       ],
       "actions": ["entity-create"]
@@ -1288,7 +1288,7 @@
         "relationship-type:*",
 
         "end-one-entity:{entity}/*/rule/*",
-        "end-one-entity-type:alpha_DQRule",
+        "end-one-entity-type:DataQualityRule",
         "end-one-entity-classification:*",
 
         "end-two-entity:*",
@@ -1305,7 +1305,7 @@
       "policyResourceCategory": "ENTITY",
       "resources": [
         "entity:{entity}/*/rule/*",
-        "entity-type:alpha_DQRule",
+        "entity-type:DataQualityRule",
         "entity-classification:*"
       ],
       "actions": ["entity-update"]
@@ -1317,7 +1317,7 @@
         "relationship-type:*",
 
         "end-one-entity:{entity}/*/rule/*",
-        "end-one-entity-type:alpha_DQRule",
+        "end-one-entity-type:DataQualityRule",
         "end-one-entity-classification:*",
 
         "end-two-entity:*",
@@ -1333,7 +1333,7 @@
       "policyType": "ACCESS",
       "resources": [
         "entity:{entity}/*/rule/*",
-        "entity-type:alpha_DQRule",
+        "entity-type:DataQualityRule",
         "entity-classification:*"
       ],
       "actions": ["entity-delete"]

common/src/main/java/org/apache/atlas/repository/Constants.java

@@ -538,13 +538,6 @@ public enum SupportedFileExtensions { XLSX, XLS, CSV }
         add(STAKEHOLDER_TITLE_ENTITY_TYPE);
     }};
 
-    public static final String TYPEDEF_ENUM_CACHE_LATEST_VERSION = "typdef.enum.cache.version";
-    public static final String TYPEDEF_BUSINESS_METADATA_CACHE_LATEST_VERSION = "typdef.bm.cache.version";
-    public static final String TYPEDEF_CLASSIFICATION_METADATA_CACHE_LATEST_VERSION = "typdef.cls.cache.version";
-    public static final String TYPEDEF_STRUCT_CACHE_LATEST_VERSION = "typdef.struct.cache.version";
-    public static final String TYPEDEF_ENTITY_CACHE_LATEST_VERSION = "typdef.entity.cache.version";
-    public static final String TYPEDEF_RELATIONSHIP_CACHE_LATEST_VERSION = "typdef.relationship.cache.version";
-
     private Constants() {
     }
 

common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java

@@ -5,7 +5,6 @@
 import org.apache.atlas.service.metrics.MetricUtils;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
@@ -192,22 +191,6 @@ public String getValue(String key) {
         }
     }
 
-    @Override
-    public String getValue(String key, String defaultValue) {
-        try {
-            String value = getValue(key);
-            if (StringUtils.isEmpty(value)) {
-                return defaultValue;
-            } else {
-                return value;
-            }
-        } catch (Exception e) {
-            MetricUtils.recordRedisConnectionFailure();
-            getLogger().error("Redis getValue operation failed for key: {}", key, e);
-            throw e;
-        }
-    }
-
     @Override
     public String putValue(String key, String value) {
         try {

common/src/main/java/org/apache/atlas/service/redis/RedisService.java

@@ -16,8 +16,6 @@ public interface RedisService {
 
   String getValue(String key);
 
-  String getValue(String key, String defaultValue);
-
   String putValue(String key, String value);
 
   String putValue(String key, String value, int timeout);

repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java

@@ -176,10 +176,10 @@ public static JsonNode createQueryWithOperatorForTag(String operator, String att
                     return createDSLForTagKeyValue(attributeName, attributeValueNode);
                 }
             }
-            case POLICY_FILTER_CRITERIA_NOT_EQUALS -> {
+            case POLICY_FILTER_CRITERIA_NOT_EQUALS, POLICY_FILTER_CRITERIA_NOT_IN -> {
                 ObjectNode mustNotNode = queryNode.putObject("bool").putObject("must_not");
                 if (attributeValueNode.isArray()) {
-                    ArrayNode shouldArray = mustNotNode.putArray("should");
+                    ArrayNode shouldArray = mustNotNode.putObject("bool").putArray("should");
                     for (JsonNode valueNode : attributeValueNode) {
                         shouldArray.add(createDSLForTagKeyValue(attributeName, valueNode));
                     }
@@ -197,17 +197,6 @@ public static JsonNode createQueryWithOperatorForTag(String operator, String att
                     shouldArray.add(createDSLForTagKeyValue(attributeName, attributeValueNode));
                 }
             }
-            case POLICY_FILTER_CRITERIA_NOT_IN -> {
-                ObjectNode notInMustNot = queryNode.putObject("bool").putObject("must_not");
-                ArrayNode notInShouldArray = notInMustNot.putArray("should");
-                if (attributeValueNode.isArray()) {
-                    for (JsonNode valueNode : attributeValueNode) {
-                        notInShouldArray.add(createDSLForTagKeyValue(attributeName, valueNode));
-                    }
-                } else {
-                    notInShouldArray.add(createDSLForTagKeyValue(attributeName, attributeValueNode));
-                }
-            }
             default -> LOG.warn("Found unknown operator {}", operator);
         }
         return queryNode;