projects/reconstructed
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

locals clause removed from block instruction

Browse source
This commit is contained in:
Emmanuel BENOîT 2022-09-18 10:13:51 +02:00
parent fcdfe9241d
commit 47a2704164
1 changed files with 12 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
inventory_plugins/reconstructed.py
View file

@ -854,15 +854,13 @@ class RciBlock(RcInstruction):
self._block = None self._block = None
self._rescue = None self._rescue = None
self._always = None self._always = None
self._locals = None
def repr_instruction_only(self): def repr_instruction_only(self):
return "%s(block=%s, rescue=%s, always=%s, locals=%s)" % ( return "%s(block=%s, rescue=%s, always=%s)" % (
self._action, self._action,
repr(self._block), repr(self._block),
repr(self._rescue), repr(self._rescue),
repr(self._always), repr(self._always),
repr(self._locals),
) )
def dump_instruction(self): def dump_instruction(self):
@ -870,10 +868,6 @@ class RciBlock(RcInstruction):
self.dump_section(output, "block", self._block) self.dump_section(output, "block", self._block)
self.dump_section(output, "rescue", self._rescue) self.dump_section(output, "rescue", self._rescue)
self.dump_section(output, "always", self._always) self.dump_section(output, "always", self._always)
if self._locals:
output.append(" locals:")
for k, v in self._locals.items():
output.append(" " + repr(k) + "=" + repr(v))
return output return output
def dump_section(self, output, section_name, section_contents): def dump_section(self, output, section_name, section_contents):
@ -900,7 +894,6 @@ class RciBlock(RcInstruction):
self._block is None self._block is None
and self._rescue is None and self._rescue is None
and self._always is None and self._always is None
and self._locals is None
) )
if "block" not in record: if "block" not in record:
raise AnsibleParserError("%s: missing 'block' field" % (self._action,)) raise AnsibleParserError("%s: missing 'block' field" % (self._action,))
@ -913,23 +906,6 @@ class RciBlock(RcInstruction):
self._always = self.parse_block(record, "always") self._always = self.parse_block(record, "always")
else: else:
self._always = [] self._always = []
if "locals" in record:
if not isinstance(record["locals"], dict):
raise AnsibleParserError(
"%s: 'locals' should be a dictionnary" % (self._action,)
)
for k, v in record["locals"].items():
if not isinstance(k, string_types):
raise AnsibleParserError(
"%s: locals identifiers must be strings" % (self._action,)
)
if not isidentifier(k):
raise AnsibleParserError(
"%s: '%s' is not a valid identifier" % (self._action, k)
)
self._locals = record["locals"]
else:
self._locals = {}
def parse_block(self, record, key): def parse_block(self, record, key):
"""Parse the contents of one of the instruction lists. """Parse the contents of one of the instruction lists.
@ -963,31 +939,21 @@ class RciBlock(RcInstruction):
self._block is None self._block is None
or self._rescue is None or self._rescue is None
or self._always is None or self._always is None
or self._locals is None
) )
variables._script_stack_push(self._locals.keys())
try: try:
self._templar.available_variables = variables
for key, value in self._locals.items():
result = self._templar.template(value)
variables[key] = result
self._display.vvv("- set block-local %s to %s" % (key, result))
try: try:
try: self._display.vvv("- running 'block' instructions")
self._display.vvv("- running 'block' instructions") return self.run_section(self._block, host_name, variables)
return self.run_section(self._block, host_name, variables) except AnsibleError as e:
except AnsibleError as e: if not self._rescue:
if not self._rescue: self._display.vvv("- block failed")
self._display.vvv("- block failed") raise
raise self._display.vvv("- block failed, running 'rescue' instructions")
self._display.vvv("- block failed, running 'rescue' instructions") variables["reconstructed_error"] = str(e)
variables["reconstructed_error"] = str(e) return self.run_section(self._rescue, host_name, variables)
return self.run_section(self._rescue, host_name, variables)
finally:
self._display.vvv("- block exited, running 'always' instructions")
self.run_section(self._always, host_name, variables)
finally: finally:
variables._script_stack_pop() self._display.vvv("- block exited, running 'always' instructions")
self.run_section(self._always, host_name, variables)
def run_section(self, section, host_name, variables): def run_section(self, section, host_name, variables):
"""Execute a single section. """Execute a single section.