Skip to content

Commit

Permalink
Merge pull request ansible-collections#569 from tremble/docs/require-…
Browse files Browse the repository at this point in the history
…boto3

Update the default module requirements from python 2.6/boto to python 3.6/boto3

SUMMARY
The vast bulk of modules are now boto3 based, but some even list python2.6/boto as their requirements because they've picked the default from the aws docs fragment.
Switch the defaults over to reduce the copy&paste and reflect that

boto v2 is deprecated
python 2.6 is no longer supported by the AWS collections

ISSUE TYPE

Docs Pull Request

COMPONENT NAME
lots of them
ADDITIONAL INFORMATION
Depends-On: ansible-collections/amazon.aws#298

Reviewed-by: Jill R <None>
Reviewed-by: Alina Buzachis <None>
  • Loading branch information
ansible-zuul[bot] authored Jul 5, 2021
2 parents 67b1e04 + 95f0365 commit 00ebae3
Show file tree
Hide file tree
Showing 154 changed files with 31 additions and 310 deletions.
3 changes: 0 additions & 3 deletions plugins/modules/aws_acm.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,11 @@
choices: [present, absent]
default: present
type: str
requirements:
- boto3
author:
- Matthew Davis (@matt-telstra) on behalf of Telstra Corporation Limited
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
'''

EXAMPLES = '''
Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/aws_acm_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,11 @@
description:
- Filter results to show only certificates with tags that match all the tags specified here.
type: dict
requirements:
- boto3
author:
- Will Thames (@willthames)
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
'''

EXAMPLES = r'''
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/aws_api_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
- swagger_file and swagger_text are passed directly on to AWS
transparently whilst swagger_dict is an ansible dict which is
converted to JSON before the API definitions are uploaded.
requirements: [ boto3 ]
options:
api_id:
description:
Expand Down Expand Up @@ -114,7 +113,6 @@
ID so that an API can be created only once.
- As an early work around an intermediate version will probably do
the same using a tag embedded in the API name.
'''

EXAMPLES = '''
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/aws_application_scaling_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
author:
- Gustavo Maia (@gurumaia)
- Chen Leibovich (@chenl87)
requirements: [ json, botocore, boto3 ]
options:
state:
description: Whether a policy should be C(present) or C(absent).
Expand Down Expand Up @@ -105,7 +104,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
'''

EXAMPLES = '''
Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/aws_batch_compute_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@
description:
- The Amazon Resource Name (ARN) of the Amazon EC2 Spot Fleet IAM role applied to a SPOT compute environment.
type: str
requirements:
- boto3
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/aws_batch_job_definition.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@
attempts. If attempts is greater than one, the job is retried if it fails until it has moved to RUNNABLE that
many times.
type: int
requirements:
- boto3
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/aws_batch_job_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
compute_environment:
type: str
description: The name of the compute environment.
requirements:
- boto3
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_codebuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
- Create or delete a CodeBuild projects on AWS, used for building code artifacts from source code.
author:
- Stefan Horning (@stefanhorning) <[email protected]>
requirements: [ botocore, boto3 ]
options:
name:
description:
Expand Down
6 changes: 0 additions & 6 deletions plugins/modules/aws_codecommit.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
- Supports creation and deletion of CodeCommit repositories.
- See U(https://aws.amazon.com/codecommit/) for more information about CodeCommit.
author: Shuang Wang (@ptux)
requirements:
- botocore
- boto3
- python >= 2.6
options:
name:
description:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_codepipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
- Create or delete a CodePipeline on AWS.
author:
- Stefan Horning (@stefanhorning) <[email protected]>
requirements: [ botocore, boto3 ]
options:
name:
description:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_config_aggregation_authorization.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
short_description: Manage cross-account AWS Config authorizations
description:
- Module manages AWS Config resources.
requirements: [ 'botocore', 'boto3' ]
author:
- "Aaron Smith (@slapula)"
options:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_config_aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
short_description: Manage AWS Config aggregations across multiple accounts
description:
- Module manages AWS Config resources
requirements: [ 'botocore', 'boto3' ]
author:
- "Aaron Smith (@slapula)"
options:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_config_delivery_channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
short_description: Manage AWS Config delivery channels
description:
- This module manages AWS Config delivery locations for rule checks and configuration info.
requirements: [ 'botocore', 'boto3' ]
author:
- "Aaron Smith (@slapula)"
options:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_config_recorder.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
short_description: Manage AWS Config Recorders
description:
- Module manages AWS Config configuration recorder settings.
requirements: [ 'botocore', 'boto3' ]
author:
- "Aaron Smith (@slapula)"
options:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_config_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
short_description: Manage AWS Config resources
description:
- Module manages AWS Config rules
requirements: [ 'botocore', 'boto3' ]
author:
- "Aaron Smith (@slapula)"
options:
Expand Down
4 changes: 0 additions & 4 deletions plugins/modules/aws_direct_connect_confirm_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
requirements:
- boto3
- botocore
options:
name:
description:
Expand Down
4 changes: 0 additions & 4 deletions plugins/modules/aws_direct_connect_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
requirements:
- boto3
- botocore
options:
state:
description:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/aws_direct_connect_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
requirements: [ boto3 ]
options:
state:
description:
Expand Down
4 changes: 0 additions & 4 deletions plugins/modules/aws_direct_connect_link_aggregation_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
requirements:
- boto3
- botocore
options:
state:
description:
Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/aws_direct_connect_virtual_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
description:
- Create, delete, or modify a Direct Connect public or private virtual interface.
author: "Sloane Hertel (@s-hertel)"
requirements:
- boto3
- botocore
options:
state:
description:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/aws_eks_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@
to 1200 seconds (20 minutes).
default: 1200
type: int
requirements: [ 'botocore', 'boto3' ]
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_glue_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
short_description: Manage an AWS Glue connection
description:
- Manage an AWS Glue connection. See U(https://aws.amazon.com/glue/) for details.
requirements: [ boto3 ]
author: "Rob White (@wimnat)"
options:
availability_zone:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_glue_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
short_description: Manage an AWS Glue job
description:
- Manage an AWS Glue job. See U(https://aws.amazon.com/glue/) for details.
requirements: [ boto3 ]
author:
- "Rob White (@wimnat)"
- "Vijayanand Sharma (@vijayanandsharma)"
Expand Down
4 changes: 0 additions & 4 deletions plugins/modules/aws_inspector_target.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
requirements:
- boto3
- botocore
'''

EXAMPLES = '''
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/aws_region_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
requirements: [botocore, boto3]
'''

EXAMPLES = '''
Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/aws_s3_bucket_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
version_added: 1.0.0
author: "Gerben Geijteman (@hyperized)"
short_description: lists S3 buckets in AWS
requirements:
- boto3 >= 1.4.4
- python >= 2.6
description:
- Lists S3 buckets and details about those buckets.
- This module was called C(aws_s3_bucket_facts) before Ansible 2.9, returning C(ansible_facts).
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_secret.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
description:
- Create, update, and delete secrets stored in AWS Secrets Manager.
author: "REY Remi (@rrey)"
requirements: [ 'botocore>=1.10.0', 'boto3' ]
options:
name:
description:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_ses_identity.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
- This can only be false if both I(bounce_notifications) and I(complaint_notifications) specify SNS topics.
type: 'bool'
default: True
requirements: [ 'botocore', 'boto3' ]
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_ses_identity_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
default: present
choices: [ 'present', 'absent' ]
type: str
requirements: [ 'botocore', 'boto3' ]
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_ses_rule_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
author:
- "Ben Tomasik (@tomislacker)"
- "Ed Costello (@orthanc)"
requirements: [ boto3, botocore ]
options:
name:
description:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_sgw_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
description:
- Fetch AWS Storage Gateway information
- This module was called C(aws_sgw_facts) before Ansible 2.9. The usage did not change.
requirements: [ boto3 ]
author: Loic Blot (@nerzhul) <[email protected]>
options:
gather_local_disks:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/aws_ssm_parameter_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
requirements: [ botocore, boto3 ]
'''

EXAMPLES = '''
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/aws_waf_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
description:
- Retrieve information for WAF ACLs, Rule , Conditions and Filters.
- This module was called C(aws_waf_facts) before Ansible 2.9. The usage did not change.
requirements: [ boto3 ]
options:
name:
description:
Expand Down
1 change: 0 additions & 1 deletion plugins/modules/cloudformation_exports_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
version_added: 1.0.0
description:
- Module retrieves a value from CloudFormation Exports
requirements: ['boto3 >= 1.11.15']
author:
- "Michael Moyle (@mmoyle)"
extends_documentation_fragment:
Expand Down
2 changes: 0 additions & 2 deletions plugins/modules/cloudformation_stack_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@
extends_documentation_fragment:
- amazon.aws.aws
- amazon.aws.ec2
requirements: [ boto3>=1.6, botocore>=1.10.26 ]
'''

EXAMPLES = r'''
Expand Down
5 changes: 0 additions & 5 deletions plugins/modules/cloudfront_distribution.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
description:
- Allows for easy creation, updating and deletion of CloudFront distributions.
requirements:
- boto3 >= 1.0.0
- python >= 2.6
author:
- Willem van Ketwich (@wilvk)
- Will Thames (@willthames)
Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/cloudfront_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
- Gets information about an AWS CloudFront distribution.
- This module was called C(cloudfront_facts) before Ansible 2.9, returning C(ansible_facts).
Note that the M(community.aws.cloudfront_info) module no longer returns C(ansible_facts)!
requirements:
- boto3 >= 1.0.0
- python >= 2.6
author: Willem van Ketwich (@wilvk)
options:
distribution_id:
Expand Down
5 changes: 0 additions & 5 deletions plugins/modules/cloudfront_invalidation.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
description:
- Allows for invalidation of a batch of paths for a CloudFront distribution.
requirements:
- boto3 >= 1.0.0
- python >= 2.6
author: Willem van Ketwich (@wilvk)
extends_documentation_fragment:
Expand Down
5 changes: 0 additions & 5 deletions plugins/modules/cloudfront_origin_access_identity.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
- Allows for easy creation, updating and deletion of origin access
identities.
requirements:
- boto3 >= 1.0.0
- python >= 2.6
author: Willem van Ketwich (@wilvk)
extends_documentation_fragment:
Expand Down
3 changes: 0 additions & 3 deletions plugins/modules/cloudtrail.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
- Ansible Core Team
- Ted Timmons (@tedder)
- Daniel Shepherd (@shepdelacreme)
requirements:
- boto3
- botocore
options:
state:
description:
Expand Down
Loading

0 comments on commit 00ebae3

Please sign in to comment.