External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-04 17:55:06 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix analytic ship (#6679)

Browse Source 
REDHAT_USERNAME and REDHAT_PASSWORD are default to empty string instead of None
This commit is contained in:
Hao Liu
2024-09-10 03:46:53 -04:00
committed by GitHub
parent 059f52f314
commit ce0d176508
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/analytics/core.py
View File

@@ -368,7 +368,7 @@ def ship(path):
rh_user = getattr(settings, 'REDHAT_USERNAME', None) rh_user = getattr(settings, 'REDHAT_USERNAME', None)
rh_password = getattr(settings, 'REDHAT_PASSWORD', None) rh_password = getattr(settings, 'REDHAT_PASSWORD', None)
if rh_user is None or rh_password is None: if not rh_user or not rh_password:
logger.info('REDHAT_USERNAME and REDHAT_PASSWORD are not set, using SUBSCRIPTIONS_USERNAME and SUBSCRIPTIONS_PASSWORD') logger.info('REDHAT_USERNAME and REDHAT_PASSWORD are not set, using SUBSCRIPTIONS_USERNAME and SUBSCRIPTIONS_PASSWORD')
rh_user = getattr(settings, 'SUBSCRIPTIONS_USERNAME', None) rh_user = getattr(settings, 'SUBSCRIPTIONS_USERNAME', None)
rh_password = getattr(settings, 'SUBSCRIPTIONS_PASSWORD', None) rh_password = getattr(settings, 'SUBSCRIPTIONS_PASSWORD', None)

35
awx/main/tests/functional/analytics/test_core.py
View File

@@ -82,18 +82,18 @@ def mock_analytic_post():
@pytest.mark.parametrize( @pytest.mark.parametrize(
"setting_map, expected_result, expected_auth", "setting_map, expected_result, expected_auth",
[ [
# Test case 1: Valid Red Hat credentials # Valid Red Hat credentials
( (
{ {
'REDHAT_USERNAME': 'redhat_user', 'REDHAT_USERNAME': 'redhat_user',
'REDHAT_PASSWORD': 'redhat_pass', # NOSONAR 'REDHAT_PASSWORD': 'redhat_pass', # NOSONAR
'SUBSCRIPTIONS_USERNAME': None, 'SUBSCRIPTIONS_USERNAME': '',
'SUBSCRIPTIONS_PASSWORD': None, 'SUBSCRIPTIONS_PASSWORD': '',
}, },
True, True,
('redhat_user', 'redhat_pass'), ('redhat_user', 'redhat_pass'),
), ),
# Test case 2: Valid Subscription credentials # Valid Subscription credentials with no Red Hat credentials
( (
{ {
'REDHAT_USERNAME': None, 'REDHAT_USERNAME': None,
@@ -104,24 +104,35 @@ def mock_analytic_post():
True, True,
('subs_user', 'subs_pass'), ('subs_user', 'subs_pass'),
), ),
# Test case 3: No credentials # Valid Subscription credentials with empty Red Hat credentials
( (
{ {
'REDHAT_USERNAME': None, 'REDHAT_USERNAME': '',
'REDHAT_PASSWORD': None, 'REDHAT_PASSWORD': '',
'SUBSCRIPTIONS_USERNAME': None, 'SUBSCRIPTIONS_USERNAME': 'subs_user',
'SUBSCRIPTIONS_PASSWORD': None, 'SUBSCRIPTIONS_PASSWORD': 'subs_pass', # NOSONAR
},
True,
('subs_user', 'subs_pass'),
),
# No credentials
(
{
'REDHAT_USERNAME': '',
'REDHAT_PASSWORD': '',
'SUBSCRIPTIONS_USERNAME': '',
'SUBSCRIPTIONS_PASSWORD': '',
}, },
False, False,
None, # No request should be made None, # No request should be made
), ),
# Test case 4: Mixed credentials # Mixed credentials
( (
{ {
'REDHAT_USERNAME': None, 'REDHAT_USERNAME': '',
'REDHAT_PASSWORD': 'redhat_pass', # NOSONAR 'REDHAT_PASSWORD': 'redhat_pass', # NOSONAR
'SUBSCRIPTIONS_USERNAME': 'subs_user', 'SUBSCRIPTIONS_USERNAME': 'subs_user',
'SUBSCRIPTIONS_PASSWORD': None, 'SUBSCRIPTIONS_PASSWORD': '',
}, },
False, False,
None, # Invalid, no request should be made None, # Invalid, no request should be made