Update and prepare for 5.0.0 release (#20)

* Remove use of six

* Fix typo

* Code modernization

* Add __future__ imports
* Remove Python 2 compat

* Remove amazon.aws dependency

* Breaking Change - Modules no longer accept connection details as module arguments. Standard boto3 environment variables and configuration files must be used instead. This was done to simplify the codebase and ease upgrades.
* The collection is no longer dependent on amazon.aws, making it easier to update each one independently.

* Update distlib requirement

* Remove action_group definition

Update integration tests to use boto3 environment variables.

* Test against ansible-core 2.18

* Fix pylint issue

* Update amazon.aws version used in integration tests

* Avoid static analysis issue in PyCharm

* Add missing type annotations

* Update to version 5.0.0

Author: mattclay

galaxy.yml

@@ -9,7 +9,7 @@ namespace: mattclay
 name: aws
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 4.1.0
+version: 5.0.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -40,13 +40,6 @@ tags:
   - aws
   - lambda
 
-# Collections that this collection requires to be installed for it to be usable. The key of the dict is the
-# collection label 'namespace.name'. The value is a version range
-# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
-# range specifiers can be set and are separated by ','
-dependencies:
-  amazon.aws: '>=7.0.0,<8.0.0'
-
 # The URL of the originating SCM repository
 repository: https://github.com/mattclay/ansible-collection-aws
 

meta/runtime.yml

@@ -1,17 +1 @@
 requires_ansible: '>=2.11'
-action_groups:
-  common:
-    # this collection
-    - apigateway
-    - aws_account_facts
-    - aws_availability_zone_facts
-    - cloudwatch_event
-    - lambda
-    - lambda_alias
-    - lambda_layer
-    - lambda_package
-    - lambda_policy
-    - sqs_event
-    - sqs_fifo_queue
-    # external collections
-    - amazon.aws.iam_role

plugins/filter/dictfilter.py

@@ -1,11 +1,14 @@
 # Copyright (C) 2016 Matt Clay <[email protected]>
 # GNU General Public License v3.0+ (see LICENSE.md or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+from __future__ import annotations
+
+
 def dictfilter(item, keys):
     return dict((k, item[k]) for k in item if k in keys)
 
 
-class FilterModule(object):
+class FilterModule:
     def filters(self):
         return dict(
             dictfilter=dictfilter,

plugins/filter/ec2_az_vpc_route_tables_subnets.py

@@ -1,6 +1,8 @@
 # Copyright (C) 2016 Matt Clay <[email protected]>
 # GNU General Public License v3.0+ (see LICENSE.md or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+from __future__ import annotations
+
 
 def ec2_az_vpc_route_tables_subnets(zones, subnet):
     return [map_zone_to_subnet(z, subnet) for z in zones]
@@ -11,7 +13,7 @@ def map_zone_to_subnet(zone, subnet):
     return subnet % position
 
 
-class FilterModule(object):
+class FilterModule:
     def filters(self):
         return dict(
             ec2_az_vpc_route_tables_subnets=ec2_az_vpc_route_tables_subnets,

plugins/filter/ec2_az_vpc_subnets.py

@@ -1,6 +1,9 @@
 # Copyright (C) 2016 Matt Clay <[email protected]>
 # GNU General Public License v3.0+ (see LICENSE.md or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+from __future__ import annotations
+
+
 def ec2_az_vpc_subnets(zones, subnet, name):
     return [dict(
         cidr=map_zone_to_subnet(z, subnet),
@@ -16,7 +19,7 @@ def map_zone_to_subnet(zone, subnet):
     return subnet % position
 
 
-class FilterModule(object):
+class FilterModule:
     def filters(self):
         return dict(
             ec2_az_vpc_subnets=ec2_az_vpc_subnets,

plugins/filter/ec2_az_vpc_subnets.yml

@@ -2,7 +2,7 @@ DOCUMENTATION:
   name: ec2_az_vpc_subnets
   short_description: generate a list of availability zones and subnets
   description:
-    - Use the input zones dictionary, provided subnet format string and tag name to build a list of availiability zones with subnets.
+    - Use the input zones dictionary, provided subnet format string and tag name to build a list of availability zones with subnets.
   positional: _input, subnet, name
   options:
     _input:

plugins/filter/map_format.py

@@ -1,14 +1,17 @@
 # Copyright (C) 2017 Matt Clay <[email protected]>
 # GNU General Public License v3.0+ (see LICENSE.md or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+from __future__ import annotations
+
+
 def map_format(item, fmt, *args, **kwargs):
     d = {}
     d.update(item)
     d.update(kwargs)
     return fmt.format(*args, **d)
 
 
-class FilterModule(object):
+class FilterModule:
     def filters(self):
         return dict(
             map_format=map_format,

plugins/module_utils/__init__.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+import functools
+import typing as t
+
+if t.TYPE_CHECKING:
+    import boto3 as t_boto3
+
+    from types_boto3_apigateway import APIGatewayClient
+    from types_boto3_ec2 import EC2Client
+    from types_boto3_events import EventBridgeClient
+    from types_boto3_lambda import LambdaClient
+    from types_boto3_sqs.service_resource import SQSServiceResource
+    from types_boto3_sts import STSClient
+
+
+from ansible.module_utils.basic import AnsibleModule
+
+
+class AwsModule(AnsibleModule):
+    @functools.cached_property
+    def client(self) -> AwsClient:
+        return AwsClient(self)
+
+    @functools.cached_property
+    def resource(self) -> AwsResource:
+        return AwsResource(self)
+
+    @functools.cached_property
+    def account_id(self) -> str:
+        return self.client.sts.get_caller_identity()["Account"]
+
+    @functools.cached_property
+    def region(self) -> str:
+        return self.session.region_name
+
+    @functools.cached_property
+    def session(self) -> t_boto3.Session:
+        import boto3
+
+        return boto3.Session()
+
+
+class AwsClient:
+    def __init__(self, module: AwsModule) -> None:
+        self._module = module
+
+    def _client(self, service_name: str) -> t.Any:
+        return self._module.session.client(service_name)
+
+    @functools.cached_property
+    def apigateway(self) -> APIGatewayClient:
+        return self._client('apigateway')
+
+    @functools.cached_property
+    def awslambda(self) -> LambdaClient:
+        return self._client('lambda')
+
+    @functools.cached_property
+    def ec2(self) -> EC2Client:
+        return self._client('ec2')
+
+    @functools.cached_property
+    def events(self) -> EventBridgeClient:
+        return self._client('events')
+
+    @functools.cached_property
+    def sts(self) -> STSClient:
+        return self._client('sts')
+
+
+class AwsResource:
+    def __init__(self, module: AwsModule) -> None:
+        self._module = module
+
+    def _resource(self, service_name: str) -> t.Any:
+        return self._module.session.resource(service_name)
+
+    @functools.cached_property
+    def sqs(self) -> SQSServiceResource:
+        return self._resource('sqs')