From f99f88b034d7c51bbe20c0c86dc06afbfc0b30ee Mon Sep 17 00:00:00 2001 From: Ben Carter Date: Fri, 22 Mar 2019 04:39:36 +0800 Subject: [PATCH] fixing status option in documentation (#53785) changing status option to statuses in the documentation Adding choices to the argument spec to match the documentation from AWS. Adding 'REVOKED', 'FAILED' to statuses documentation to match implementation. Removing E322, E323 ignores for aws_acm_facts --- lib/ansible/modules/cloud/amazon/aws_acm_facts.py | 7 +++---- test/sanity/validate-modules/ignore.txt | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/aws_acm_facts.py b/lib/ansible/modules/cloud/amazon/aws_acm_facts.py index 4eed4a13e8..b43a8e253d 100644 --- a/lib/ansible/modules/cloud/amazon/aws_acm_facts.py +++ b/lib/ansible/modules/cloud/amazon/aws_acm_facts.py @@ -18,11 +18,10 @@ options: - The domain name of an ACM certificate to limit the search to aliases: - name - status: + statuses: description: - Status to filter the certificate results - choices: ['PENDING_VALIDATION', 'ISSUED', 'INACTIVE', 'EXPIRED', 'VALIDATION_TIMED_OUT'] - + choices: ['PENDING_VALIDATION', 'ISSUED', 'INACTIVE', 'EXPIRED', 'VALIDATION_TIMED_OUT', 'REVOKED', 'FAILED'] requirements: - boto3 author: @@ -311,7 +310,7 @@ def main(): argument_spec.update( dict( domain_name=dict(aliases=['name']), - statuses=dict(type='list'), + statuses=dict(type='list', choices=['PENDING_VALIDATION', 'ISSUED', 'INACTIVE', 'EXPIRED', 'VALIDATION_TIMED_OUT', 'REVOKED', 'FAILED']), ) ) module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True) diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index 94b384b534..e145651530 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -1,7 +1,5 @@ lib/ansible/modules/cloud/amazon/_ec2_ami_find.py E322 lib/ansible/modules/cloud/amazon/_ec2_ami_find.py E323 -lib/ansible/modules/cloud/amazon/aws_acm_facts.py E322 -lib/ansible/modules/cloud/amazon/aws_acm_facts.py E323 lib/ansible/modules/cloud/amazon/aws_api_gateway.py E322 lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py E322 lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py E326