cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve proposed fix for bare variables (#70687)

Browse source 
* Make proposed fix for bare variables clearer

* Add changelog fragment
This commit is contained in:
Tatsunori Uchino 2020-08-19 07:55:30 +09:00 • committed by GitHub
parent ea58d7c233
commit b87944926d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/70687-improve-deprecation-message-bare-variable.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- improve deprecation message when using bare variable (https://github.com/ansible/ansible/pull/70687)

6
lib/ansible/playbook/conditional.py
View file

@ -133,8 +133,10 @@ class Conditional:
disable_lookups = hasattr(conditional, '__UNSAFE__')
conditional = templar.template(conditional, disable_lookups=disable_lookups)
if bare_vars_warning and not isinstance(conditional, bool):
display.deprecated('evaluating %r as a bare variable, this behaviour will go away and you might need to add |bool'
' to the expression in the future. Also see CONDITIONAL_BARE_VARS configuration toggle' % original,
display.deprecated('evaluating %r as a bare variable, this behaviour will go away and you might need to add " | bool"'
' (if you would like to evaluate input string from prompt) or " is truthy"'
' (if you would like to apply Python\'s evaluation method) to the expression in the future. '
'Also see CONDITIONAL_BARE_VARS configuration toggle' % original,
version="2.12", collection_name='ansible.builtin')
if not isinstance(conditional, text_type) or conditional == "":
return conditional