External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-18 01:17:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

[2.5][Backport] AAP 30045 incorrect deprecation warning for awx.awx.schedule rrule (#6903)

Browse Source 
* Make lookup plugins return lists to fix failures (#15625)

* Make lookup plugins return lists to fix failures

* Update unit tests

* Use lookup for test failures, update docs

* Grammar fix from review

Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>

---------

Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>

* Fix cherry-pick merge issue, should resolve failing linter

---------

Co-authored-by: Alan Rominger <arominge@redhat.com>
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
This commit is contained in:
Lila Yasin
2025-04-11 11:02:45 -04:00
committed by GitHub
parent d35d7f62ec
commit bbcdef18a7
7 changed files with 45 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx_collection/plugins/lookup/schedule_rrule.py
View File

@@ -73,9 +73,9 @@ DOCUMENTATION = """
"""
EXAMPLES = """
- name: Create a string for a schedule
debug:
msg: "{{ query('awx.awx.schedule_rrule', 'none', start_date='1979-09-13 03:45:07') }}"
- name: Create a string for a schedule
debug:
msg: "{{ lookup('awx.awx.schedule_rrule', 'none', start_date='1979-09-13 03:45:07') }}"
"""
RETURN = """
@@ -237,4 +237,4 @@ class LookupModule(LookupBase):
if kwargs.get('every', 1) == 1:
return_rrule = "{0};INTERVAL=1".format(return_rrule)
return return_rrule
return [return_rrule]

24
awx_collection/plugins/lookup/schedule_rruleset.py
View File

@@ -107,17 +107,17 @@ DOCUMENTATION = """
"""
EXAMPLES = """
- name: Create a ruleset for everyday except Sundays
set_fact:
complex_rule: "{{ query(awx.awx.schedule_rruleset, '2022-04-30 10:30:45', rules=rrules, timezone='UTC' ) }}"
vars:
rrules:
- frequency: 'day'
interval: 1
- frequency: 'day'
interval: 1
byweekday: 'sunday'
include: false
- name: Create a ruleset for everyday except Sundays
set_fact:
complex_rule: "{{ lookup(awx.awx.schedule_rruleset, '2022-04-30 10:30:45', rules=rrules, timezone='UTC' ) }}"
vars:
rrules:
- frequency: 'day'
interval: 1
- frequency: 'day'
interval: 1
byweekday: 'sunday'
include: False
"""
RETURN = """
@@ -352,4 +352,4 @@ class LookupModule(LookupBase):
raise_from(AnsibleError("Failed to parse generated rule set via rruleset {0}".format(e)), e)
# return self.get_rrule(frequency, kwargs)
return rruleset_str
return [rruleset_str]