From bf5f4771a0a41080502c9e1445c8d27c6cd7ade9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 23 Apr 2018 15:48:52 +0200 Subject: [PATCH] Polishing. Catch RuntimeException in LifecycleAwareSessionManager on revocation. See gh-203. --- .../vault/authentication/LifecycleAwareSessionManager.java | 3 +++ .../vault/core/VaultSysTemplateIntegrationTests.java | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java index 998b8f20..43241cae 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java @@ -144,6 +144,9 @@ public class LifecycleAwareSessionManager implements SessionManager, DisposableB logger.warn(String.format("Cannot revoke VaultToken: %s", VaultResponses.getError(e.getResponseBodyAsString()))); } + catch (RuntimeException e) { + logger.warn("Cannot revoke VaultToken: %s", e); + } } /** diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java index c7235d73..63453764 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java @@ -59,8 +59,6 @@ public class VaultSysTemplateIntegrationTests extends IntegrationTestSupport { assertThat(mounts).containsKey("secret/"); VaultMount secret = mounts.get("secret/"); - assertThat(Arrays.asList("generic secret storage", "key/value secret storage")) - .contains(secret.getDescription()); assertThat(Arrays.asList("kv", "generic")).contains(secret.getType()); }