From 4ccabcb1d49ef1611ca3906b58196cf1bfce333f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Le Duigou Date: Sun, 29 Mar 2020 15:46:01 +0200 Subject: [PATCH 1/2] Display bucket name in log statement when downloading definition Signed-off-by: Jean-Baptiste Le Duigou --- scan.py | 2 +- update.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scan.py b/scan.py index c55716d4..190f46a6 100644 --- a/scan.py +++ b/scan.py @@ -230,7 +230,7 @@ def lambda_handler(event, context): for download in to_download.values(): s3_path = download["s3_path"] local_path = download["local_path"] - print("Downloading definition file %s from s3://%s" % (local_path, s3_path)) + print("Downloading definition file %s from s3://%s/%s" % (local_path, AV_DEFINITION_S3_BUCKET, s3_path)) s3.Bucket(AV_DEFINITION_S3_BUCKET).download_file(s3_path, local_path) print("Downloading definition file %s complete!" % (local_path)) scan_result, scan_signature = clamav.scan_file(file_path) diff --git a/update.py b/update.py index 9730f230..b32894a3 100644 --- a/update.py +++ b/update.py @@ -37,7 +37,7 @@ def lambda_handler(event, context): for download in to_download.values(): s3_path = download["s3_path"] local_path = download["local_path"] - print("Downloading definition file %s from s3://%s" % (local_path, s3_path)) + print("Downloading definition file %s from s3://%s/%s" % (local_path, AV_DEFINITION_S3_BUCKET, s3_path)) s3.Bucket(AV_DEFINITION_S3_BUCKET).download_file(s3_path, local_path) print("Downloading definition file %s complete!" % (local_path)) From b96d517b52cc4f8b736edea9bc5be510d18ca2b4 Mon Sep 17 00:00:00 2001 From: jbleduigou Date: Mon, 3 May 2021 21:08:39 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=A8=20fix=20linter=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jbleduigou --- scan.py | 5 ++++- update.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scan.py b/scan.py index 190f46a6..48a6584a 100644 --- a/scan.py +++ b/scan.py @@ -230,7 +230,10 @@ def lambda_handler(event, context): for download in to_download.values(): s3_path = download["s3_path"] local_path = download["local_path"] - print("Downloading definition file %s from s3://%s/%s" % (local_path, AV_DEFINITION_S3_BUCKET, s3_path)) + print( + "Downloading definition file %s from s3://%s/%s" + % (local_path, AV_DEFINITION_S3_BUCKET, s3_path) + ) s3.Bucket(AV_DEFINITION_S3_BUCKET).download_file(s3_path, local_path) print("Downloading definition file %s complete!" % (local_path)) scan_result, scan_signature = clamav.scan_file(file_path) diff --git a/update.py b/update.py index b32894a3..58feee35 100644 --- a/update.py +++ b/update.py @@ -37,7 +37,10 @@ def lambda_handler(event, context): for download in to_download.values(): s3_path = download["s3_path"] local_path = download["local_path"] - print("Downloading definition file %s from s3://%s/%s" % (local_path, AV_DEFINITION_S3_BUCKET, s3_path)) + print( + "Downloading definition file %s from s3://%s/%s" + % (local_path, AV_DEFINITION_S3_BUCKET, s3_path) + ) s3.Bucket(AV_DEFINITION_S3_BUCKET).download_file(s3_path, local_path) print("Downloading definition file %s complete!" % (local_path))