Skip to content

Staging helper #5446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 25, 2025
Merged

Staging helper #5446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5add6f7
DQ-168 : Update policies for DQ
BichitraCodesAtlan Sep 22, 2025
a259f9f
Fix not_in operator tags in abac
krsoninikhil Sep 23, 2025
0d40f13
Merge pull request #5410 from atlanhq/admin-347-debug-logs
ankitpatnaik-atlan Sep 24, 2025
e5deeb7
Merge pull request #5426 from atlanhq/ns/feat/abac
krsoninikhil Sep 24, 2025
7bb3bca
Merge pull request #5413 from atlanhq/dq-168
BichitraCodesAtlan Sep 25, 2025
cb37900
Merge branch 'master' into staging-helper
nikhilbonte21 Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/policies/bootstrap_entity_policies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3758,7 +3758,7 @@
],
"policyResourceCategory": "ENTITY",
"policyResources": [
"entity-type:alpha_DQRuleTemplate",
"entity-type:DataQualityTemplate",
"entity-classification:*",
"entity:*"
],
Expand Down
24 changes: 12 additions & 12 deletions addons/static/templates/policy_cache_transformer_persona.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"policyConditionType": "excludeEntityTypes",
"policyConditionValues": [
"alpha_DQRule"
"DataQualityRule"
]
}
]
Expand All @@ -35,7 +35,7 @@
{
"policyConditionType": "excludeEntityTypes",
"policyConditionValues": [
"alpha_DQRule"
"DataQualityRule"
]
}
]
Expand Down Expand Up @@ -64,7 +64,7 @@
{
"policyConditionType": "excludeEntityTypes",
"policyConditionValues": [
"alpha_DQRule"
"DataQualityRule"
]
}
]
Expand Down Expand Up @@ -93,7 +93,7 @@
{
"policyConditionType": "excludeEntityTypes",
"policyConditionValues": [
"alpha_DQRule"
"DataQualityRule"
]
}
]
Expand All @@ -114,7 +114,7 @@
{
"policyConditionType": "excludeEntityTypes",
"policyConditionValues": [
"alpha_DQRule"
"DataQualityRule"
]
}
]
Expand All @@ -135,7 +135,7 @@
{
"policyConditionType": "excludeEntityTypes",
"policyConditionValues": [
"alpha_DQRule"
"DataQualityRule"
]
}
]
Expand Down Expand Up @@ -1317,7 +1317,7 @@
"policyResourceCategory": "ENTITY",
"resources": [
"entity:{entity}/*/rule/*",
"entity-type:alpha_DQRule",
"entity-type:DataQualityRule",
"entity-classification:*"
],
"actions": ["entity-read"]
Expand All @@ -1329,7 +1329,7 @@
"policyType": "ACCESS",
"resources": [
"entity:{entity}/*/rule/*",
"entity-type:alpha_DQRule",
"entity-type:DataQualityRule",
"entity-classification:*"
],
"actions": ["entity-create"]
Expand All @@ -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:*",
Expand All @@ -1359,7 +1359,7 @@
"policyResourceCategory": "ENTITY",
"resources": [
"entity:{entity}/*/rule/*",
"entity-type:alpha_DQRule",
"entity-type:DataQualityRule",
"entity-classification:*"
],
"actions": ["entity-update"]
Expand All @@ -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:*",
Expand All @@ -1387,7 +1387,7 @@
"policyType": "ACCESS",
"resources": [
"entity:{entity}/*/rule/*",
"entity-type:alpha_DQRule",
"entity-type:DataQualityRule",
"entity-classification:*"
],
"actions": ["entity-delete"]
Expand Down
15 changes: 2 additions & 13 deletions repository/src/main/java/org/apache/atlas/authorizer/JsonToElasticsearchQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/java/org/apache/atlas/discovery/ElasticsearchDslOptimizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2898,7 +2898,7 @@ public void testDebugValidationIssues() throws Exception {
"bool": {
"must": [
{"term": {"__state": "ACTIVE"}},
{"term": {"__typeName.keyword": "alpha_DQRuleTemplate"}}
{"term": {"__typeName.keyword": "DataQualityTemplate"}}
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/aggs_filter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
4 changes: 2 additions & 2 deletions repository/src/test/resources/fixtures/dsl_rewrite/dq_rule_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"should": [
{
"term": {
"__typeName.keyword": "alpha_DQRuleTemplate"
"__typeName.keyword": "DataQualityTemplate"
}
}
]
Expand All @@ -38,7 +38,7 @@
"aggs": {
"group_by_dimension": {
"terms": {
"field": "alpha_dqRuleTemplateDimension",
"field": "dqRuleTemplateDimension",
"size": 10
}
}
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/entity_types_bool_mix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/entity_types_multi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/func_score_advanced.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/func_score_bool_nested.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/func_score_column_terms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/func_score_filter_opt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/func_score_multi_clause.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/func_score_qualified_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/func_score_regexp_search.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"SnowflakeTag",
"DbtTag",
"BigqueryTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/must_not_wildcards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"SnowflakeTag",
"DbtTag",
"BigqueryTag"
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/wildcard_staging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/wildcard_with_case_sensitive_flag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
2 changes: 1 addition & 1 deletion repository/src/test/resources/fixtures/dsl_rewrite/wildcards_too_many.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
"BIProcess",
"MatillionComponent",
"ModelVersion",
"alpha_DQRule",
"DataQualityRule",
"FlowDatasetOperation",
"FlowFieldOperation",
"SnowflakeTag",
Expand Down
Loading