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.

Sign up for GitHub

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

📦 Discover injectors through entrypoints #15595

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

📦 Discover injectors through entrypoints #15595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e2a282
📦 Discover injectors through entrypoints
webknjaz Oct 22, 2024
a8dd593
Temporarily depend on the WIP branches of the deps
webknjaz Oct 22, 2024
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: 17 additions & 6 deletions awx/main/models/credential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

# Shared code for the AWX platform
from awx_plugins.interfaces._temporary_private_container_api import get_incontainer_path
from awx_plugins.interfaces._temporary_private_injector_api import load_injector_callable

# DRF
from awx.main.utils.pglock import advisory_lock
Expand All @@ -53,7 +54,6 @@
)
from awx.main.models import Team, Organization
from awx.main.utils import encrypt_field
from awx_plugins.credentials import injectors as builtin_injectors

# DAB
from ansible_base.resource_registry.tasks.sync import get_resource_server_client
Expand Down Expand Up @@ -566,11 +566,22 @@ def inject_credential(self, credential, env, safe_env, args, private_data_dir):
files)
"""
if not self.injectors:
if self.managed and credential.credential_type.namespace in dir(builtin_injectors):
injected_env = {}
getattr(builtin_injectors, credential.credential_type.namespace)(credential, injected_env, private_data_dir)
env.update(injected_env)
safe_env.update(build_safe_env(injected_env))
if self.managed:
try:
inject_credential_into_env = load_injector_callable(
credential.credential_type.namespace,
)
except LookupError:
pass # noqa: WPS420
else:
injected_env = {}
inject_credential_into_env(
credential,
injected_env,
private_data_dir,
)
env.update(injected_env)
safe_env.update(build_safe_env(injected_env))
return

class TowerNamespace:
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements_git.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ git+https://github.com/ansible/system-certifi.git@devel#egg=certifi
# Remove pbr from requirements.in when moving ansible-runner to requirements.in
git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner
django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel#egg=django-ansible-base[rest_filters,jwt_consumer,resource_registry,rbac]
awx-plugins-core @ git+https://git@github.com/ansible/awx-plugins.git@devel#egg=awx-plugins-core
awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
awx-plugins-core @ git+https://github.com/webknjaz/ansible--awx-plugins.git@features/inventory-entry-points#egg=awx-plugins-core
awx_plugins.interfaces @ git+https://github.com/webknjaz/ansible--awx_plugins.interfaces.git@features/inventory-entry-points
Loading