diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ff405e..49f9025 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.6.2 [work in progress] +* [fix] Prevent potential NPE on SecretResponse getter +* [fix] Fields of InvalidResposneException made final +* [fix] Fix typo in method name `listAppRoleSecrets()` (#14) +* [text] Tested against Vault 0.8.1, increased coverage + ## 0.6.1 [2017-08-02] * [fix] `TokenModel.getPassword()` returned username instead of password * [fix] `TokenModel.getUsername()` and `getPassword()` could produce NPE in multithreaded environments diff --git a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java index f7b87d0..be30dce 100644 --- a/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java +++ b/src/main/java/de/stklcode/jvault/connector/HTTPVaultConnector.java @@ -514,7 +514,7 @@ public class HTTPVaultConnector implements VaultConnector { } @Override - public final List listAppRoleSecretss(final String roleName) throws VaultConnectorException { + public final List listAppRoleSecrets(final String roleName) throws VaultConnectorException { if (!isAuthorized()) throw new AuthorizationRequiredException(); diff --git a/src/main/java/de/stklcode/jvault/connector/VaultConnector.java b/src/main/java/de/stklcode/jvault/connector/VaultConnector.java index 6579fba..a66c253 100644 --- a/src/main/java/de/stklcode/jvault/connector/VaultConnector.java +++ b/src/main/java/de/stklcode/jvault/connector/VaultConnector.java @@ -325,8 +325,21 @@ public interface VaultConnector extends AutoCloseable { * @param roleName The role name * @return List of roles * @throws VaultConnectorException on error + * @deprecated Use {@link #listAppRoleSecrets(String)}}. Will be removed in 0.7.0! */ - List listAppRoleSecretss(final String roleName) throws VaultConnectorException; + @Deprecated + default List listAppRoleSecretss(final String roleName) throws VaultConnectorException { + return listAppRoleSecrets(roleName); + } + + /** + * List existing (accessible) secret IDs for AppRole role. + * + * @param roleName The role name + * @return List of roles + * @throws VaultConnectorException on error + */ + List listAppRoleSecrets(final String roleName) throws VaultConnectorException; /** * Register User-ID with App-ID. diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 0121746..fec5d65 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -559,7 +559,7 @@ public class HTTPVaultConnectorTest { } try { - connector.listAppRoleSecretss(""); + connector.listAppRoleSecrets(""); fail("Expected exception not thrown"); } catch (Exception e) { assertThat("Unexpected exception class", e, is(instanceOf(AuthorizationRequiredException.class))); @@ -580,7 +580,7 @@ public class HTTPVaultConnectorTest { /* Check secret IDs */ try { - List res = connector.listAppRoleSecretss(APPROLE_ROLE_NAME); + List res = connector.listAppRoleSecrets(APPROLE_ROLE_NAME); assertThat("Unexpected number of AppRole secrets", res, hasSize(1)); assertThat("Pre-configured AppRole secret not listed", res, contains(APPROLE_SECRET_ACCESSOR)); } catch (VaultConnectorException e) {