Cleanup and move tasks (vs playbooks) in inventory tests (#1394)

Cleanup and move tasks (vs playbooks) in inventory tests SUMMARY Inventory plugin tests currently mix "tasks" content in with playbooks, this triggers ansible-lint warnings. ISSUE TYPE Tests Pull Request COMPONENT NAME ec2_vpc_net plugins/inventory/aws_ec2.py plugins/inventory/aws_rds.py ADDITIONAL INFORMATION Spotted by work on #1393 Reviewed-by: Alina Buzachis
ansible-collections · Mar 1, 2023 · bd8dd88 · bd8dd88
1 parent 5bdc8f5
commit bd8dd88
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 78 deletions.
diff --git a/changelogs/fragments/1394-lint.yml b/changelogs/fragments/1394-lint.yml
@@ -0,0 +1,3 @@
+trivial:
+- inventory tests - move tasks out of playbook director (https://github.com/ansible-collections/amazon.aws/pull/1394).
+- ec2_vpc_net - remove unused import (https://github.com/ansible-collections/amazon.aws/pull/1394).
diff --git a/plugins/modules/ec2_vpc_net.py b/plugins/modules/ec2_vpc_net.py
@@ -209,7 +209,6 @@
 from ansible.module_utils.common.dict_transformations import camel_dict_to_snake_dict
 
 from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule
-from ansible_collections.amazon.aws.plugins.module_utils.botocore import is_boto3_error_message
 from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry
 from ansible_collections.amazon.aws.plugins.module_utils.transformation import ansible_dict_to_boto3_filter_list
 from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list

diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/manage_ec2_instances.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/manage_ec2_instances.yml
@@ -18,4 +18,4 @@
       region: '{{ aws_region }}'
 
   tasks:
-    - include_tasks: "{{ task }}.yml"
+    - include_tasks: "tasks/{{ task }}.yml"
diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml
@@ -16,4 +16,4 @@
         - debug:
             var: groups
 
-        - include_tasks: tear_down.yml
+        - include_tasks: tasks/tear_down.yml
diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/tasks b/tests/integration/targets/inventory_aws_ec2/playbooks/tasks
@@ -0,0 +1 @@
+../tasks/
diff --git a/...tion/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_concatenation.yml b/...tion/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_concatenation.yml
@@ -14,7 +14,7 @@
       block:
 
         # Create VPC, subnet, security group, and find image_id to create instance
-        - include_tasks: setup.yml
+        - include_tasks: tasks/setup.yml
 
         # Create new host, refresh inventory
         - name: create a new host

diff --git a/...ration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_constructed.yml b/...ration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_constructed.yml
@@ -15,7 +15,7 @@
 
         # Create VPC, subnet, security group, and find image_id to create instance
 
-        - include_tasks: setup.yml
+        - include_tasks: tasks/setup.yml
 
         # Create new host, refresh inventory
 

diff --git a/...rgets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags.yml b/...rgets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags.yml
@@ -14,7 +14,7 @@
       block:
 
         # Create VPC, subnet, security group, and find image_id to create instance
-        - include_tasks: setup.yml
+        - include_tasks: tasks/setup.yml
 
         # Create new host
         - name: create a new host

diff --git a/...ventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags_classic.yml b/...ventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags_classic.yml
@@ -14,7 +14,7 @@
       block:
 
         # Create VPC, subnet, security group, and find image_id to create instance
-        - include_tasks: setup.yml
+        - include_tasks: tasks/setup.yml
 
         # Create new host
         - name: create a new host

diff --git a/...ets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostvars_prefix_suffix.yml b/...ets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostvars_prefix_suffix.yml
@@ -15,7 +15,7 @@
 
         # Create VPC, subnet, security group, and find image_id to create instance
 
-        - include_tasks: setup.yml
+        - include_tasks: tasks/setup.yml
 
         # Create new host, refresh inventory
         - name: create a new host

diff --git a/...inventory_aws_ec2/playbooks/test_populating_inventory_with_include_or_exclude_filters.yml b/...inventory_aws_ec2/playbooks/test_populating_inventory_with_include_or_exclude_filters.yml
@@ -15,7 +15,7 @@
 
         # Create VPC, subnet, security group, and find image_id to create instance
 
-        - include_tasks: setup.yml
+        - include_tasks: tasks/setup.yml
 
         # Create new host, refresh inventory
         - name: create a new host (1/3)

diff --git a/...ion/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_literal_string.yml b/...ion/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_literal_string.yml
@@ -14,7 +14,7 @@
       block:
 
         # Create VPC, subnet, security group, and find image_id to create instance
-        - include_tasks: setup.yml
+        - include_tasks: tasks/setup.yml
 
         # Create new host, refresh inventory
         - name: create a new host

diff --git a/...ts/inventory_aws_ec2/playbooks/test_populating_inventory_with_use_contrib_script_keys.yml b/...ts/inventory_aws_ec2/playbooks/test_populating_inventory_with_use_contrib_script_keys.yml
@@ -14,7 +14,7 @@
       block:
 
         # Create VPC, subnet, security group, and find image_id to create instance
-        - include_tasks: setup.yml
+        - include_tasks: tasks/setup.yml
 
         # Create new host, refresh inventory
         - name: create a new host

diff --git a/...ets/inventory_aws_ec2/playbooks/setup.yml → ...targets/inventory_aws_ec2/tasks/setup.yml b/...ets/inventory_aws_ec2/playbooks/setup.yml → ...targets/inventory_aws_ec2/tasks/setup.yml
diff --git a/...inventory_aws_ec2/playbooks/tear_down.yml → ...ets/inventory_aws_ec2/tasks/tear_down.yml b/...inventory_aws_ec2/playbooks/tear_down.yml → ...ets/inventory_aws_ec2/tasks/tear_down.yml
diff --git a/..._ec2/playbooks/test_refresh_inventory.yml → ..._aws_ec2/tasks/test_refresh_inventory.yml b/..._ec2/playbooks/test_refresh_inventory.yml → ..._aws_ec2/tasks/test_refresh_inventory.yml
diff --git a/tests/integration/targets/inventory_aws_rds/playbooks/test_refresh_inventory.yml b/tests/integration/targets/inventory_aws_rds/playbooks/test_refresh_inventory.yml