openstack
/
charm-barbican-vault
Code Issues Proposed changes

Change in hvac.Client post response type 

The hvac.Client post response is no longer an object with status_code and json
encoded data. It is a dictionary.

Change-Id: I1cacc8deda005cdbb2290d5ae821e4870608a41a
This commit is contained in:
David Ames 2020-04-24 21:28:12 +00:00
parent aa0e76c98d
commit 4e1c539eaf
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/charm/vault_utils.py
View File

@ -23,6 +23,5 @@ def retrieve_secret_id(url, token):
# "error decrementing wrapping token's use-count: invalid token entry
# provided for use count decrementing"
response = client._post('/v1/sys/wrapping/unwrap')
if response.status_code == 200:
data = response.json()
return data['data']['secret_id']
if response.get("data"):
return response['data']['secret_id']

4
unit_tests/test_vault_utils.py
View File

@ -25,9 +25,7 @@ class TestVaultUtils(test_utils.PatchHelper):
self.patch_object(vault_utils, 'hvac')
hvac_client = mock.MagicMock()
self.hvac.Client.return_value = hvac_client
response = mock.MagicMock()
response.status_code = 200
response.json.return_value = {'data': {'secret_id': 'FAKE_SECRET_ID'}}
response = {'data': {'secret_id': 'FAKE_SECRET_ID'}}
hvac_client._post.return_value = response
self.assertEqual(
vault_utils.retrieve_secret_id('url', 'token'), 'FAKE_SECRET_ID')