Skip to content

Fix audit_report: route named event types to audit_event_type #164

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

Open
idimov-keeper wants to merge 1 commit into
base: release
Choose a base branch
from
Open

Fix audit_report: route named event types to audit_event_type #164

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
40 changes: 20 additions & 20 deletions keepersdk-package/src/keepersdk/enterprise/audit_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,27 +127,27 @@ def get_filter(self) -> Optional[Dict[str, Any]]:
else:
raise ValueError(f'Invalid created filter: {self.filter.created}')
if self.filter.event_type is not None:
if isinstance(self.filter.event_type, str):
if self.filter.event_type.isnumeric():
report_filter['event_type'] = int(self.filter.event_type)
else:
report_filter['event_type'] = self.filter.event_type
elif isinstance(self.filter.event_type, int):
report_filter['event_type'] = self.filter.event_type
elif isinstance(self.filter.event_type, list):
report_filter['event_type'] = []
for x in self.filter.event_type:
if isinstance(x, str):
if x.isnumeric():
report_filter['event_type'].append(int(x))
else:
report_filter['event_type'].append(x)
elif isinstance(x, int):
report_filter['event_type'].append(x)
else:
raise ValueError(f'Invalid event_type filter: {x}')
# API contract: numeric IDs go under 'event_type', symbolic names under 'audit_event_type'.
numeric_ids: List[int] = []
named_types: List[str] = []
if isinstance(self.filter.event_type, list):
items: List[Union[str, int]] = list(self.filter.event_type)
else:
raise ValueError(f'Invalid event type filter: {self.filter.event_type}')
items = [self.filter.event_type]
for x in items:
if isinstance(x, int):
numeric_ids.append(x)
elif isinstance(x, str):
if x.isnumeric():
numeric_ids.append(int(x))
else:
named_types.append(x)
else:
raise ValueError(f'Invalid event_type filter: {x}')
if numeric_ids:
report_filter['event_type'] = numeric_ids[0] if len(numeric_ids) == 1 else numeric_ids
if named_types:
report_filter['audit_event_type'] = named_types[0] if len(named_types) == 1 else named_types
if self.filter.keeper_version:
if isinstance(self.filter.keeper_version, (str, int)):
report_filter['keeper_version'] = self.filter.keeper_version
Expand Down