mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-03-21 20:59:10 +00:00
[PR #11254/cc24e573 backport][stable-12] monit: deprecate support for monit <= 5.18 (#11609)
monit: deprecate support for monit <= 5.18 (#11254)
* monit: deprecate support for monit <= 5.18
* add additional runs for checking version
* add changelog frag
* bump deprecation for 14.0.0
(cherry picked from commit cc24e57307)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
7784fbdf17
commit
000b92a425
4 changed files with 16 additions and 2 deletions
2
changelogs/fragments/11254-monit-deprecate-old.yml
Normal file
2
changelogs/fragments/11254-monit-deprecate-old.yml
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
deprecated_features:
|
||||
- monit - support for Monit version 5.18 or older is deprecated and will be removed in community.general 14.0.0 (https://github.com/ansible-collections/community.general/pull/11254).
|
||||
|
|
@ -39,6 +39,8 @@ options:
|
|||
author:
|
||||
- Darryl Stoflet (@dstoflet)
|
||||
- Simon Kelly (@snopoke)
|
||||
requirements:
|
||||
- Monit. Support for versions 5.18 and older is deprecated and will be removed in community.general 14.0.0.
|
||||
"""
|
||||
|
||||
EXAMPLES = r"""
|
||||
|
|
@ -125,6 +127,13 @@ class Monit:
|
|||
self._raw_version = None
|
||||
self._status_change_retry_count = 6
|
||||
|
||||
if self.monit_version() <= (5, 18):
|
||||
module.deprecate(
|
||||
"Support for monit 5.18 and older is deprecated and will be removed in community.general 14.0.0.",
|
||||
version="14.0.0",
|
||||
collection_name="community.general",
|
||||
)
|
||||
|
||||
def monit_version(self):
|
||||
if self._monit_version is None:
|
||||
self._raw_version, version = self._get_monit_version()
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ class MonitTest(unittest.TestCase):
|
|||
self.module = mock.MagicMock()
|
||||
self.module.exit_json.side_effect = AnsibleExitJson
|
||||
self.module.fail_json.side_effect = AnsibleFailJson
|
||||
self.module.run_command.return_value = (0, "This is monit version 5.26.0", "")
|
||||
self.monit = monit.Monit(self.module, "monit", "processX", 1)
|
||||
self.monit._status_change_retry_count = 1
|
||||
mock_sleep = mock.patch("time.sleep")
|
||||
|
|
|
|||
|
|
@ -357,7 +357,7 @@ test_cases:
|
|||
|
||||
# ------------------------------------------------------------------ reload
|
||||
- id: state_reloaded
|
||||
# reload exits before any presence/status checks; no version check either
|
||||
# reload exits before any presence/status checks; version check happens in __init__
|
||||
input:
|
||||
name: processX
|
||||
state: reloaded
|
||||
|
|
@ -366,6 +366,7 @@ test_cases:
|
|||
state: reloaded
|
||||
mocks:
|
||||
run_command:
|
||||
- *version_526
|
||||
- command: [/testbin/monit, reload]
|
||||
environ: {}
|
||||
rc: 0
|
||||
|
|
@ -396,7 +397,7 @@ test_cases:
|
|||
|
||||
# ------------------------------------------------------------------ failure cases
|
||||
- id: state_reloaded_fail
|
||||
# reload returns rc=1 → fail_json("monit reload failed")
|
||||
# reload returns rc=1 → fail_json("monit reload failed"); version check happens in __init__
|
||||
input:
|
||||
name: processX
|
||||
state: reloaded
|
||||
|
|
@ -404,6 +405,7 @@ test_cases:
|
|||
failed: true
|
||||
mocks:
|
||||
run_command:
|
||||
- *version_526
|
||||
- command: [/testbin/monit, reload]
|
||||
environ: {}
|
||||
rc: 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue