From fe9b3e11bbbad2519fa2cf2d496457a6a4bfa7ca Mon Sep 17 00:00:00 2001 From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:48:25 -0400 Subject: [PATCH] Fix --- awx/main/constants.py | 10 +++++----- .../functional/test_inventory_source_injectors.py | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/awx/main/constants.py b/awx/main/constants.py index 6c02616d9c3c..7a93481f6f3e 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -26,11 +26,11 @@ 'insights', 'terraform', 'openshift_virtualization', - 'controller_downstream', - 'rhv_downstream', - 'openshift_virtualization_downstream', - 'insights_downstream', - 'satellite6_downstream', + 'controller_supported', + 'rhv_supported', + 'openshift_virtualization_supported', + 'insights_supported', + 'satellite6_supported', ) PRIVILEGE_ESCALATION_METHODS = [ diff --git a/awx/main/tests/functional/test_inventory_source_injectors.py b/awx/main/tests/functional/test_inventory_source_injectors.py index 6c93717b76b5..9cc8d72ab2ed 100644 --- a/awx/main/tests/functional/test_inventory_source_injectors.py +++ b/awx/main/tests/functional/test_inventory_source_injectors.py @@ -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] + if source == 'openshift_virtualization': return 'kubernetes_bearer_token' + return source.replace('ec2', 'aws')