Update collection for a 4.0.0 release (#17)

* Update the collection version to 4.0.0.
* Use Python 3.12 for testing.
* Use `ansible-core` 2.16.5 for testing.
* Update `amazon.aws` dependency to version 7.x.
* Use `amazon.aws.iam_role` instead of `community.aws.iam_role` for testing.
* Drop `community.aws` test dependency.
* Fix module defaults in documentation.
* Fix test assertions to not use templates.
* Update `distlib` test dependency to version 0.3.8.

Author: mattclay

azure-pipelines.yml

@@ -18,7 +18,7 @@ pool:
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.9'
+      versionSpec: '3.12'
     displayName: Install Python
   - checkout: self
     path: ansible_collections/mattclay/aws

galaxy.yml

@@ -9,7 +9,7 @@ namespace: mattclay
 name: aws
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 3.0.0
+version: 4.0.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -45,7 +45,7 @@ tags:
 # 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: '>=5.0.0,<6.0.0'
+  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

@@ -14,4 +14,4 @@ action_groups:
     - sqs_event
     - sqs_fifo_queue
     # external collections
-    - community.aws.iam_role
+    - amazon.aws.iam_role

plugins/modules/apigateway.py

@@ -43,10 +43,12 @@
         description:
             - The stage description used for deployment.
         type: str
+        default: ''
     deployment_description:
         description:
             - The deployment description used for deployment.
         type: str
+        default: ''
     mode:
         description:
             - If C(merge) the specification will be merged into the existing API.
@@ -65,6 +67,7 @@
         description:
             - Stage variables to include in the deployment.
         type: dict
+        default: {}
 extends_documentation_fragment:
     - amazon.aws.aws
     - amazon.aws.ec2

plugins/modules/cloudwatch_event.py

@@ -33,6 +33,7 @@
         description:
             - Description of the rule.
         type: str
+        default: ''
     state:
         description:
             - If C(enabled) the rule will exist and be enabled.

plugins/modules/lambda.py

@@ -63,6 +63,7 @@
         description:
             - The description of the Lambda function.
         type: str
+        default: ''
     timeout:
         description:
             - The timeout (in minutes) for execution of the Lambda function.

plugins/modules/lambda_alias.py

@@ -42,6 +42,7 @@
         description:
             - The description of the alias.
         type: str
+        default: ''
 extends_documentation_fragment:
     - amazon.aws.aws
     - amazon.aws.ec2

tests/integration/targets/filter_dictfilter/tasks/main.yml

@@ -1,9 +1,9 @@
 - name: Test dictfilter filter
   assert:
     that:
-      - '{{ {} | mattclay.aws.dictfilter([]) == {} }}'
-      - '{{ {} | mattclay.aws.dictfilter(["a"]) == {} }}'
-      - '{{ {"a": 1} | mattclay.aws.dictfilter(["a"]) == {"a": 1} }}'
-      - '{{ {"a": 1, "b": 2} | mattclay.aws.dictfilter(["a"]) == {"a": 1} }}'
-      - '{{ {"a": 1, "b": 2} | mattclay.aws.dictfilter(["a", "b"]) == {"a": 1, "b": 2} }}'
-      - '{{ {"a": 1, "b": 2} | mattclay.aws.dictfilter(["c"]) == {} }}'
+      - '{} | mattclay.aws.dictfilter([]) == {}'
+      - '{} | mattclay.aws.dictfilter(["a"]) == {}'
+      - '{"a": 1} | mattclay.aws.dictfilter(["a"]) == {"a": 1}'
+      - '{"a": 1, "b": 2} | mattclay.aws.dictfilter(["a"]) == {"a": 1}'
+      - '{"a": 1, "b": 2} | mattclay.aws.dictfilter(["a", "b"]) == {"a": 1, "b": 2}'
+      - '{"a": 1, "b": 2} | mattclay.aws.dictfilter(["c"]) == {}'

tests/integration/targets/filter_ec2_az_vpc_route_tables_subnets/tasks/main.yml

@@ -1,7 +1,7 @@
 - name: Test ec2_az_vpc_route_tables_subnets filter
   assert:
     that:
-      - '{{ {"us-east-1a": {}, "us-east-1b": {}} | mattclay.aws.ec2_az_vpc_route_tables_subnets("192.168.%s.0/24") ==
-            ["192.168.0.0/24", "192.168.1.0/24"] }}'
-      - '{{ {"us-east-1f": {}} | mattclay.aws.ec2_az_vpc_route_tables_subnets("192.168.%s.0/24") ==
-            ["192.168.5.0/24"] }}'
+      - '{"us-east-1a": {}, "us-east-1b": {}} | mattclay.aws.ec2_az_vpc_route_tables_subnets("192.168.%s.0/24") ==
+            ["192.168.0.0/24", "192.168.1.0/24"]'
+      - '{"us-east-1f": {}} | mattclay.aws.ec2_az_vpc_route_tables_subnets("192.168.%s.0/24") ==
+            ["192.168.5.0/24"]'

