generated from ansible-collections/collection_template
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make wrapping variables as unsafe smarter to avoid triggering an AWX …
…bug.
- Loading branch information
1 parent
fcb14d8
commit 297132c
Showing
3 changed files
with
44 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
bugfixes: | ||
- "inventory plugins - add unsafe wrapper to avoid marking strings that do not contain ``{`` or ``}`` as unsafe, to work around a bug in AWX (https://github.com/ansible-collections/community.hrobot/pull/102)." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
# Copyright (c) 2023, Felix Fontein <[email protected]> | ||
# 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 | ||
|
||
from __future__ import (absolute_import, division, print_function) | ||
__metaclass__ = type | ||
|
||
import re | ||
|
||
from ansible.module_utils.six import binary_type, text_type | ||
from ansible.module_utils.common._collections_compat import Mapping, Set | ||
from ansible.module_utils.common.collections import is_sequence | ||
from ansible.utils.unsafe_proxy import ( | ||
AnsibleUnsafe, | ||
wrap_var as _make_unsafe, | ||
) | ||
|
||
_RE_TEMPLATE_CHARS = re.compile('[{}]') | ||
_RE_TEMPLATE_CHARS_BYTES = re.compile(b'[{}]') | ||
|
||
|
||
def make_unsafe(value): | ||
if value is None or isinstance(value, AnsibleUnsafe): | ||
return value | ||
|
||
if isinstance(value, Mapping): | ||
return dict((make_unsafe(key), make_unsafe(val)) for key, val in value.items()) | ||
elif isinstance(value, Set): | ||
return set(make_unsafe(elt) for elt in value) | ||
elif is_sequence(value): | ||
return type(value)(make_unsafe(elt) for elt in value) | ||
elif isinstance(value, binary_type): | ||
if _RE_TEMPLATE_CHARS_BYTES.match(value): | ||
value = _make_unsafe(value) | ||
return value | ||
elif isinstance(value, text_type): | ||
if _RE_TEMPLATE_CHARS.match(value): | ||
value = _make_unsafe(value) | ||
return value | ||
|
||
return value |