Skip to content

Commit

Permalink
Add splitted up inventory source plugins
Browse files Browse the repository at this point in the history
Fix CI failure introduced by
ansible/awx-plugins@7d83b7d
  • Loading branch information
TheRealHaoLiu committed Oct 15, 2024
1 parent 579c2b7 commit d7d0cfc
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
20 changes: 19 additions & 1 deletion awx/main/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,25 @@
'STANDARD_INVENTORY_UPDATE_ENV',
]

CLOUD_PROVIDERS = ('azure_rm', 'ec2', 'gce', 'vmware', 'openstack', 'rhv', 'satellite6', 'controller', 'insights', 'terraform', 'openshift_virtualization')
CLOUD_PROVIDERS = (
'azure_rm',
'ec2',
'gce',
'vmware',
'openstack',
'rhv',
'satellite6',
'controller',
'insights',
'terraform',
'openshift_virtualization',
'controller_supported',
'rhv_supported',
'openshift_virtualization_supported',
'insights_supported',
'satellite6_supported',
)

PRIVILEGE_ESCALATION_METHODS = [
('sudo', _('Sudo')),
('su', _('Su')),
Expand Down
5 changes: 4 additions & 1 deletion awx/main/models/inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,10 @@ def get_cloud_credential(self):
credential = None
for cred in self.credentials.all():
if self.source in CLOUD_PROVIDERS:
if cred.kind == self.source.replace('ec2', 'aws'):
source = self.source.replace('ec2', 'aws')
if source.endswith('_supported'):
source = source[:-10]

Check warning on line 1067 in awx/main/models/inventory.py

View check run for this annotation

Codecov / codecov/patch

awx/main/models/inventory.py#L1067

Added line #L1067 was not covered by tests
if cred.kind == source:
credential = cred
break
else:
Expand Down
4 changes: 4 additions & 0 deletions awx/main/tests/functional/test_inventory_source_injectors.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@ def generate_fake_var(element):

def credential_kind(source):
"""Given the inventory source kind, return expected credential kind"""
if source.endswith('_supported'):
source = source[:-10]

Check warning on line 51 in awx/main/tests/functional/test_inventory_source_injectors.py

View check run for this annotation

Codecov / codecov/patch

awx/main/tests/functional/test_inventory_source_injectors.py#L51

Added line #L51 was not covered by tests

if source == 'openshift_virtualization':
return 'kubernetes_bearer_token'

return source.replace('ec2', 'aws')


Expand Down

0 comments on commit d7d0cfc

Please sign in to comment.