tests/integration/targets/filter_ec2_az_vpc_subnets/tasks/main.yml

@@ -1,7 +1,7 @@
 - name: Test ec2_az_vpc_subnets filter
   assert:
     that:
-      - '{{ {"us-east-1a": {}} | mattclay.aws.ec2_az_vpc_subnets("192.168.%s.0/24", "Bob") ==
-            [{ "az": "us-east-1a", "cidr": "192.168.0.0/24", "resource_tags": {"Name": "Bob"}}] }}'
-      - '{{ {"us-east-1f": {}} | mattclay.aws.ec2_az_vpc_subnets("192.168.%s.0/24", "Bob") ==
-            [{ "az": "us-east-1f", "cidr": "192.168.5.0/24", "resource_tags": {"Name": "Bob"}}] }}'
+      - '{"us-east-1a": {}} | mattclay.aws.ec2_az_vpc_subnets("192.168.%s.0/24", "Bob") ==
+            [{ "az": "us-east-1a", "cidr": "192.168.0.0/24", "resource_tags": {"Name": "Bob"}}]'
+      - '{"us-east-1f": {}} | mattclay.aws.ec2_az_vpc_subnets("192.168.%s.0/24", "Bob") ==
+            [{ "az": "us-east-1f", "cidr": "192.168.5.0/24", "resource_tags": {"Name": "Bob"}}]'

tests/integration/targets/filter_map_format/tasks/main.yml

@@ -1,8 +1,8 @@
 - name: Test map_format filter
   assert:
     that:
-      - '{{ {} | mattclay.aws.map_format("Hello") == "Hello" }}'
-      - '{{ {"age": 21} | mattclay.aws.map_format("Hello {name} {age}", name="Bob") == "Hello Bob 21" }}'
-      - '{{ {"name": "World"} | mattclay.aws.map_format("Hello {name}") == "Hello World" }}'
-      - '{{ {"name": "World"} | mattclay.aws.map_format("Hello {name}", name="Bob") == "Hello Bob" }}'
-      - '{{ {"name": "World"} | mattclay.aws.map_format("Hello {name} {0}", 3) == "Hello World 3" }}'
+      - '{} | mattclay.aws.map_format("Hello") == "Hello"'
+      - '{"age": 21} | mattclay.aws.map_format("Hello {name} {age}", name="Bob") == "Hello Bob 21"'
+      - '{"name": "World"} | mattclay.aws.map_format("Hello {name}") == "Hello World"'
+      - '{"name": "World"} | mattclay.aws.map_format("Hello {name}", name="Bob") == "Hello Bob"'
+      - '{"name": "World"} | mattclay.aws.map_format("Hello {name} {0}", 3) == "Hello World 3"'

tests/integration/targets/lambda/tasks/setup.yml

@@ -1,5 +1,5 @@
 - name: Create a role
-  community.aws.iam_role:
+  amazon.aws.iam_role:
     name: "{{ iam_role_name }}"
     assume_role_policy_document:
       Version: '2012-10-17'

tests/integration/targets/lambda_alias/tasks/setup.yml

@@ -1,5 +1,5 @@
 - name: Create a role
-  community.aws.iam_role:
+  amazon.aws.iam_role:
     name: "{{ iam_role_name }}"
     assume_role_policy_document:
       Version: '2012-10-17'

tests/integration/targets/sqs_event/tasks/setup.yml

@@ -1,5 +1,5 @@
 - name: Create a role
-  community.aws.iam_role:
+  amazon.aws.iam_role:
     name: "{{ iam_role_name }}"
     assume_role_policy_document:
       Version: '2012-10-17'

tests/requirements.txt

@@ -1,2 +1,2 @@
-ansible-core==2.14.2
-distlib==0.3.6
+ansible-core==2.16.5
+distlib==0.3.8

tests/requirements.yml

@@ -1,5 +1,3 @@
 collections:
-  - name: community.aws
-    version: '>=5.0.0,<6.0.0'
   - name: amazon.aws
-    version: '>=5.0.0,<6.0.0'
+    version: '>=7.0.0,<8.0.0'