diff --git a/src/reactive/barbican_vault_handlers.py b/src/reactive/barbican_vault_handlers.py index 2382296..0fd3432 100644 --- a/src/reactive/barbican_vault_handlers.py +++ b/src/reactive/barbican_vault_handlers.py @@ -30,17 +30,18 @@ charm.use_defaults( @reactive.when_not('secrets-storage.available') -@reactive.when('endpoint.secrets-storage.joined') +@reactive.when('secrets-storage.connected') def secret_backend_vault_request(): """Request access to vault.""" secrets_storage = reactive.endpoint_from_flag( - 'endpoint.secrets-storage.joined') + 'secrets-storage.connected') ch_core.hookenv.log('Requesting access to vault ({})' .format(secrets_storage.vault_url), level=ch_core.hookenv.INFO) with charm.provide_charm_instance() as barbican_vault_charm: secrets_storage.request_secret_backend( barbican_vault_charm.secret_backend_name, isolated=False) + reactive.clear_flag('secrets-storage.connected') @reactive.when_all('endpoint.secrets.joined', 'secrets-storage.available', diff --git a/unit_tests/test_barbican_vault_handlers.py b/unit_tests/test_barbican_vault_handlers.py index 72d8939..aa1606a 100644 --- a/unit_tests/test_barbican_vault_handlers.py +++ b/unit_tests/test_barbican_vault_handlers.py @@ -32,7 +32,7 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks): hook_set = { 'when': { 'secret_backend_vault_request': ( - 'endpoint.secrets-storage.joined',), + 'secrets-storage.connected',), }, 'when_all': { 'plugin_info_barbican_publish': ( @@ -66,12 +66,15 @@ class TestBarbicanVaultHandlers(test_utils.PatchHelper): secrets_storage = mock.MagicMock() self.endpoint_from_flag.return_value = secrets_storage barbican_vault_charm.secret_backend_name = 'charm-barbican-vault' + self.patch_object(handlers.reactive, 'clear_flag') handlers.secret_backend_vault_request() self.endpoint_from_flag.assert_called_once_with( - 'endpoint.secrets-storage.joined') - secrets_storage.request_secret_backend.assrt_called_once_with( - 'charm-barbican-vault') + 'secrets-storage.connected') + secrets_storage.request_secret_backend.assert_called_once_with( + 'charm-barbican-vault', isolated=False) + self.clear_flag.assert_called_once_with( + 'secrets-storage.connected') def test_plugin_info_barbican_publish(self): barbican_vault_charm = self.patch_charm()