Skip to content

Use the specific project name for audit log filtering so other failed tests don't interfere here #2795

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
labkey-susanh merged 1 commit into from
Nov 28, 2025
Merged

Use the specific project name for audit log filtering so other failed tests don't interfere here #2795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 24 additions & 2 deletions src/org/labkey/test/util/AuditLogHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,16 @@ public DataRegionTable goToAuditEventView(String eventType)
*/
public SelectRowsResponse getAuditLogsFromLKS(String containerPath, AuditEvent auditEventName, List<String> columnNames,
@Nullable List<Filter> filters, @Nullable Integer maxRows, @Nullable ContainerFilter containerFilter) throws IOException, CommandException
{
return getAuditLogsFromLKS(containerPath, _wrapper.getCurrentProject(), auditEventName, columnNames, filters, maxRows, containerFilter);
}

public SelectRowsResponse getAuditLogsFromLKS(String containerPath, @NotNull String projectName, AuditEvent auditEventName, List<String> columnNames,
@Nullable List<Filter> filters, @Nullable Integer maxRows, @Nullable ContainerFilter containerFilter) throws IOException, CommandException
{
SelectRowsCommand cmd = new SelectRowsCommand("auditLog", auditEventName.getName());
cmd.setColumns(columnNames);
cmd.addFilter("ProjectId/Name", _wrapper.getCurrentProject(), Filter.Operator.EQUAL);
cmd.addFilter("ProjectId/Name", projectName, Filter.Operator.EQUAL);
if (filters != null)
filters.forEach(cmd::addFilter);
if (maxRows != null)
Expand All @@ -208,7 +214,7 @@ public List<Map<String, Object>> getAuditLogsForTransactionId(String containerPa
}

public List<Map<String, Object>> getAuditLogsForTransactionId(String containerPath, AuditEvent auditEventName, List<String> columnNames,
Integer transactionId, List<Filter> eventFilters, @Nullable ContainerFilter containerFilter) throws IOException, CommandException
Integer transactionId, @Nullable List<Filter> eventFilters, @Nullable ContainerFilter containerFilter) throws IOException, CommandException
{
List<Filter> transactionFilter = new ArrayList<>();
if (transactionId != null)
Expand All @@ -218,6 +224,22 @@ public List<Map<String, Object>> getAuditLogsForTransactionId(String containerPa
return getAuditLogsFromLKS(containerPath, auditEventName, columnNames, transactionFilter, null, containerFilter).getRows();
}

public List<Map<String, Object>> getAuditLogsForTransactionId(String containerPath,
AuditEvent auditEventName,
List<String> columnNames,
String projectName,
Integer transactionId,
List<Filter> eventFilters,
@Nullable ContainerFilter containerFilter) throws IOException, CommandException
{
List<Filter> transactionFilter = new ArrayList<>();
if (transactionId != null)
transactionFilter.add(new Filter("TransactionId", transactionId, Filter.Operator.EQUAL));
if (eventFilters != null && !eventFilters.isEmpty())
transactionFilter.addAll(eventFilters);
return getAuditLogsFromLKS(containerPath, projectName, auditEventName, columnNames, transactionFilter, null, containerFilter).getRows();
}

public void checkAuditEventValuesForTransactionId(String containerPath, AuditEvent auditEventName, Integer transactionId, int rowCount, Map<String, Object> expectedValues) throws IOException, CommandException
{
checkAuditEventValuesForTransactionId(containerPath, auditEventName, transactionId, null, rowCount, expectedValues);
Expand Down