Merge "Add handler for Bad Request error during Vault authentication"

This commit is contained in:
Zuul 2020-06-16 14:03:45 +00:00 committed by Gerrit Code Review
commit 69dfce4d2f
1 changed files with 7 additions and 3 deletions

View File

@ -173,10 +173,14 @@ class VaultKeyManager(key_manager.KeyManager):
if resp.status_code == requests.codes['forbidden']: if resp.status_code == requests.codes['forbidden']:
raise exception.Forbidden() raise exception.Forbidden()
resp = resp.json() resp_data = resp.json()
self._cached_approle_token_id = resp['auth']['client_token']
if resp.status_code == requests.codes['bad_request']:
raise exception.KeyManagerError(', '.join(resp_data['errors']))
self._cached_approle_token_id = resp_data['auth']['client_token']
self._approle_token_issue = token_issue_utc self._approle_token_issue = token_issue_utc
self._approle_token_ttl = resp['auth']['lease_duration'] self._approle_token_ttl = resp_data['auth']['lease_duration']
return {'X-Vault-Token': self._approle_token_id} return {'X-Vault-Token': self._approle_token_id}
return {} return {}