From 01726b2b42c816b2326e4e9e9d48dcd461834b51 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 13 Jul 2023 15:48:03 -0600 Subject: [PATCH] fix: facts being gathered unnecessarily Cause: The comparison of the present facts with the required facts is being done on unsorted lists. Consequence: The comparison may fail if the only difference is the order. Facts are gathered unnecessarily. Fix: Use `difference` which works no matter what the order is. Ensure that the fact gathering subsets used are the absolute minimum required. Result: The role gathers only the facts it requires, and does not unnecessarily gather facts. Signed-off-by: Rich Megginson --- tasks/set_vars.yml | 6 +++--- vars/main.yml | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tasks/set_vars.yml b/tasks/set_vars.yml index 24dcaa3..60b6356 100644 --- a/tasks/set_vars.yml +++ b/tasks/set_vars.yml @@ -1,9 +1,9 @@ --- - name: Ensure ansible_facts used by role setup: - gather_subset: min - when: not ansible_facts.keys() | list | - intersect(__tlog_required_facts) == __tlog_required_facts + gather_subset: "{{ __tlog_required_facts_subsets }}" + when: __tlog_required_facts | + difference(ansible_facts.keys() | list) | length > 0 - name: Set platform/version specific variables include_vars: "{{ __vars_file }}" diff --git a/vars/main.yml b/vars/main.yml index a1e887d..b137790 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -18,3 +18,9 @@ __tlog_required_facts: - distribution_major_version - distribution_version - os_family + +# the subsets of ansible_facts that need to be gathered in case any of the +# facts in required_facts is missing; see the documentation of +# the 'gather_subset' parameter of the 'setup' module +__tlog_required_facts_subsets: "{{ ['!all', '!min'] + + __tlog_required_facts }}"