openstack/python-swiftclient
Code Issues Proposed changes

Support v1password with no explicit auth_version

Browse Source 
Change-Id: I787b0988b7518850f1e1f93ca269f39f8cdec15c
This commit is contained in:
Tim Burke
2023-03-10 21:39:57 -08:00
parent 0f2b567953
commit e0e8721069
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
swiftclient/service.py
View File

@@ -96,8 +96,9 @@ def process_options(options):
elif options.get('auth_version') == '2': elif options.get('auth_version') == '2':
options['auth_version'] = '2.0' options['auth_version'] = '2.0'
if options.get('auth_version') not in ('2.0', '3') and not all( if options.get('auth_version') not in ('2.0', '3') and \
options.get(key) for key in ('auth', 'user', 'key')): options.get('os_auth_type') != 'v1password' and \
not all(options.get(key) for key in ('auth', 'user', 'key')):
# Use keystone auth if any of the new-style args are present # Use keystone auth if any of the new-style args are present
if any(options.get(k) for k in ( if any(options.get(k) for k in (
'os_user_domain_id', 'os_user_domain_id',