ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

make vars only group declarations an error

Browse source 
fixes #32860
This commit is contained in:
Brian Coca 2017-11-13 14:49:46 -05:00 committed by Brian Coca
parent e45c763b64
commit 3456bba631
1 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lib/ansible/plugins/inventory/ini.py
View file

@ -153,7 +153,6 @@ class InventoryModule(BaseFileInventoryPlugin):
pending_declarations = {} pending_declarations = {}
groupname = 'ungrouped' groupname = 'ungrouped'
state = 'hosts' state = 'hosts'
self.lineno = 0 self.lineno = 0
for line in lines: for line in lines:
self.lineno += 1 self.lineno += 1
@ -176,24 +175,21 @@ class InventoryModule(BaseFileInventoryPlugin):
self._raise_error("Section [%s] has unknown type: %s" % (title, state)) self._raise_error("Section [%s] has unknown type: %s" % (title, state))
# If we haven't seen this group before, we add a new Group. # If we haven't seen this group before, we add a new Group.
# if groupname not in self.inventory.groups:
# Either [groupname] or [groupname:children] is sufficient to # Either [groupname] or [groupname:children] is sufficient to declare a group,
# declare a group, but [groupname:vars] is allowed only if the # but [groupname:vars] is allowed only if the # group is declared elsewhere.
# group is declared elsewhere (not necessarily earlier). We add # We add the group anyway, but make a note in pending_declarations to check at the end.
# the group anyway, but make a note in pending_declarations to if state == 'vars':
# check at the end. pending_declarations[groupname] = dict(line=self.lineno, state=state, name=groupname)
self.inventory.add_group(groupname) self.inventory.add_group(groupname)
if state == 'vars':
pending_declarations[groupname] = dict(line=self.lineno, state=state, name=groupname)
# When we see a declaration that we've been waiting for, we can
# delete the note.
# When we see a declaration that we've been waiting for, we process and delete.
if groupname in pending_declarations and state != 'vars': if groupname in pending_declarations and state != 'vars':
if pending_declarations[groupname]['state'] == 'children': if pending_declarations[groupname]['state'] == 'children':
self._add_pending_children(groupname, pending_declarations) self._add_pending_children(groupname, pending_declarations)
elif pending_declarations[groupname]['state'] == 'vars':
del pending_declarations[groupname]
continue continue
elif line.startswith('[') and line.endswith(']'): elif line.startswith('[') and line.endswith(']'):
@ -229,22 +225,18 @@ class InventoryModule(BaseFileInventoryPlugin):
pending_declarations[child]['parents'].append(groupname) pending_declarations[child]['parents'].append(groupname)
else: else:
self.inventory.add_child(groupname, child) self.inventory.add_child(groupname, child)
# This is a fencepost. It can happen only if the state checker
# accepts a state that isn't handled above.
else: else:
# This can happen only if the state checker accepts a state that isn't handled above.
self._raise_error("Entered unhandled state: %s" % (state)) self._raise_error("Entered unhandled state: %s" % (state))
# Any entries in pending_declarations not removed by a group declaration above mean that there was an unresolved reference. # Any entries in pending_declarations not removed by a group declaration above mean that there was an unresolved reference.
# We report only the first such error here. # We report only the first such error here.
for g in pending_declarations: for g in pending_declarations:
if g not in self.inventory.groups: decl = pending_declarations[g]
decl = pending_declarations[g] if decl['state'] == 'vars':
if decl['state'] == 'vars': raise AnsibleError("%s:%d: Section [%s:vars] not valid for undefined group: %s" % (path, decl['line'], decl['name'], decl['name']))
raise AnsibleError("%s:%d: Section [%s:vars] not valid for undefined group: %s" % (path, decl['line'], decl['name'], decl['name'])) elif decl['state'] == 'children':
elif decl['state'] == 'children': raise AnsibleError("%s:%d: Section [%s:children] includes undefined group: %s" % (path, decl['line'], decl['parents'].pop(), decl['name']))
raise AnsibleError("%s:%d: Section [%s:children] includes undefined group: %s" % (path, decl['line'], decl['parents'].pop(), decl['name']))
def _add_pending_children(self, group, pending): def _add_pending_children(self, group, pending):
for parent in pending[group]['parents']: for parent in pending[group]['parents']:
@ -326,7 +318,7 @@ class InventoryModule(BaseFileInventoryPlugin):
try: try:
(pattern, port) = parse_address(hostpattern, allow_ranges=True) (pattern, port) = parse_address(hostpattern, allow_ranges=True)
except: except Exception:
# not a recognizable host pattern # not a recognizable host pattern
pattern = hostpattern pattern = hostpattern
port = None port = None