openstack
/
charm-barbican-vault
Code Issues Proposed changes

Request initial token from vault only once

This commit is contained in:
Frode Nordahl 2018-10-22 15:15:58 +02:00
parent ba617f0672
commit f5db4bff62
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/reactive/barbican_vault_handlers.py
View File

@ -30,17 +30,18 @@ charm.use_defaults(
@reactive.when_not('secrets-storage.available') @reactive.when_not('secrets-storage.available')
@reactive.when('endpoint.secrets-storage.joined') @reactive.when('secrets-storage.connected')
def secret_backend_vault_request(): def secret_backend_vault_request():
"""Request access to vault.""" """Request access to vault."""
secrets_storage = reactive.endpoint_from_flag( secrets_storage = reactive.endpoint_from_flag(
'endpoint.secrets-storage.joined') 'secrets-storage.connected')
ch_core.hookenv.log('Requesting access to vault ({})' ch_core.hookenv.log('Requesting access to vault ({})'
.format(secrets_storage.vault_url), .format(secrets_storage.vault_url),
level=ch_core.hookenv.INFO) level=ch_core.hookenv.INFO)
with charm.provide_charm_instance() as barbican_vault_charm: with charm.provide_charm_instance() as barbican_vault_charm:
secrets_storage.request_secret_backend( secrets_storage.request_secret_backend(
barbican_vault_charm.secret_backend_name, isolated=False) barbican_vault_charm.secret_backend_name, isolated=False)
reactive.clear_flag('secrets-storage.connected')
@reactive.when_all('endpoint.secrets.joined', 'secrets-storage.available', @reactive.when_all('endpoint.secrets.joined', 'secrets-storage.available',

11
unit_tests/test_barbican_vault_handlers.py
View File

@ -32,7 +32,7 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
hook_set = { hook_set = {
'when': { 'when': {
'secret_backend_vault_request': ( 'secret_backend_vault_request': (
'endpoint.secrets-storage.joined',), 'secrets-storage.connected',),
}, },
'when_all': { 'when_all': {
'plugin_info_barbican_publish': ( 'plugin_info_barbican_publish': (
@ -66,12 +66,15 @@ class TestBarbicanVaultHandlers(test_utils.PatchHelper):
secrets_storage = mock.MagicMock() secrets_storage = mock.MagicMock()
self.endpoint_from_flag.return_value = secrets_storage self.endpoint_from_flag.return_value = secrets_storage
barbican_vault_charm.secret_backend_name = 'charm-barbican-vault' barbican_vault_charm.secret_backend_name = 'charm-barbican-vault'
self.patch_object(handlers.reactive, 'clear_flag')
handlers.secret_backend_vault_request() handlers.secret_backend_vault_request()
self.endpoint_from_flag.assert_called_once_with( self.endpoint_from_flag.assert_called_once_with(
'endpoint.secrets-storage.joined') 'secrets-storage.connected')
secrets_storage.request_secret_backend.assrt_called_once_with( secrets_storage.request_secret_backend.assert_called_once_with(
'charm-barbican-vault') 'charm-barbican-vault', isolated=False)
self.clear_flag.assert_called_once_with(
'secrets-storage.connected')
def test_plugin_info_barbican_publish(self): def test_plugin_info_barbican_publish(self):
barbican_vault_charm = self.patch_charm() barbican_vault_charm = self.patch_charm()