Skip to content

Commit 9ec3d58

Browse files
authored
Merge pull request #61 from jessicamack/add-entry-points
Add entry points for supported inventory sources
2 parents e7d5733 + 77d3fd5 commit 9ec3d58

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

pyproject.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ gpg_public_key = "awx_plugins.credentials.plugins:gpg_public_key"
101101
terraform = "awx_plugins.credentials.plugins:terraform"
102102

103103
[project.entry-points."awx_plugins.inventory"] # new entry points group name
104-
azure-rm = "awx_plugins.inventory.plugins:azure_rm"
104+
azure_rm = "awx_plugins.inventory.plugins:azure_rm"
105105
ec2 = "awx_plugins.inventory.plugins:ec2"
106106
gce = "awx_plugins.inventory.plugins:gce"
107107
vmware = "awx_plugins.inventory.plugins:vmware"
@@ -114,6 +114,13 @@ insights = "awx_plugins.inventory.plugins:insights"
114114
openshift_virtualization = "awx_plugins.inventory.plugins:openshift_virtualization"
115115
constructed = "awx_plugins.inventory.plugins:constructed"
116116

117+
[project.entry-points."awx_plugins.inventory.supported"] # plugins that awx will skip activating automatically
118+
rhv = "awx_plugins.inventory.plugins:rhv_supported"
119+
satellite6 = "awx_plugins.inventory.plugins:satellite6_supported"
120+
controller = "awx_plugins.inventory.plugins:controller_supported"
121+
insights = "awx_plugins.inventory.plugins:insights_supported"
122+
openshift_virtualization = "awx_plugins.inventory.plugins:openshift_virtualization_supported"
123+
117124
[project.license]
118125
file = "LICENSE"
119126

tests/importable_test.py

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def __str__(self) -> str:
7676
inventory_plugins = (
7777
EntryPointParam(
7878
'awx_plugins.inventory',
79-
'azure-rm',
79+
'azure_rm',
8080
'awx_plugins.inventory.plugins:azure_rm',
8181
),
8282
EntryPointParam(
@@ -134,6 +134,31 @@ def __str__(self) -> str:
134134
'constructed',
135135
'awx_plugins.inventory.plugins:constructed',
136136
),
137+
EntryPointParam(
138+
'awx_plugins.inventory.supported',
139+
'rhv',
140+
'awx_plugins.inventory.plugins:rhv_supported',
141+
),
142+
EntryPointParam(
143+
'awx_plugins.inventory.supported',
144+
'satellite6',
145+
'awx_plugins.inventory.plugins:satellite6_supported',
146+
),
147+
EntryPointParam(
148+
'awx_plugins.inventory.supported',
149+
'controller',
150+
'awx_plugins.inventory.plugins:controller_supported',
151+
),
152+
EntryPointParam(
153+
'awx_plugins.inventory.supported',
154+
'insights',
155+
'awx_plugins.inventory.plugins:insights_supported',
156+
),
157+
EntryPointParam(
158+
'awx_plugins.inventory.supported',
159+
'openshift_virtualization',
160+
'awx_plugins.inventory.plugins:openshift_virtualization_supported',
161+
),
137162
)
138163

139164

0 commit comments

Comments
 (0)