Skip to content

Commit d903ab6

Browse files
committed
small formatting updates
1 parent 1254ba1 commit d903ab6

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

zap/src/scan.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def fetch_dojo_product_name(defect_dojo, defect_dojo_user, defect_dojo_key, prod
3434
defect_dojo, defect_dojo_key, defect_dojo_user, debug=False, timeout=120)
3535
max_retries = int(getenv("MAX_RETRIES", '6'))
3636
retry_delay = 30
37-
for attempt in range(max_retries):
37+
for _ in range(max_retries):
3838
try:
3939
product = dojo.get_product(product_id=product_id)
4040
return product.data["name"]
@@ -106,7 +106,7 @@ def defectdojo_upload(product_id: int, zap_filename: str, defect_dojo_key: str,
106106
date = datetime.today().strftime("%Y%m%d%H:%M")
107107
lead_id = fetch_dojo_lead_id(dojo, defect_dojo_user)
108108

109-
# The call to create_engagement sometimes fails.
109+
# The call to create_engagement sometimes fails.
110110
retry_delay = 20
111111
max_retries = int(getenv("MAX_RETRIES", '5'))
112112
for attempt in range(max_retries):
@@ -252,7 +252,6 @@ def get_codedx_initial_report(
252252
file_name=report_file,
253253
filters=filters,
254254
)
255-
256255
return report_file
257256

258257

@@ -382,7 +381,7 @@ def upload_googledrive(scan_type, zap_filename, codedx_project, report_file, sla
382381
"""
383382
root_id = os.getenv('DRIVE_ROOT_ID', None)
384383
drive_id = os.getenv('DRIVE_ID', None)
385-
if scan_type in (ScanType.BASELINE):
384+
if scan_type in (ScanType.BASELINE):
386385
return
387386
try:
388387
logging.info('Setting up the google drive API service for uploading reports.')
@@ -399,7 +398,6 @@ def upload_googledrive(scan_type, zap_filename, codedx_project, report_file, sla
399398
date = datetime.today()
400399
date = drivehelper.adjust_date(date)
401400
_, xml_folder_dict, zap_raw_folder = drivehelper.get_upload_folders(folder_structure, date)
402-
403401
file = drivehelper.upload_file_to_drive(zap_filename,
404402
xml_folder_dict.get('id'),
405403
drive_id,
@@ -520,7 +518,7 @@ def main(): # pylint: disable=too-many-locals
520518
)
521519
zap_shutdown()
522520
return
523-
521+
524522
# upload its results to Code Dx
525523
cdx = CodeDx(codedx_url, codedx_api_key)
526524

zap/src/zap.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,11 @@ def zap_shutdown():
8383
if int(resp.status_code) == 200:
8484
break
8585
time.sleep(sleep_time)
86-
87-
86+
8887
except Exception as e:
8988
logging.error("failed to shut down zap.")
9089
logging.error(e)
91-
return
90+
9291

9392
def parse_url(url):
9493
"""

0 commit comments

Comments
 (0)