Spring/spring-credhub
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Zee-Khan-master'

Browse Source
This commit is contained in:
Scott Frederick
2018-10-22 17:45:44 -05:00
parent db9a54bf52 5150ea967e
commit 8bc3b4744d
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubPermissionsOperations.java
View File

@@ -41,9 +41,8 @@ public interface CredHubPermissionsOperations {
*
* @param name the name of the credential; must not be {@literal null}
* @param permissions a collection of permissions to add
* @return the collection of permissions associated with the credential
*/
List<CredentialPermission> addPermissions(final CredentialName name, final CredentialPermission... permissions);
void addPermissions(final CredentialName name, final CredentialPermission... permissions);
/**
* Delete a permission associated with a credential.

18
spring-credhub-core/src/main/java/org/springframework/credhub/core/CredHubPermissionsTemplate.java
View File

@@ -67,21 +67,19 @@ public class CredHubPermissionsTemplate implements CredHubPermissionsOperations
}
@Override
public List<CredentialPermission> addPermissions(final CredentialName name,
final CredentialPermission... permissions) {
public void addPermissions(final CredentialName name,
final CredentialPermission... permissions) {
Assert.notNull(name, "credential name must not be null");
final CredentialPermissions credentialPermissions = new CredentialPermissions(name, permissions);
return credHubOperations.doWithRest(new RestOperationsCallback<List<CredentialPermission>>() {
credHubOperations.doWithRest(new RestOperationsCallback<Void>() {
@Override
public List<CredentialPermission> doWithRestOperations(RestOperations restOperations) {
ResponseEntity<CredentialPermissions> response =
restOperations.exchange(PERMISSIONS_URL_PATH, POST,
new HttpEntity<>(credentialPermissions),
CredentialPermissions.class);
return response.getBody().getPermissions();
public Void doWithRestOperations(RestOperations restOperations) {
restOperations.exchange(PERMISSIONS_URL_PATH, POST,
new HttpEntity<>(credentialPermissions),
CredentialPermissions.class);
return null;
}
});
}

14
spring-credhub-core/src/test/java/org/springframework/credhub/core/CredHubPermissionsTemplateUnitTests.java
View File

@@ -98,17 +98,11 @@ public class CredHubPermissionsTemplateUnitTests {
.operation(Operation.DELETE)
.build();
CredentialPermissions expectedResponse = new CredentialPermissions(NAME, permission1, permission2);
credHubTemplate.addPermissions(NAME, permission1, permission2);
when(restTemplate.exchange(PERMISSIONS_URL_PATH, POST,
new HttpEntity<>(expectedResponse), CredentialPermissions.class))
.thenReturn(new ResponseEntity<>(expectedResponse, OK));
List<CredentialPermission> response = credHubTemplate.addPermissions(NAME, permission1, permission2);
assertThat(response).isNotNull();
assertThat(response).hasSize(expectedResponse.getPermissions().size());
assertThat(response).isEqualTo(expectedResponse.getPermissions());
verify(restTemplate).exchange(PERMISSIONS_URL_PATH, POST,
new HttpEntity<>(new CredentialPermissions(NAME, permission1, permission2)),
CredentialPermissions.class);
}
@Test