mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 06:12:51 +00:00
homebrew_service: remove redundant code (#11839)
* homebrew_service: remove redundant code * homebrew_services: add changelog fragment for #11839 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
4
changelogs/fragments/11839-homebrew-services-cleanup.yml
Normal file
4
changelogs/fragments/11839-homebrew-services-cleanup.yml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
minor_changes:
|
||||||
|
- homebrew_services - remove various redundancies including dead state validation, unused return
|
||||||
|
values, and unnecessary locale environment variables
|
||||||
|
(https://github.com/ansible-collections/community.general/pull/11839).
|
||||||
@@ -139,9 +139,6 @@ def validate_and_load_arguments(module: AnsibleModule) -> HomebrewServiceArgs:
|
|||||||
module.fail_json(msg=f"Invalid package name: {package}")
|
module.fail_json(msg=f"Invalid package name: {package}")
|
||||||
|
|
||||||
state: t.Literal["present", "absent", "restarted"] = module.params["state"]
|
state: t.Literal["present", "absent", "restarted"] = module.params["state"]
|
||||||
if state not in ["present", "absent", "restarted"]:
|
|
||||||
module.fail_json(msg=f"Invalid state: {state}")
|
|
||||||
|
|
||||||
brew_path = parse_brew_path(module)
|
brew_path = parse_brew_path(module)
|
||||||
|
|
||||||
return HomebrewServiceArgs(name=package, state=state, brew_path=brew_path)
|
return HomebrewServiceArgs(name=package, state=state, brew_path=brew_path)
|
||||||
@@ -158,7 +155,7 @@ def start_service(args: HomebrewServiceArgs, module: AnsibleModule) -> None:
|
|||||||
_exit_with_state(args, module, changed=True, message="Service would be started")
|
_exit_with_state(args, module, changed=True, message="Service would be started")
|
||||||
|
|
||||||
start_cmd = [args.brew_path, "services", "start", args.name]
|
start_cmd = [args.brew_path, "services", "start", args.name]
|
||||||
rc, stdout, stderr = module.run_command(start_cmd, check_rc=True)
|
module.run_command(start_cmd, check_rc=True)
|
||||||
|
|
||||||
_exit_with_state(args, module, changed=True)
|
_exit_with_state(args, module, changed=True)
|
||||||
|
|
||||||
@@ -174,7 +171,7 @@ def stop_service(args: HomebrewServiceArgs, module: AnsibleModule) -> None:
|
|||||||
_exit_with_state(args, module, changed=True, message="Service would be stopped")
|
_exit_with_state(args, module, changed=True, message="Service would be stopped")
|
||||||
|
|
||||||
stop_cmd = [args.brew_path, "services", "stop", args.name]
|
stop_cmd = [args.brew_path, "services", "stop", args.name]
|
||||||
rc, stdout, stderr = module.run_command(stop_cmd, check_rc=True)
|
module.run_command(stop_cmd, check_rc=True)
|
||||||
|
|
||||||
_exit_with_state(args, module, changed=True)
|
_exit_with_state(args, module, changed=True)
|
||||||
|
|
||||||
@@ -185,7 +182,7 @@ def restart_service(args: HomebrewServiceArgs, module: AnsibleModule) -> None:
|
|||||||
_exit_with_state(args, module, changed=True, message="Service would be restarted")
|
_exit_with_state(args, module, changed=True, message="Service would be restarted")
|
||||||
|
|
||||||
restart_cmd = [args.brew_path, "services", "restart", args.name]
|
restart_cmd = [args.brew_path, "services", "restart", args.name]
|
||||||
rc, stdout, stderr = module.run_command(restart_cmd, check_rc=True)
|
module.run_command(restart_cmd, check_rc=True)
|
||||||
|
|
||||||
_exit_with_state(args, module, changed=True)
|
_exit_with_state(args, module, changed=True)
|
||||||
|
|
||||||
@@ -210,8 +207,6 @@ def main() -> None:
|
|||||||
supports_check_mode=True,
|
supports_check_mode=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
module.run_command_environ_update = dict(LANG="C", LC_ALL="C", LC_MESSAGES="C", LC_CTYPE="C")
|
|
||||||
|
|
||||||
# Pre-validate arguments.
|
# Pre-validate arguments.
|
||||||
service_args = validate_and_load_arguments(module)
|
service_args = validate_and_load_arguments(module)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user