Skip to content

Handle str results #12

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.

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 1 commit into from
Jun 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions Packs/Code42/Integrations/Code42/Code42.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,13 @@ def remove_user_from_departing_employee(self, username):

def get_all_departing_employees(self, results):
res = []
results = int(results) if results else None
pages = self._get_sdk().detectionlists.departing_employee.get_all()
for page in pages:
employees = page["items"]
for employee in employees:
res.append(employee)
if len(res) == results:
if results and len(res) == results:
return res
return res

Expand Down Expand Up @@ -224,13 +225,14 @@ def remove_user_risk_tags(self, username, risk_tags):

def get_all_high_risk_employees(self, risk_tags, results):
risk_tags = _try_convert_str_list_to_list(risk_tags)
results = int(results) if results else None
res = []
pages = self._get_sdk().detectionlists.high_risk_employee.get_all()
for page in pages:
employees = _get_all_high_risk_employees_from_page(page, risk_tags)
for employee in employees:
res.append(employee)
if len(res) == results:
if results and len(res) == results:
return res
return res

Expand Down Expand Up @@ -637,7 +639,7 @@ def highriskemployee_remove_command(client, args):
@logger
def highriskemployee_get_all_command(client, args):
tags = args.get("risktags")
results = args.get("results")
results = args.get("results") or 50
try:
employees = client.get_all_high_risk_employees(tags, results)
employees_context = [
Expand Down
8 changes: 5 additions & 3 deletions Packs/Code42/Integrations/Code42/integration-Code42.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,12 +260,13 @@ script:

def get_all_departing_employees(self, results):
res = []
results = int(results) if results else None
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the real fix

pages = self._get_sdk().detectionlists.departing_employee.get_all()
for page in pages:
employees = page["items"]
for employee in employees:
res.append(employee)
if len(res) == results:
if results and len(res) == results:
return res
return res

Expand Down Expand Up @@ -295,13 +296,14 @@ script:

def get_all_high_risk_employees(self, risk_tags, results):
risk_tags = _try_convert_str_list_to_list(risk_tags)
results = int(results) if results else None
res = []
pages = self._get_sdk().detectionlists.high_risk_employee.get_all()
for page in pages:
employees = _get_all_high_risk_employees_from_page(page, risk_tags)
for employee in employees:
res.append(employee)
if len(res) == results:
if results and len(res) == results:
return res
return res

Expand Down Expand Up @@ -722,7 +724,7 @@ script:

def highriskemployee_get_all_command(client, args):
tags = args.get("risktags")
results = args.get("results")
results = args.get("results") or 50
try:
employees = client.get_all_high_risk_employees(tags, results)
employees_context = [
Expand Down