refactor: handle INJECT_FACTS_AS_VARS=false by using ansible_facts instead

[richm]

Ansible 2.20 has deprecated the use of Ansible facts as variables. For
example, ansible_distribution is now deprecated in favor of
ansible_facts["distribution"]. This is due to making the default
setting INJECT_FACTS_AS_VARS=false. For now, this will create WARNING
messages, but in Ansible 2.24 it will be an error.

See https://docs.ansible.com/projects/ansible/latest/porting_guides/porting_guide_core_2.20.html#inject-facts-as-vars

Signed-off-by: Rich Megginson [email protected]

Summary by Sourcery

Refactor Ansible variables to use the ansible_facts mapping for distribution-related data to align with Ansible 2.20+ behavior and avoid deprecated fact-as-var usage.

Enhancements:

• Replace direct usage of distribution facts (e.g., ansible_distribution, ansible_distribution_version) with ansible_facts lookups in role variables to support INJECT_FACTS_AS_VARS=false.

Documentation:

• Update README-ostree documentation to describe DISTRO-VERSION in terms of ansible_facts keys instead of deprecated fact variables.

Tests:

• Adjust test variable files and inline test comments to reference ansible_facts-based distribution fields, keeping tests consistent with the new fact usage model.

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Refactors all uses of deprecated top-level Ansible fact variables in this role/tests/docs to use the supported ansible_facts[...] access pattern, aligning with INJECT_FACTS_AS_VARS=false behavior in Ansible 2.20+.

File-Level Changes

Change	Details	Files
Update role vars logic to use ansible_facts-based distro metadata in package and distro helper variables.	Replace ansible_distribution_version with ansible_facts['distribution_version'] in snapshot base and extra package selection expressions. Replace ansible_distribution with ansible_facts['distribution'] in Fedora and RHEL distro conditionals. Update __snapshot_is_rh_distro and __snapshot_is_rh_distro_fedora helpers to check ansible_facts['distribution'] membership instead of ansible_distribution.	vars/main.yml
Align tests and test vars with new ansible_facts-based distro access.	Update test comments describing generated varfile names to reference ansible_facts[...] keys instead of deprecated top-level fact vars. Mirror the __snapshot_is_rh_distro and __snapshot_is_rh_distro_fedora helper updates in test vars to use ansible_facts['distribution'].	tests/tests_include_vars_from_parent.yml tests/vars/rh_distros_vars.yml
Update documentation to describe DISTRO-VERSION in terms of ansible_facts accessors.	Change README-ostree description of DISTRO-VERSION to reference ansible_facts['distribution'] and ansible_facts['distribution_version'] instead of the deprecated ansible_distribution* variables.	README-ostree.md

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey - I've left some high level feedback:

• Several expressions now directly index ansible_facts[...] (e.g. distribution_version); if these facts can ever be absent on certain hosts, consider using a safer access pattern like ansible_facts.get('distribution_version', '') or ansible_facts['distribution_version'] | default('') to avoid runtime errors.
• The expressions in vars/main.yml and tests/vars/rh_distros_vars.yml repeat ansible_facts['distribution'] and ansible_facts['distribution_version'] several times; consider introducing intermediate variables (e.g. snapshot_distribution, snapshot_distribution_version) to make the logic shorter and easier to maintain.
• In tests/tests_include_vars_from_parent.yml, the updated comments reference ansible_facts[...] while the actual logic uses facts[...]; consider aligning the terminology in the comments to the variable name used in the play for clarity.

Prompt for AI Agents

Please address the comments from this code review:

## Overall Comments
- Several expressions now directly index `ansible_facts[...]` (e.g. `distribution_version`); if these facts can ever be absent on certain hosts, consider using a safer access pattern like `ansible_facts.get('distribution_version', '')` or `ansible_facts['distribution_version'] | default('')` to avoid runtime errors.
- The expressions in `vars/main.yml` and `tests/vars/rh_distros_vars.yml` repeat `ansible_facts['distribution']` and `ansible_facts['distribution_version']` several times; consider introducing intermediate variables (e.g. `snapshot_distribution`, `snapshot_distribution_version`) to make the logic shorter and easier to maintain.
- In `tests/tests_include_vars_from_parent.yml`, the updated comments reference `ansible_facts[...]` while the actual logic uses `facts[...]`; consider aligning the terminology in the comments to the variable name used in the play for clarity.

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[richm]

[citest]