mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-03 06:53:21 -07:00
[PR #10805/833e6e36 backport][stable-11] homebrew: Support old_tokens and oldnames in homebrew package data (#10831)
Some checks failed
EOL CI / EOL Sanity (Ⓐ2.16) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py2.7) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py3.11) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py3.6) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/3/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/3/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/3/) (push) Has been cancelled
nox / Run extra sanity tests (push) Has been cancelled
Some checks failed
EOL CI / EOL Sanity (Ⓐ2.16) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py2.7) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py3.11) (push) Has been cancelled
EOL CI / EOL Units (Ⓐ2.16+py3.6) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+alpine3+py:azp/posix/3/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+fedora38+py:azp/posix/3/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/1/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/2/) (push) Has been cancelled
EOL CI / EOL I (Ⓐ2.16+opensuse15+py:azp/posix/3/) (push) Has been cancelled
nox / Run extra sanity tests (push) Has been cancelled
homebrew: Support old_tokens and oldnames in homebrew package data (#10805)
* homebrew: Support old_tokens and oldnames in homebrew package data
Fixes #10804
Since brew info will accept old_tokens (for casks) and oldnames (for formulae) when provided by the homebrew module "name" argument, the module also needs to consider thes old names as valid for the given package. This commit updates _extract_package_name to do that.
All existing package name tests, including existing tests for name aliases and tap prefixing, have been consolidated with new name tests into package_names.yml.
* Added changelog fragment.
* homebrew: replace non-py2 compliant f-string usage
* code formatting lint, and py2 compatibility fixes
* homebrew: added licenses to new files, nox lint
* Update plugins/modules/homebrew.py
use str.format() instead of string addition
* Update tests/integration/targets/homebrew/tasks/casks.yml
* Update tests/integration/targets/homebrew/tasks/package_names_item.yml
* Update tests/integration/targets/homebrew/tasks/formulae.yml
* Fixes for performance concerns on new homebrew tests.
1) tests for alternate package names are commented out in main.yml.
2) the "install via alternate name, uninstall via base name" test
case was deemed duplicative, and has been deleted .
3) minor fixes to use jinja2 "~" for string concat instead of "+"
* Fix nox lint
---------
(cherry picked from commit 833e6e36de
)
Co-authored-by: brad2014 <brad2014@users.noreply.github.com>
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
712bd5194d
commit
baf124bc17
7 changed files with 146 additions and 58 deletions
|
@ -95,12 +95,3 @@
|
|||
- assert:
|
||||
that:
|
||||
- package_result is not changed
|
||||
|
||||
# This crashed on 4867eb4 - Ref: issue #9777
|
||||
- name: Install cask using homelab/cask syntax
|
||||
homebrew:
|
||||
package: "homebrew/cask/{{ package_name }}"
|
||||
state: present
|
||||
update_homebrew: false
|
||||
become: true
|
||||
become_user: "{{ brew_stat.stat.pw_name }}"
|
|
@ -303,45 +303,6 @@
|
|||
- "package_result.changed_pkgs == []"
|
||||
- "package_result.unchanged_pkgs | sort == ['gnu-tar', 'gnu-time']"
|
||||
|
||||
# Test alias handling with sqlite (that is aliased to sqlite3)
|
||||
- block:
|
||||
- name: Make sure sqlite package is not installed
|
||||
homebrew:
|
||||
name: "sqlite"
|
||||
state: absent
|
||||
become: true
|
||||
become_user: "{{ brew_stat.stat.pw_name }}"
|
||||
|
||||
- name: Install sqlite package using alias (sqlite3)
|
||||
homebrew:
|
||||
name: "sqlite3"
|
||||
state: present
|
||||
become: true
|
||||
become_user: "{{ brew_stat.stat.pw_name }}"
|
||||
register: install_result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- install_result is changed
|
||||
- "install_result.msg == 'Package installed: sqlite3'"
|
||||
- "install_result.changed_pkgs == ['sqlite3']"
|
||||
- "install_result.unchanged_pkgs == []"
|
||||
|
||||
- name: Again install sqlite package using alias (sqlite3)
|
||||
homebrew:
|
||||
name: "sqlite3"
|
||||
state: present
|
||||
become: true
|
||||
become_user: "{{ brew_stat.stat.pw_name }}"
|
||||
register: reinstall_result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- reinstall_result is not changed
|
||||
- "reinstall_result.msg == 'Package already installed: sqlite3'"
|
||||
- "reinstall_result.changed_pkgs == []"
|
||||
- "reinstall_result.unchanged_pkgs == ['sqlite3']"
|
||||
|
||||
# Test install from homebrew tap
|
||||
- block:
|
||||
- name: Tap hashicorp repository
|
||||
|
|
|
@ -14,3 +14,8 @@
|
|||
- include_tasks: 'formulae.yml'
|
||||
- include_tasks: 'casks.yml'
|
||||
- include_tasks: 'docker.yml'
|
||||
|
||||
# Slow tests to exhaustively test install/uninstall on alternate package names,
|
||||
# Commented out for normal use:
|
||||
|
||||
# - include_tasks: 'package_names.yml'
|
55
tests/integration/targets/homebrew/tasks/package_names.yml
Normal file
55
tests/integration/targets/homebrew/tasks/package_names.yml
Normal file
|
@ -0,0 +1,55 @@
|
|||
# Copyright (c) Ansible Project
|
||||
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# A series of package tests that check all the
|
||||
# different ways that "brew info" can refer to a package.
|
||||
#
|
||||
# The homebrew module must mimic what brew info supports,
|
||||
# or else errors will occur.
|
||||
|
||||
- name: Find brew binary
|
||||
command: which brew
|
||||
register: brew_which
|
||||
|
||||
- name: Get owner of brew binary
|
||||
stat:
|
||||
path: "{{ brew_which.stdout }}"
|
||||
register: brew_stat
|
||||
|
||||
# Note: We no longer use sqlite3 for "formula alias" tests, because mac
|
||||
# ships with old python3 and if we use python3 from homebrew, sqlite3
|
||||
# cannot be uninstalled, which is part of the alias test. We use mandoc
|
||||
# instead.
|
||||
|
||||
# An example of a case were old_tokens support is important: User has an
|
||||
# ansible task that installs homebrew/cask/docker (the tap prefix is
|
||||
# required, or else one gets the formula ansible/core/docker). Homebrew
|
||||
# recently changed the name of the cask to docker-desktop, moving
|
||||
# "docker" into its old_tokens array. At that point
|
||||
# community.general.homebrew stopped working, because it succeeds in
|
||||
# running "brew info" on the name "homebrew/cask/docker", which adds
|
||||
# docker-desktop to the list of affected packages. But, later, when it
|
||||
# asks which user name entry corresponds to the affected cask, it
|
||||
# failed, because the code didn't think to consider old_tokens as one of
|
||||
# the valid ways of referring to a cask. That is issue #10804, herein
|
||||
# fixed.
|
||||
|
||||
- name: Test brew uninstall/install using various names accepted by "brew info"
|
||||
vars:
|
||||
packages:
|
||||
# All packages are carefully selected to have no dependencies, to reduce install time
|
||||
# homebrew/cask/kitty crashed on 4867eb4 - Ref: issue #9777
|
||||
- [kitty, homebrew/cask/kitty, "cask by name with tap prefix"]
|
||||
# mdocml test replaces old sqlite3 test, see above.
|
||||
- [mandoc, mdocml, "formula alias"]
|
||||
- [mandoc, homebrew/core/mdocml, "formula alias with tap prefix"]
|
||||
# These all crash on f772bcd - Ref: issue #10804
|
||||
- [cmark, commonmark, "formula with oldnames"]
|
||||
- [cmark, homebrew/core/commonmark, "formula with oldnames and tap prefix"]
|
||||
- [sipgate, clinq, "cask with old_tokens"]
|
||||
- [sipgate, homebrew/cask/clinq, "cask with old_tokens and tap prefix"]
|
||||
include_tasks: package_names_item.yml
|
||||
loop: "{{ packages }}"
|
||||
loop_control:
|
||||
loop_var: package
|
|
@ -0,0 +1,62 @@
|
|||
# Copyright (c) Ansible Project
|
||||
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# This task block is included by package_names.yml once for each test package,
|
||||
# having set package variable to the name to test
|
||||
- name: Test one package
|
||||
block:
|
||||
- debug:
|
||||
var: package
|
||||
|
||||
- name: Assure package is absent
|
||||
homebrew:
|
||||
package: "{{ package[0] }}"
|
||||
state: absent
|
||||
update_homebrew: false
|
||||
become: true
|
||||
become_user: "{{ brew_stat.stat.pw_name }}"
|
||||
|
||||
- name: Install package by an alternative name
|
||||
homebrew:
|
||||
package: "{{ package[1] }}"
|
||||
state: present
|
||||
update_homebrew: false
|
||||
become: true
|
||||
become_user: "{{ brew_stat.stat.pw_name }}"
|
||||
register: package_result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- package_result is changed
|
||||
- package_result.changed_pkgs[0] == package[1]
|
||||
- package_result.unchanged_pkgs | length == 0
|
||||
- 'package_result.msg == "Package installed: " ~ package[1]'
|
||||
|
||||
- name: Reinstall should do nothing
|
||||
homebrew:
|
||||
package: "{{ package[1] }}"
|
||||
state: present
|
||||
update_homebrew: false
|
||||
become: true
|
||||
become_user: "{{ brew_stat.stat.pw_name }}"
|
||||
register: package_result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- package_result is not changed
|
||||
- 'package_result.msg == "Package already installed: " ~ package[1]'
|
||||
|
||||
- name: Uninstall should work on alternate name
|
||||
homebrew:
|
||||
package: "{{ package[1] }}"
|
||||
state: absent
|
||||
update_homebrew: false
|
||||
become: true
|
||||
become_user: "{{ brew_stat.stat.pw_name }}"
|
||||
register: package_result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- package_result is changed
|
||||
- 'package_result.msg == "Package uninstalled: " ~ package[1]'
|
Loading…
Add table
Add a link
Reference in a new issue