From bcc9608dc9ed0a1add318cf43a4b0382f6343191 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:45:02 +0000 Subject: [PATCH 1/3] Bump pylint from 3.2.7 to 3.3.1 Bumps [pylint](https://github.com/pylint-dev/pylint) from 3.2.7 to 3.3.1. - [Release notes](https://github.com/pylint-dev/pylint/releases) - [Commits](https://github.com/pylint-dev/pylint/compare/v3.2.7...v3.3.1) --- updated-dependencies: - dependency-name: pylint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0022d6c..9188604 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ bumpversion==0.6.0 -pylint==3.2.7 +pylint==3.3.1 pip==24.2 pytest==8.3.3 pytest-runner==6.0.1 From 7e4f37088f1eab34469c9c92cc8f7d1ca7816152 Mon Sep 17 00:00:00 2001 From: Florian Sellmayr Date: Wed, 9 Oct 2024 20:45:56 +0200 Subject: [PATCH 2/3] Update pylint too-many-arguments ignores to new versions name too-many-positional-arguments --- trailscraper/cli.py | 2 +- trailscraper/cloudtrail.py | 2 +- trailscraper/s3_download.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trailscraper/cli.py b/trailscraper/cli.py index 0512698..ffd28e0 100644 --- a/trailscraper/cli.py +++ b/trailscraper/cli.py @@ -50,7 +50,7 @@ def root_group(verbose): help='Wait until events after the specified timeframe are found.') @click.option('--parallelism', default=10, type=click.INT, help='How many files to download in parallel') -# pylint: disable=too-many-arguments +# pylint: disable=too-many-positional-arguments def download(bucket, prefix, org_id, account_id, region, log_dir, from_s, to_s, wait, parallelism): """Downloads CloudTrail Logs from S3.""" log_dir = os.path.expanduser(log_dir) diff --git a/trailscraper/cloudtrail.py b/trailscraper/cloudtrail.py index f85d90c..396f280 100644 --- a/trailscraper/cloudtrail.py +++ b/trailscraper/cloudtrail.py @@ -21,7 +21,7 @@ class Record: """Represents a CloudTrail record""" - # pylint: disable=too-many-arguments + # pylint: disable=too-many-positional-arguments def __init__(self, event_source, event_name, resource_arns=None, assumed_role_arn=None, event_time=None, raw_source=None): self.event_source = event_source diff --git a/trailscraper/s3_download.py b/trailscraper/s3_download.py index db0d338..978a7b1 100644 --- a/trailscraper/s3_download.py +++ b/trailscraper/s3_download.py @@ -18,7 +18,7 @@ def _s3_key_prefix_for_org_trails(prefix, date, org_id, account_id, region): return f"{prefix}AWSLogs/{org_id}/{account_id}/CloudTrail/{region}/{date.year}/{date.month:02d}/{date.day:02d}/" -# pylint: disable=too-many-arguments +# pylint: disable=too-many-positional-arguments def _s3_key_prefixes(prefix, org_ids, account_ids, regions, from_date, to_date): delta = to_date.astimezone(pytz.utc) - from_date.astimezone(pytz.utc) @@ -89,7 +89,7 @@ def _list_files_to_download(current_prefix): consume(results) # Ensure we raise exceptions -# pylint: disable=too-many-arguments +# pylint: disable=too-many-positional-arguments def download_cloudtrail_logs(target_dir, bucket, cloudtrail_prefix, org_ids, account_ids, regions, from_date, to_date, parallelism): """Downloads cloudtrail logs matching the given arguments to the target dir""" From 1569fbbcf3f759c0234e306601abd6e368d5ddcb Mon Sep 17 00:00:00 2001 From: Florian Sellmayr Date: Wed, 9 Oct 2024 20:51:24 +0200 Subject: [PATCH 3/3] Turns out pylint has two rules for the same thing, disabling both --- trailscraper/cli.py | 2 +- trailscraper/cloudtrail.py | 2 +- trailscraper/s3_download.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trailscraper/cli.py b/trailscraper/cli.py index ffd28e0..0ead1c8 100644 --- a/trailscraper/cli.py +++ b/trailscraper/cli.py @@ -50,7 +50,7 @@ def root_group(verbose): help='Wait until events after the specified timeframe are found.') @click.option('--parallelism', default=10, type=click.INT, help='How many files to download in parallel') -# pylint: disable=too-many-positional-arguments +# pylint: disable=too-many-positional-arguments,too-many-arguments def download(bucket, prefix, org_id, account_id, region, log_dir, from_s, to_s, wait, parallelism): """Downloads CloudTrail Logs from S3.""" log_dir = os.path.expanduser(log_dir) diff --git a/trailscraper/cloudtrail.py b/trailscraper/cloudtrail.py index 396f280..98b029b 100644 --- a/trailscraper/cloudtrail.py +++ b/trailscraper/cloudtrail.py @@ -21,7 +21,7 @@ class Record: """Represents a CloudTrail record""" - # pylint: disable=too-many-positional-arguments + # pylint: disable=too-many-positional-arguments,too-many-arguments def __init__(self, event_source, event_name, resource_arns=None, assumed_role_arn=None, event_time=None, raw_source=None): self.event_source = event_source diff --git a/trailscraper/s3_download.py b/trailscraper/s3_download.py index 978a7b1..91c1cd1 100644 --- a/trailscraper/s3_download.py +++ b/trailscraper/s3_download.py @@ -18,7 +18,7 @@ def _s3_key_prefix_for_org_trails(prefix, date, org_id, account_id, region): return f"{prefix}AWSLogs/{org_id}/{account_id}/CloudTrail/{region}/{date.year}/{date.month:02d}/{date.day:02d}/" -# pylint: disable=too-many-positional-arguments +# pylint: disable=too-many-positional-arguments,too-many-arguments def _s3_key_prefixes(prefix, org_ids, account_ids, regions, from_date, to_date): delta = to_date.astimezone(pytz.utc) - from_date.astimezone(pytz.utc) @@ -89,7 +89,7 @@ def _list_files_to_download(current_prefix): consume(results) # Ensure we raise exceptions -# pylint: disable=too-many-positional-arguments +# pylint: disable=too-many-positional-arguments,too-many-arguments def download_cloudtrail_logs(target_dir, bucket, cloudtrail_prefix, org_ids, account_ids, regions, from_date, to_date, parallelism): """Downloads cloudtrail logs matching the given arguments to the target dir"""