Skip to content
Merged
Show file tree
Hide file tree
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
27 changes: 14 additions & 13 deletions src/awx_plugins/interfaces/_temporary_private_inject_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,17 +277,18 @@ def inject_credential(
tmpl,
).render(**safe_namespace)

extra_vars = _build_extra_vars(
sandbox_env,
namespace,
cred_type.injectors.get(
'extra_vars', {},
),
)
if extra_vars:
path = _build_extra_vars_file(extra_vars, private_data_dir)
container_path = get_incontainer_path(path, private_data_dir)
args.extend(
# pylint: disable-next=consider-using-f-string
['-e', '@%s' % container_path],
if 'INVENTORY_UPDATE_ID' not in env:
extra_vars = _build_extra_vars(
sandbox_env,
namespace,
cred_type.injectors.get(
'extra_vars', {},
),
)
if extra_vars:
path = _build_extra_vars_file(extra_vars, private_data_dir)
container_path = get_incontainer_path(path, private_data_dir)
args.extend(
# pylint: disable-next=consider-using-f-string
['-e', '@%s' % container_path],
)
23 changes: 23 additions & 0 deletions tests/_temporary_private_inject_api_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,29 @@ def test_injectors_with_extra_vars(
assert expected_extra_vars.items() <= extra_vars.items()


def test_injectors_inv_update_id(private_data_dir: str) -> None:
"""Check that extra vars are not injected for an inventory update."""
cred_type = ManagedCredentialType(
namespace='animal',
name='dog',
kind='companion',
managed=True,
inputs={},
injectors={'extra_vars': {'do-not-inject': 'should-not-inject'}},
)
args: ArgsType = []
inject_credential(
cred_type,
Credential(inputs={}),
{'INVENTORY_UPDATE_ID': '1'},
{},
args,
private_data_dir,
)

assert not args


@pytest.mark.parametrize(
(
'inputs',
Expand Down