Warn reserved (#20567)
* removed unused vars * added warning when using reserved vars fixes #4816 * cleanup
This commit is contained in:
parent
b3b598c835
commit
f4b6b72c5b
3 changed files with 83 additions and 3 deletions
|
@ -36,6 +36,7 @@ from ansible.plugins.callback import CallbackBase
|
||||||
from ansible.template import Templar
|
from ansible.template import Templar
|
||||||
from ansible.utils.helpers import pct_to_int
|
from ansible.utils.helpers import pct_to_int
|
||||||
from ansible.vars.hostvars import HostVars
|
from ansible.vars.hostvars import HostVars
|
||||||
|
from ansible.vars.reserved import warn_if_reserved
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from __main__ import display
|
from __main__ import display
|
||||||
|
@ -209,6 +210,7 @@ class TaskQueueManager:
|
||||||
self.load_callbacks()
|
self.load_callbacks()
|
||||||
|
|
||||||
all_vars = self._variable_manager.get_vars(loader=self._loader, play=play)
|
all_vars = self._variable_manager.get_vars(loader=self._loader, play=play)
|
||||||
|
warn_if_reserved(all_vars)
|
||||||
templar = Templar(loader=self._loader, variables=all_vars)
|
templar = Templar(loader=self._loader, variables=all_vars)
|
||||||
|
|
||||||
new_play = play.copy()
|
new_play = play.copy()
|
||||||
|
|
|
@ -92,6 +92,7 @@ def strip_internal_keys(dirty):
|
||||||
clean[k] = strip_internal_keys(dirty[k])
|
clean[k] = strip_internal_keys(dirty[k])
|
||||||
return clean
|
return clean
|
||||||
|
|
||||||
|
|
||||||
class VariableManager:
|
class VariableManager:
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -315,10 +316,10 @@ class VariableManager:
|
||||||
for item in data:
|
for item in data:
|
||||||
all_vars = combine_vars(all_vars, item)
|
all_vars = combine_vars(all_vars, item)
|
||||||
break
|
break
|
||||||
except AnsibleFileNotFound as e:
|
except AnsibleFileNotFound:
|
||||||
# we continue on loader failures
|
# we continue on loader failures
|
||||||
continue
|
continue
|
||||||
except AnsibleParserError as e:
|
except AnsibleParserError:
|
||||||
raise
|
raise
|
||||||
else:
|
else:
|
||||||
# if include_delegate_to is set to False, we ignore the missing
|
# if include_delegate_to is set to False, we ignore the missing
|
||||||
|
@ -456,7 +457,7 @@ class VariableManager:
|
||||||
try:
|
try:
|
||||||
loop_terms = listify_lookup_plugin_terms(terms=task.loop_args, templar=templar, loader=loader, fail_on_undefined=True, convert_bare=False)
|
loop_terms = listify_lookup_plugin_terms(terms=task.loop_args, templar=templar, loader=loader, fail_on_undefined=True, convert_bare=False)
|
||||||
items = lookup_loader.get(task.loop, loader=loader, templar=templar).run(terms=loop_terms, variables=vars_copy)
|
items = lookup_loader.get(task.loop, loader=loader, templar=templar).run(terms=loop_terms, variables=vars_copy)
|
||||||
except AnsibleUndefinedVariable as e:
|
except AnsibleUndefinedVariable:
|
||||||
# This task will be skipped later due to this, so we just setup
|
# This task will be skipped later due to this, so we just setup
|
||||||
# a dummy array for the later code so it doesn't fail
|
# a dummy array for the later code so it doesn't fail
|
||||||
items = [None]
|
items = [None]
|
||||||
|
|
77
lib/ansible/vars/reserved.py
Normal file
77
lib/ansible/vars/reserved.py
Normal file
|
@ -0,0 +1,77 @@
|
||||||
|
# (c) 2017 Ansible By Red Hat
|
||||||
|
#
|
||||||
|
# This file is part of Ansible
|
||||||
|
#
|
||||||
|
# Ansible is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Ansible is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Make coding more python3-ish
|
||||||
|
from __future__ import (absolute_import, division, print_function)
|
||||||
|
__metaclass__ = type
|
||||||
|
|
||||||
|
from ansible.playbook import Play
|
||||||
|
from ansible.playbook.block import Block
|
||||||
|
from ansible.playbook.role import Role
|
||||||
|
from ansible.playbook.task import Task
|
||||||
|
|
||||||
|
try:
|
||||||
|
from __main__ import display
|
||||||
|
except ImportError:
|
||||||
|
from ansible.utils.display import Display
|
||||||
|
display = Display()
|
||||||
|
|
||||||
|
def get_reserved_names(include_private=True):
|
||||||
|
''' this function returns the list of reserved names associated with play objects'''
|
||||||
|
|
||||||
|
public = set()
|
||||||
|
private = set()
|
||||||
|
result = set()
|
||||||
|
|
||||||
|
#FIXME: find a way to 'not hardcode', possibly need role deps/includes
|
||||||
|
class_list = [ Play, Role, Block, Task ]
|
||||||
|
|
||||||
|
for aclass in class_list:
|
||||||
|
aobj = aclass()
|
||||||
|
|
||||||
|
# build ordered list to loop over and dict with attributes
|
||||||
|
for attribute in aobj.__dict__['_attributes']:
|
||||||
|
if 'private' in attribute:
|
||||||
|
private.add(attribute)
|
||||||
|
else:
|
||||||
|
public.add(attribute)
|
||||||
|
|
||||||
|
# local_action is implicit with action
|
||||||
|
if 'action' in public:
|
||||||
|
public.add('local_action')
|
||||||
|
|
||||||
|
# loop implies with_
|
||||||
|
#FIXME: remove after with_ is not only deprecated but removed
|
||||||
|
if 'loop' in private or 'loop' in public:
|
||||||
|
public.add('with_')
|
||||||
|
|
||||||
|
if include_private:
|
||||||
|
result = public.union(private)
|
||||||
|
else:
|
||||||
|
result = public
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
def warn_if_reserved(myvars):
|
||||||
|
''' this function warns if any variable passed conflicts with internally reserved names '''
|
||||||
|
reserved = get_reserved_names()
|
||||||
|
for varname in myvars:
|
||||||
|
if varname == 'vars':
|
||||||
|
continue # we add this one internally
|
||||||
|
if varname in reserved:
|
||||||
|
display.warning('Found variable using reserved name: %s' % varname)
|
||||||
|
|
Loading…
Reference in a new issue