Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust extra_vars handling in non-json cases #278

Merged
merged 1 commit into from
Mar 19, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions broker/providers/ansible_tower.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,24 @@ def _get_broker_args_from_job(self, host):
)
return _broker_args

@staticmethod
def _pull_extra_vars(extra_vars):
"""Pull extra vars from a json string or psuedo-dictionary."""
if not extra_vars:
return {}
try:
return json.loads(extra_vars)
except json.JSONDecodeError:
logger.warning(
f"Job uses non-json extra_vars:\n{extra_vars}\n"
"Attempting to parse as pseudo-dictionary."
)
compiled = {}
for line in extra_vars.splitlines():
key, val = line.split(": ")
compiled[key] = val
return compiled

@cached_property
def inventory(self):
"""Return the current tower inventory."""
Expand Down Expand Up @@ -484,7 +502,7 @@ def _get_fields_from_facts(facts):
# Fallback to old method
else:
# Get initial extra vars passed to workflow
job_extra_vars = json.loads(job.extra_vars)
job_extra_vars = self._pull_extra_vars(job.extra_vars)

# Update with resolved values stored on job
for key in job_extra_vars:
Expand Down Expand Up @@ -562,11 +580,10 @@ def execute(self, **kwargs): # noqa: PLR0912 - Possible TODO refactor

# Save custom, non-workflow extra vars to a named variable.
# The workflow can save these values to job artifacts / host facts.
workflow_extra_vars = json.loads(target.extra_vars)
workflow_extra_vars = self._pull_extra_vars(target.extra_vars)
kwargs["_broker_extra_vars"] = {
k: v for k, v in kwargs.items() if k not in workflow_extra_vars
}

payload["extra_vars"] = str(kwargs)
logger.debug(
f"Launching {subject}: {url_parser.urljoin(self.url, str(target.url))}\n{payload=}"
Expand Down