diff --git a/addons/policies/bootstrap_entity_policies.json b/addons/policies/bootstrap_entity_policies.json index c0905f8ab53..a82e4e91f03 100644 --- a/addons/policies/bootstrap_entity_policies.json +++ b/addons/policies/bootstrap_entity_policies.json @@ -3758,7 +3758,7 @@ ], "policyResourceCategory": "ENTITY", "policyResources": [ - "entity-type:alpha_DQRuleTemplate", + "entity-type:DataQualityTemplate", "entity-classification:*", "entity:*" ], diff --git a/addons/static/templates/policy_cache_transformer_persona.json b/addons/static/templates/policy_cache_transformer_persona.json index a77023fe9af..2031260acda 100644 --- a/addons/static/templates/policy_cache_transformer_persona.json +++ b/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" ] } ] @@ -1317,7 +1317,7 @@ "policyResourceCategory": "ENTITY", "resources": [ "entity:{entity}/*/rule/*", - "entity-type:alpha_DQRule", + "entity-type:DataQualityRule", "entity-classification:*" ], "actions": ["entity-read"] @@ -1329,7 +1329,7 @@ "policyType": "ACCESS", "resources": [ "entity:{entity}/*/rule/*", - "entity-type:alpha_DQRule", + "entity-type:DataQualityRule", "entity-classification:*" ], "actions": ["entity-create"] @@ -1342,7 +1342,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:*", @@ -1359,7 +1359,7 @@ "policyResourceCategory": "ENTITY", "resources": [ "entity:{entity}/*/rule/*", - "entity-type:alpha_DQRule", + "entity-type:DataQualityRule", "entity-classification:*" ], "actions": ["entity-update"] @@ -1371,7 +1371,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:*", @@ -1387,7 +1387,7 @@ "policyType": "ACCESS", "resources": [ "entity:{entity}/*/rule/*", - "entity-type:alpha_DQRule", + "entity-type:DataQualityRule", "entity-classification:*" ], "actions": ["entity-delete"] diff --git a/repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java b/repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java index 70d7369a446..0d5aca073eb 100644 --- a/repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java +++ b/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; diff --git a/repository/src/test/java/org/apache/atlas/discovery/ElasticsearchDslOptimizerTest.java b/repository/src/test/java/org/apache/atlas/discovery/ElasticsearchDslOptimizerTest.java index 9fe8722f316..0a7831d918e 100644 --- a/repository/src/test/java/org/apache/atlas/discovery/ElasticsearchDslOptimizerTest.java +++ b/repository/src/test/java/org/apache/atlas/discovery/ElasticsearchDslOptimizerTest.java @@ -2898,7 +2898,7 @@ public void testDebugValidationIssues() throws Exception { "bool": { "must": [ {"term": {"__state": "ACTIVE"}}, - {"term": {"__typeName.keyword": "alpha_DQRuleTemplate"}} + {"term": {"__typeName.keyword": "DataQualityTemplate"}} ] } } diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/aggs_filter.json b/repository/src/test/resources/fixtures/dsl_rewrite/aggs_filter.json index 244a1e6b9e7..ba6ebdddd7c 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/aggs_filter.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/aggs_filter.json @@ -27,7 +27,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/dq_rule_template.json b/repository/src/test/resources/fixtures/dsl_rewrite/dq_rule_template.json index 7dd1ba26439..7b3fab8a580 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/dq_rule_template.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/dq_rule_template.json @@ -15,7 +15,7 @@ "should": [ { "term": { - "__typeName.keyword": "alpha_DQRuleTemplate" + "__typeName.keyword": "DataQualityTemplate" } } ] @@ -38,7 +38,7 @@ "aggs": { "group_by_dimension": { "terms": { - "field": "alpha_dqRuleTemplateDimension", + "field": "dqRuleTemplateDimension", "size": 10 } } diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/entity_types_bool_mix.json b/repository/src/test/resources/fixtures/dsl_rewrite/entity_types_bool_mix.json index 43a6a32bb0e..b28fd6a50da 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/entity_types_bool_mix.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/entity_types_bool_mix.json @@ -27,7 +27,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/entity_types_multi.json b/repository/src/test/resources/fixtures/dsl_rewrite/entity_types_multi.json index 23f5b0c95d8..0361622d0de 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/entity_types_multi.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/entity_types_multi.json @@ -68,7 +68,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_advanced.json b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_advanced.json index 036409fdbda..d0571db61ab 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_advanced.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_advanced.json @@ -129,7 +129,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_bool_nested.json b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_bool_nested.json index c50a7e997d5..e14e41f8bc6 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_bool_nested.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_bool_nested.json @@ -90,7 +90,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_column_terms.json b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_column_terms.json index 67042005008..4d3e249deda 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_column_terms.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_column_terms.json @@ -90,7 +90,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_filter_opt.json b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_filter_opt.json index 617a3d4bc31..799ac050aa4 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_filter_opt.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_filter_opt.json @@ -106,7 +106,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_multi_clause.json b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_multi_clause.json index bc672c402b1..8ffdfcf4735 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_multi_clause.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_multi_clause.json @@ -109,7 +109,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_qualified_name.json b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_qualified_name.json index 28b23b5c07b..56a3662090f 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_qualified_name.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_qualified_name.json @@ -146,7 +146,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_regexp_search.json b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_regexp_search.json index 873b00fc9db..6118390d254 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/func_score_regexp_search.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/func_score_regexp_search.json @@ -120,7 +120,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "SnowflakeTag", "DbtTag", "BigqueryTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/must_not_wildcards.json b/repository/src/test/resources/fixtures/dsl_rewrite/must_not_wildcards.json index 54440d962b9..442d82faa87 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/must_not_wildcards.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/must_not_wildcards.json @@ -345,7 +345,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "SnowflakeTag", "DbtTag", "BigqueryTag" diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/wildcard_staging.json b/repository/src/test/resources/fixtures/dsl_rewrite/wildcard_staging.json index 063805749d7..b8b10aabfb0 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/wildcard_staging.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/wildcard_staging.json @@ -99,7 +99,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/wildcard_with_case_sensitive_flag.json b/repository/src/test/resources/fixtures/dsl_rewrite/wildcard_with_case_sensitive_flag.json index 5b6fcdb0301..36205c8bf3b 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/wildcard_with_case_sensitive_flag.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/wildcard_with_case_sensitive_flag.json @@ -140,7 +140,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag", diff --git a/repository/src/test/resources/fixtures/dsl_rewrite/wildcards_too_many.json b/repository/src/test/resources/fixtures/dsl_rewrite/wildcards_too_many.json index 327f392b698..c4b73c9338d 100644 --- a/repository/src/test/resources/fixtures/dsl_rewrite/wildcards_too_many.json +++ b/repository/src/test/resources/fixtures/dsl_rewrite/wildcards_too_many.json @@ -238,7 +238,7 @@ "BIProcess", "MatillionComponent", "ModelVersion", - "alpha_DQRule", + "DataQualityRule", "FlowDatasetOperation", "FlowFieldOperation", "SnowflakeTag",