Skip to content

Changing the method of calling #1992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rahulb-rackspace wants to merge 1 commit into
base: s2i-build
Choose a base branch
from
Open

Changing the method of calling #1992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions otter/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,13 +382,31 @@ def user_for_tenant(auth_endpoint, username, password, tenant_id, log=None):

:return: Username of the magical identity:user-admin user for the tenantid.
"""

def _log_failed_auth(err):
"""
Log this as a string we know we can find in the logging feed
"""
if log:
log.err(err, 'Failed to get a new identity admin token.',
otter_msg_type='admin-login-failed')
return err

if log:
log.msg('Getting new identity admin token')

d_token = authenticate_user(auth_endpoint, username, password, log)
d_token.addCallback(extract_token)
token = ''
d_token.addErrback(_log_failed_auth)
d_token.addCallback(setattr, token)
d = treq.get(
append_segments(auth_endpoint.replace('v2.0', 'v1.1'), 'mosso', str(tenant_id)),
auth=(username, password),
append_segments(auth_endpoint, 'users') + '?name=' + str(username),
headers=headers(token),
allow_redirects=False,
log=log)
d.addCallback(check_success, [301])
d.addErrback(wrap_upstream_error, 'identity', 'mosso', auth_endpoint)
d.addCallback(check_success, [201, 203])
d.addErrback(wrap_upstream_error, 'identity', 'users', auth_endpoint)
d.addCallback(treq.json_content)
d.addCallback(lambda user: user['user']['id'])
return d
Expand Down