Copilot commented on code in PR #713:
URL: https://github.com/apache/ranger/pull/713#discussion_r2457397042
##########
security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java:
##########
@@ -287,6 +287,11 @@ private VXAccessAudit populateViewBean(AuthzAuditEvent
auditEvent) {
accessAudit.setProjects(value.toString());
}
+ value = auditEvent.getProjects();
+ if (value != null) {
+ accessAudit.setProjects(value.toString());
Review Comment:
Duplicated code block: lines 290-293 set the `projects` field again, which
was already set in lines 287-288. This appears to be a copy-paste error where
`datasetIds` logic should be implemented instead.
```suggestion
value = auditEvent.getDatasetIds();
if (value != null) {
accessAudit.setDatasetIds(value.toString());
```
##########
agents-common/src/test/resources/policyengine/gds/test_gds_policy_hive_data_mask.json:
##########
@@ -249,55 +249,55 @@
"resource": { "elements": { "database": "sales", "table":
"prospects" } },
"accessType": "select", "user": "scott", "userGroups": []
},
- "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"isAllowed": false, "isAudited": true, "policyId": -1 }
+ "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"datasetIds": [ 1 ], "isAllowed": false, "isAudited": true, "policyId": -1 }
},
{
"name": "table: sales.orders, user: scott, access: select",
"request": {
"resource": { "elements": { "database": "sales", "table": "orders" }
},
"accessType": "select", "user": "scott", "userGroups": []
},
- "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"isAllowed": false, "isAudited": true, "policyId": -1 }
+ "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"datasetIds": [ 1 ], "isAllowed": false, "isAudited": true, "policyId": -1 }
},
{
"name": "table: finance.invoices, user: scott, access: select",
"request": {
"resource": { "elements": { "database": "finance", "table":
"invoices" } },
"accessType": "select", "user": "scott", "userGroups": []
},
- "result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "isAllowed": false, "isAudited": true, "policyId": -1 }
+ "result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "datasetIds": [ 1,2 ], "isAllowed": false, "isAudited": true,
"policyId": -1 }
},
{
"name": "table: finance.payments, user: scott, access: select",
"request": {
"resource": { "elements": { "database": "finance", "table":
"payments" } },
"accessType": "select", "user": "scott", "userGroups": []
},
- "result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "isAllowed": false, "isAudited": true, "policyId": -1 }
+ "result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "datasetIds": [ 1,2], "isAllowed": false, "isAudited": true,
"policyId": -1 }
Review Comment:
Inconsistent spacing in array: Missing space after comma in `[ 1,2]`. Should
be `[ 1, 2 ]` to match the spacing pattern used in other datasetIds arrays
throughout the test files.
```suggestion
"result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "datasetIds": [ 1, 2 ], "isAllowed": false, "isAudited": true,
"policyId": -1 }
```
##########
agents-common/src/test/resources/policyengine/gds/test_gds_policy_hive_row_filter.json:
##########
@@ -13,111 +13,111 @@
"resource": { "elements": { "database": "sales", "table":
"prospects" } },
"accessType": "select", "user": "ds-user", "userGroups": []
},
- "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"allowedByDatasets": [ "dataset-1" ], "isAllowed": true, "isAudited": true,
"policyId": 2001, "rowFilters": [ "created_time >= '2023-01-01' and
created_time < '2024-01-01'" ] }
+ "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"datasetIds": [ 1 ], "allowedByDatasets": [ "dataset-1" ], "isAllowed": true,
"isAudited": true, "policyId": 2001, "rowFilters": [ "created_time >=
'2023-01-01' and created_time < '2024-01-01'" ] }
},
{
"name": "table: sales.orders, user: ds-user, access: select",
"request": {
"resource": { "elements": { "database": "sales", "table": "orders" }
},
"accessType": "select", "user": "ds-user", "userGroups": []
},
- "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"allowedByDatasets": [ "dataset-1" ], "isAllowed": true, "isAudited": true,
"policyId": 2001, "rowFilters": [ "created_time >= '2023-01-01' and
created_time < '2024-01-01'" ] }
+ "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"datasetIds": [ 1 ], "allowedByDatasets": [ "dataset-1" ], "isAllowed": true,
"isAudited": true, "policyId": 2001, "rowFilters": [ "created_time >=
'2023-01-01' and created_time < '2024-01-01'" ] }
},
{
"name": "database: sales, user: ds-user, access: _any",
"request": {
"resource": { "elements": { "database": "sales" } },
"accessType": "", "user": "ds-user", "userGroups": []
},
- "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"allowedByDatasets": [ "dataset-1" ], "isAllowed": true, "isAudited": true,
"policyId": 2001, "rowFilters": null }
+ "result": { "datasets": [ "dataset-1" ], "projects": [ "project-1" ],
"datasetIds": [ 1 ], "allowedByDatasets": [ "dataset-1" ], "isAllowed": true,
"isAudited": true, "policyId": 2001, "rowFilters": null }
},
{
"name": "table: finance.invoices, user: ds-user, access: select",
"request": {
"resource": { "elements": { "database": "finance", "table":
"invoices" } },
"accessType": "select", "user": "ds-user", "userGroups": []
},
- "result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "allowedByDatasets": [ "dataset-1", "dataset-2" ], "isAllowed":
true, "isAudited": true, "policyId": 2001, "rowFilters": [ "created_time >=
'2023-01-01' and created_time < '2024-01-01'" ] }
+ "result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "datasetIds": [ 1,2 ], "allowedByDatasets": [ "dataset-1",
"dataset-2" ], "isAllowed": true, "isAudited": true, "policyId": 2001,
"rowFilters": [ "created_time >= '2023-01-01' and created_time < '2024-01-01'"
] }
},
{
"name": "table: finance.invoices, user: ds1-user, access: select",
"request": {
"resource": { "elements": { "database": "finance", "table":
"invoices" } },
"accessType": "select", "user": "ds1-user", "userGroups": []
},
- "result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "allowedByDatasets": [ "dataset-1" ], "isAllowed": true,
"isAudited": true, "policyId": 2001, "rowFilters": [ "created_time >=
'2023-01-01' and created_time < '2024-01-01'" ] }
+ "result": { "datasets": [ "dataset-1", "dataset-2" ], "projects": [
"project-1" ], "datasetIds": [ 1,2 ], "allowedByDatasets": [ "dataset-1" ],
"isAllowed": true, "isAudited": true, "policyId": 2001, "rowFilters": [
"created_time >= '2023-01-01' and created_time < '2024-01-01'" ] }
Review Comment:
Inconsistent spacing: Extra space after comma in `\"projects\": [
\"project-1\" ], \"datasetIds\"` (two spaces instead of one). This spacing
inconsistency appears in multiple test files and should be standardized to
match the single-space pattern used elsewhere.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
