Revert "WIP: aws_ec2 inventory add includes_entries_matching options (a…

…nsible-collections#323)" (ansible-collections#324)

Revert "WIP: aws_ec2 inventory add includes_entries_matching options (ansible-collections#323)"

Reviewed-by: https://github.com/apps/ansible-zuul

plugins/inventory/aws_ec2.py

@@ -51,12 +51,6 @@
               - Available filters are listed here U(http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html#options).
           type: dict
           default: {}
-        includes_entries_matching:
-          description:
-              - A list of filters. The instances matching the filters will be included in the result.
-              - Available filters are listed here U(http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html#options).
-          type: list
-          default: []
         include_extra_api_calls:
           description:
               - Add two additional API calls for every instance to include 'persistent' and 'events' host variables.
@@ -462,7 +456,7 @@ def _get_instances_by_region(self, regions, filters, strict_permissions):
 
             all_instances.extend(instances)
 
-        return all_instances
+        return sorted(all_instances, key=lambda x: x['InstanceId'])
 
     def _get_reservation_details(self, reservation):
         return {
@@ -543,23 +537,14 @@ def _get_hostname(self, instance, hostnames):
             else:
                 return to_text(hostname)
 
-    def _query(self, regions, filters, includes_entries_matching, strict_permissions):
+    def _query(self, regions, filters, strict_permissions):
         '''
             :param regions: a list of regions to query
             :param filters: a list of boto3 filter dictionaries
             :param hostnames: a list of hostname destination variables in order of preference
-            :param includes_entries_matching: a list of filters, instances matching these filters are included in the result
             :param strict_permissions: a boolean determining whether to fail or ignore 403 error codes
-
         '''
-        instances = self._get_instances_by_region(regions, filters, strict_permissions)
-        for includes in includes_entries_matching:
-            filter = ansible_dict_to_boto3_filter_list(includes)
-            instances += self._get_instances_by_region(regions, filter, strict_permissions)
-
-        instances = sorted(instances, key=lambda x: x['InstanceId'])
-
-        return {'aws_ec2': instances}
+        return {'aws_ec2': self._get_instances_by_region(regions, filters, strict_permissions)}
 
     def _populate(self, groups, hostnames):
         for group in groups:
@@ -665,7 +650,6 @@ def parse(self, inventory, loader, path, cache=True):
         # get user specifications
         regions = self.get_option('regions')
         filters = ansible_dict_to_boto3_filter_list(self.get_option('filters'))
-        includes_entries_matching = self.get_option('includes_entries_matching')
         hostnames = self.get_option('hostnames')
         strict_permissions = self.get_option('strict_permissions')
 
@@ -685,7 +669,7 @@ def parse(self, inventory, loader, path, cache=True):
                 cache_needs_update = True
 
         if not cache or cache_needs_update:
-            results = self._query(regions, filters, includes_entries_matching, strict_permissions)
+            results = self._query(regions, filters, strict_permissions)
 
         self._populate(results, hostnames)
 

tests/integration/targets/inventory_aws_ec2/runme.sh

@@ -12,10 +12,6 @@ ansible-playbook playbooks/test_invalid_aws_ec2_inventory_config.yml "$@"
 
 export ANSIBLE_INVENTORY=test.aws_ec2.yml
 
-# generate inventory config with includes_entries_matching and prepare the tests
-ansible-playbook playbooks/create_inventory_config.yml -e "template='inventory_with_includes_entries_matching.yml.j2'" "$@"
-ansible-playbook playbooks/test_populating_inventory_with_includes_entries_matching.yml "$@"
-
 # test empty inventory config
 ansible-playbook playbooks/test_invalid_aws_ec2_inventory_config.yml "$@"