From 844ef02c204c478c84043706faa4401394b1cb27 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 4 Mar 2022 20:15:58 +0100 Subject: [PATCH] Fix linting issues. (#701) Fix linting issues reported by validate-modules in plugins SUMMARY See ansible-collections/news-for-maintainers#9. ISSUE TYPE Bugfix Pull Request COMPONENT NAME various Reviewed-by: Jill R --- changelogs/fragments/validate-plugins.yml | 9 +++++++++ plugins/callback/aws_resource_actions.py | 2 +- plugins/inventory/aws_ec2.py | 1 - plugins/inventory/aws_rds.py | 5 ++--- plugins/lookup/aws_account_attribute.py | 4 ++-- plugins/lookup/aws_secret.py | 4 ++-- plugins/lookup/aws_service_ip_ranges.py | 4 ++-- plugins/lookup/aws_ssm.py | 8 ++++---- 8 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 changelogs/fragments/validate-plugins.yml diff --git a/changelogs/fragments/validate-plugins.yml b/changelogs/fragments/validate-plugins.yml new file mode 100644 index 00000000000..5b1feff1e1b --- /dev/null +++ b/changelogs/fragments/validate-plugins.yml @@ -0,0 +1,9 @@ +bugfixes: + - "aws_resource_actions callback plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)." + - "aws_ec2 inventory plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)." + - "aws_rds inventory plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)." + - "aws_account_attribute lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)." + - "aws_account_attribute lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)." + - "aws_secret lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)." + - "aws_service_ip_ranges lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)." + - "aws_ssm lookup plugin - fix linting errors in documentation data (https://github.com/ansible-collections/amazon.aws/pull/701)." diff --git a/plugins/callback/aws_resource_actions.py b/plugins/callback/aws_resource_actions.py index 9dae8e6f840..551a866a376 100644 --- a/plugins/callback/aws_resource_actions.py +++ b/plugins/callback/aws_resource_actions.py @@ -6,7 +6,7 @@ __metaclass__ = type DOCUMENTATION = ''' - callback: aws_resource_actions + name: aws_resource_actions type: aggregate short_description: summarizes all "resource:actions" completed description: diff --git a/plugins/inventory/aws_ec2.py b/plugins/inventory/aws_ec2.py index fa6a881ec40..5e39dbb6001 100644 --- a/plugins/inventory/aws_ec2.py +++ b/plugins/inventory/aws_ec2.py @@ -6,7 +6,6 @@ DOCUMENTATION = ''' name: aws_ec2 - plugin_type: inventory short_description: EC2 inventory source requirements: - boto3 diff --git a/plugins/inventory/aws_rds.py b/plugins/inventory/aws_rds.py index 480bb518821..d1549289b2b 100644 --- a/plugins/inventory/aws_rds.py +++ b/plugins/inventory/aws_rds.py @@ -6,7 +6,6 @@ DOCUMENTATION = ''' name: aws_rds - plugin_type: inventory short_description: rds instance source description: - Get instances and clusters from Amazon Web Services RDS. @@ -49,8 +48,8 @@ - The suffix for host variables names coming from AWS. type: str version_added: 3.1.0 - note: - Ansible versions prior to 2.10 should use the fully qualified plugin name 'amazon.aws.aws_rds'. + notes: + - Ansible versions prior to 2.10 should use the fully qualified plugin name 'amazon.aws.aws_rds'. extends_documentation_fragment: - inventory_cache - constructed diff --git a/plugins/lookup/aws_account_attribute.py b/plugins/lookup/aws_account_attribute.py index 428c09b6db8..f6e27bf2b06 100644 --- a/plugins/lookup/aws_account_attribute.py +++ b/plugins/lookup/aws_account_attribute.py @@ -4,9 +4,9 @@ __metaclass__ = type DOCUMENTATION = ''' -lookup: aws_account_attribute +name: aws_account_attribute author: - - Sloane Hertel + - Sloane Hertel (@s-hertel) requirements: - python >= 3.6 - boto3 diff --git a/plugins/lookup/aws_secret.py b/plugins/lookup/aws_secret.py index d94fb6256ea..e415386299a 100644 --- a/plugins/lookup/aws_secret.py +++ b/plugins/lookup/aws_secret.py @@ -5,9 +5,9 @@ __metaclass__ = type DOCUMENTATION = r''' -lookup: aws_secret +name: aws_secret author: - - Aaron Smith + - Aaron Smith (!UNKNOWN) requirements: - python >= 3.6 - boto3 diff --git a/plugins/lookup/aws_service_ip_ranges.py b/plugins/lookup/aws_service_ip_ranges.py index 82447236860..bd34d1bd131 100644 --- a/plugins/lookup/aws_service_ip_ranges.py +++ b/plugins/lookup/aws_service_ip_ranges.py @@ -5,9 +5,9 @@ __metaclass__ = type DOCUMENTATION = ''' -lookup: aws_service_ip_ranges +name: aws_service_ip_ranges author: - - James Turner + - James Turner (!UNKNOWN) requirements: - must have public internet connectivity short_description: Look up the IP ranges for services provided in AWS such as EC2 and S3. diff --git a/plugins/lookup/aws_ssm.py b/plugins/lookup/aws_ssm.py index 89cfe379465..5ba4cc655e3 100644 --- a/plugins/lookup/aws_ssm.py +++ b/plugins/lookup/aws_ssm.py @@ -8,11 +8,11 @@ __metaclass__ = type DOCUMENTATION = ''' -lookup: aws_ssm +name: aws_ssm author: - - Bill Wang - - Marat Bakeev - - Michael De La Rue + - Bill Wang (!UNKNOWN) + - Marat Bakeev (!UNKNOWN) + - Michael De La Rue (!UNKNOWN) requirements: - python >= 3.6 - boto3