From 626c0e104975f2bfe1c85e8816f4b64594e06bed Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Sat, 16 Nov 2024 18:34:47 +0100
Subject: [PATCH] Remove redundant `HomebrewValidate.valid_package` calls in
 homebrew module. (#9076)

* Remove redundant `HomebrewValidate.valid_package` calls

* Add changelog fragment
---
 ...cated-homebrew-package-name-validation.yml |  2 +
 plugins/modules/homebrew.py                   | 37 +------------------
 2 files changed, 3 insertions(+), 36 deletions(-)
 create mode 100644 changelogs/fragments/9076-remove-duplicated-homebrew-package-name-validation.yml

diff --git a/changelogs/fragments/9076-remove-duplicated-homebrew-package-name-validation.yml b/changelogs/fragments/9076-remove-duplicated-homebrew-package-name-validation.yml
new file mode 100644
index 0000000000..b067625c0c
--- /dev/null
+++ b/changelogs/fragments/9076-remove-duplicated-homebrew-package-name-validation.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - homebrew - remove duplicated package name validation (https://github.com/ansible-collections/community.general/pull/9076).
diff --git a/plugins/modules/homebrew.py b/plugins/modules/homebrew.py
index 58b13f83d4..bc5d8649e7 100644
--- a/plugins/modules/homebrew.py
+++ b/plugins/modules/homebrew.py
@@ -401,11 +401,6 @@ class Homebrew(object):
 
     # checks ------------------------------------------------------- {{{
     def _current_package_is_installed(self):
-        if not HomebrewValidate.valid_package(self.current_package):
-            self.failed = True
-            self.message = 'Invalid package: {0}.'.format(self.current_package)
-            raise HomebrewException(self.message)
-
         cmd = [
             "{brew_path}".format(brew_path=self.brew_path),
             "info",
@@ -424,9 +419,6 @@ class Homebrew(object):
         return _check_package_in_json(data, "formulae") or _check_package_in_json(data, "casks")
 
     def _current_package_is_outdated(self):
-        if not HomebrewValidate.valid_package(self.current_package):
-            return False
-
         rc, out, err = self.module.run_command([
             self.brew_path,
             'outdated',
@@ -436,9 +428,7 @@ class Homebrew(object):
         return rc != 0
 
     def _current_package_is_installed_from_head(self):
-        if not HomebrewValidate.valid_package(self.current_package):
-            return False
-        elif not self._current_package_is_installed():
+        if not self._current_package_is_installed():
             return False
 
         rc, out, err = self.module.run_command([
@@ -534,11 +524,6 @@ class Homebrew(object):
 
     # installed ------------------------------ {{{
     def _install_current_package(self):
-        if not HomebrewValidate.valid_package(self.current_package):
-            self.failed = True
-            self.message = 'Invalid package: {0}.'.format(self.current_package)
-            raise HomebrewException(self.message)
-
         if self._current_package_is_installed():
             self.unchanged_count += 1
             self.unchanged_pkgs.append(self.current_package)
@@ -595,11 +580,6 @@ class Homebrew(object):
     def _upgrade_current_package(self):
         command = 'upgrade'
 
-        if not HomebrewValidate.valid_package(self.current_package):
-            self.failed = True
-            self.message = 'Invalid package: {0}.'.format(self.current_package)
-            raise HomebrewException(self.message)
-
         current_package_is_installed = self._current_package_is_installed()
         if not current_package_is_installed:
             command = 'install'
@@ -667,11 +647,6 @@ class Homebrew(object):
 
     # uninstalled ---------------------------- {{{
     def _uninstall_current_package(self):
-        if not HomebrewValidate.valid_package(self.current_package):
-            self.failed = True
-            self.message = 'Invalid package: {0}.'.format(self.current_package)
-            raise HomebrewException(self.message)
-
         if not self._current_package_is_installed():
             self.unchanged_count += 1
             self.unchanged_pkgs.append(self.current_package)
@@ -716,11 +691,6 @@ class Homebrew(object):
 
     # linked --------------------------------- {{{
     def _link_current_package(self):
-        if not HomebrewValidate.valid_package(self.current_package):
-            self.failed = True
-            self.message = 'Invalid package: {0}.'.format(self.current_package)
-            raise HomebrewException(self.message)
-
         if not self._current_package_is_installed():
             self.failed = True
             self.message = 'Package not installed: {0}.'.format(self.current_package)
@@ -763,11 +733,6 @@ class Homebrew(object):
 
     # unlinked ------------------------------- {{{
     def _unlink_current_package(self):
-        if not HomebrewValidate.valid_package(self.current_package):
-            self.failed = True
-            self.message = 'Invalid package: {0}.'.format(self.current_package)
-            raise HomebrewException(self.message)
-
         if not self._current_package_is_installed():
             self.failed = True
             self.message = 'Package not installed: {0}.'.format(self.current_package)