Pull the correct collection plugin for the product

awx/main/apps.py

@@ -60,6 +60,13 @@ def _load_credential_types_feature(self):
     def load_credential_types_feature(self):
         return self._load_credential_types_feature()
 
+    def load_inventory_plugins(self):
+        from awx.main.models.inventory import InventorySourceOptions, inv_entry_points
+
+        for entry_point_name, entry_point in inv_entry_points.items():
+            cls = entry_point.load()
+            InventorySourceOptions.injectors[entry_point_name] = cls
+
     def ready(self):
         super().ready()
 
@@ -71,3 +78,4 @@ def ready(self):
         if not os.environ.get('AWX_SKIP_CREDENTIAL_TYPES_DISCOVER', None):
             self.load_credential_types_feature()
         self.load_named_url_feature()
+        self.load_inventory_plugins()

awx/main/models/inventory.py

@@ -9,6 +9,7 @@
 import copy
 import os.path
 from urllib.parse import urljoin
+from importlib.metadata import entry_points, EntryPoint
 
 # Django
 from django.conf import settings
@@ -24,7 +25,7 @@
 from rest_framework.exceptions import ParseError
 
 from ansible_base.lib.utils.models import prevent_search
-from awx_plugins.inventory.plugins import PluginFileInjector
+from awx_plugins.interfaces._temporary_private_licensing_api import detect_server_product_name
 
 # AWX
 from awx.api.versioning import reverse
@@ -1404,5 +1405,10 @@ def get_absolute_url(self, request=None):
         return reverse('api:inventory_script_detail', kwargs={'pk': self.pk}, request=request)
 
 
-for cls in PluginFileInjector.__subclasses__():
-    InventorySourceOptions.injectors[cls.__name__] = cls
+def _load_all_entry_points_for(entry_point_subsections: list[str], /) -> dict[str, EntryPoint]:
+    return {ep.name: ep for entry_point_category in entry_point_subsections for ep in entry_points(group=f'awx_plugins.{entry_point_category}')}
+
+
+is_awx = detect_server_product_name() == 'AWX'
+extra_entry_point_groups = () if is_awx else ('inventory.supported',)
+inv_entry_points = _load_all_entry_points_for(['inventory', *extra_entry_point_groups])

awx/main/tests/functional/test_inventory_source_injectors.py

@@ -195,9 +195,6 @@ def create_reference_data(source_dir, env, content):
 @pytest.mark.django_db
 @pytest.mark.parametrize('this_kind', discover_available_cloud_provider_plugin_names())
 def test_inventory_update_injected_content(this_kind, inventory, fake_credential_factory, mock_me):
-    if this_kind.endswith('_supported'):
-        this_kind = this_kind[:-10]
-
     ExecutionEnvironment.objects.create(name='Control Plane EE', managed=True)
     ExecutionEnvironment.objects.create(name='Default Job EE', managed=False)