Skip to content

Commit f0a9a1d

Browse files
author
Juliya Smith
authored
Merge pull request #12 from code42/Fix-results
2 parents 1e13e46 + 541754f commit f0a9a1d

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Packs/Code42/Integrations/Code42/Code42.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,13 @@ def remove_user_from_departing_employee(self, username):
189189

190190
def get_all_departing_employees(self, results):
191191
res = []
192+
results = int(results) if results else None
192193
pages = self._get_sdk().detectionlists.departing_employee.get_all()
193194
for page in pages:
194195
employees = page["items"]
195196
for employee in employees:
196197
res.append(employee)
197-
if len(res) == results:
198+
if results and len(res) == results:
198199
return res
199200
return res
200201

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

225226
def get_all_high_risk_employees(self, risk_tags, results):
226227
risk_tags = _try_convert_str_list_to_list(risk_tags)
228+
results = int(results) if results else None
227229
res = []
228230
pages = self._get_sdk().detectionlists.high_risk_employee.get_all()
229231
for page in pages:
230232
employees = _get_all_high_risk_employees_from_page(page, risk_tags)
231233
for employee in employees:
232234
res.append(employee)
233-
if len(res) == results:
235+
if results and len(res) == results:
234236
return res
235237
return res
236238

@@ -637,7 +639,7 @@ def highriskemployee_remove_command(client, args):
637639
@logger
638640
def highriskemployee_get_all_command(client, args):
639641
tags = args.get("risktags")
640-
results = args.get("results")
642+
results = args.get("results") or 50
641643
try:
642644
employees = client.get_all_high_risk_employees(tags, results)
643645
employees_context = [

Packs/Code42/Integrations/Code42/integration-Code42.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,13 @@ script:
260260
261261
def get_all_departing_employees(self, results):
262262
res = []
263+
results = int(results) if results else None
263264
pages = self._get_sdk().detectionlists.departing_employee.get_all()
264265
for page in pages:
265266
employees = page["items"]
266267
for employee in employees:
267268
res.append(employee)
268-
if len(res) == results:
269+
if results and len(res) == results:
269270
return res
270271
return res
271272
@@ -295,13 +296,14 @@ script:
295296
296297
def get_all_high_risk_employees(self, risk_tags, results):
297298
risk_tags = _try_convert_str_list_to_list(risk_tags)
299+
results = int(results) if results else None
298300
res = []
299301
pages = self._get_sdk().detectionlists.high_risk_employee.get_all()
300302
for page in pages:
301303
employees = _get_all_high_risk_employees_from_page(page, risk_tags)
302304
for employee in employees:
303305
res.append(employee)
304-
if len(res) == results:
306+
if results and len(res) == results:
305307
return res
306308
return res
307309
@@ -722,7 +724,7 @@ script:
722724
723725
def highriskemployee_get_all_command(client, args):
724726
tags = args.get("risktags")
725-
results = args.get("results")
727+
results = args.get("results") or 50
726728
try:
727729
employees = client.get_all_high_risk_employees(tags, results)
728730
employees_context = [

0 commit comments

Comments
 (0)