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

Rename 'access_control_entries' request field to 'additional_permissions'.

Browse Source
This commit is contained in:
Scott Frederick
2017-06-09 16:07:35 -05:00
parent 875060222f
commit 578f3b635d
4 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java
View File

@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.springframework.util.Assert;
/**
@@ -33,7 +32,6 @@ import org.springframework.util.Assert;
*/
public class CredentialRequest<T> extends CredHubRequest {
private T value;
@JsonProperty(value="access_control_entries")
private List<AdditionalPermission> additionalPermissions;
/**

18
spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialRequestUnitTestsBase.java
View File

@@ -52,9 +52,9 @@ public abstract class CredentialRequestUnitTestsBase {
String jsonValue = serializeToJson(requestBuilder);
assertThat(jsonValue,
allOf(hasJsonPath("$.access_control_entries[0].actor",
allOf(hasJsonPath("$.additional_permissions[0].actor",
equalTo("mtls-app:app-id")),
hasJsonPath("$.access_control_entries[0].operations[0]",
hasJsonPath("$.additional_permissions[0].operations[0]",
equalTo("read"))));
}
@@ -73,16 +73,16 @@ public abstract class CredentialRequestUnitTestsBase {
String jsonValue = serializeToJson(requestBuilder);
assertThat(jsonValue, allOf(
hasJsonPath("$.access_control_entries[0].actor",
hasJsonPath("$.additional_permissions[0].actor",
equalTo("mtls-app:app1-id")),
hasJsonPath("$.access_control_entries[0].operations[0]", equalTo("read")),
hasJsonPath("$.access_control_entries[0].operations[1]",
hasJsonPath("$.additional_permissions[0].operations[0]", equalTo("read")),
hasJsonPath("$.additional_permissions[0].operations[1]",
equalTo("write")),
hasJsonPath("$.access_control_entries[1].actor",
hasJsonPath("$.additional_permissions[1].actor",
equalTo("mtls-app:app2-id")),
hasJsonPath("$.access_control_entries[1].operations[0]",
hasJsonPath("$.additional_permissions[1].operations[0]",
equalTo("write")),
hasJsonPath("$.access_control_entries[1].operations[1]",
hasJsonPath("$.additional_permissions[1].operations[1]",
equalTo("read"))));
}
@@ -94,6 +94,6 @@ public abstract class CredentialRequestUnitTestsBase {
}
protected void assertNoPermissions(String jsonValue) {
assertThat(jsonValue, hasNoJsonPath("$.access_control_entries"));
assertThat(jsonValue, hasNoJsonPath("$.additional_permissions"));
}
}

2
spring-credhub-core/src/test/java/org/springframework/credhub/support/ParametersRequestUnitTestsBase.java
View File

@@ -49,6 +49,6 @@ public abstract class ParametersRequestUnitTestsBase {
allOf(hasJsonPath("$.overwrite", equalTo(overwrite)),
hasJsonPath("$.name", equalTo(name)),
hasJsonPath("$.type", equalTo(type))));
assertThat(jsonValue, hasNoJsonPath("$.access_control_entries"));
assertThat(jsonValue, hasNoJsonPath("$.additional_permissions"));
}
}

19
spring-credhub-demo/src/main/java/org/springframework/credhub/demo/CredHubDemoController.java
View File

@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Value;
@@ -31,10 +32,8 @@ import org.springframework.credhub.support.CredentialName;
import org.springframework.credhub.support.CredentialSummary;
import org.springframework.credhub.support.json.JsonCredential;
import org.springframework.credhub.support.json.JsonCredentialRequest;
import org.springframework.credhub.support.json.JsonCredentialRequest.JsonCredentialRequestBuilder;
import org.springframework.credhub.support.SimpleCredentialName;
import org.springframework.credhub.support.VcapServicesData;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -80,17 +79,15 @@ public class CredHubDemoController {
private CredentialDetails<JsonCredential> writeCredentials(Map<String, Object> value, Results results) {
try {
JsonCredentialRequestBuilder requestBuilder = JsonCredentialRequest.builder()
JsonCredentialRequest request = JsonCredentialRequest.builder()
.overwrite(true)
.name(new SimpleCredentialName("spring-credhub", "demo", "credentials_json"))
.value(value);
if (StringUtils.hasText(appId)) {
requestBuilder.additionalPermission(
AdditionalPermission.builder().app(appId).operation(READ).build());
}
JsonCredentialRequest request = requestBuilder.build();
.value(value)
.additionalPermission(AdditionalPermission.builder()
.app(UUID.randomUUID().toString())
.operation(READ)
.build())
.build();
CredentialDetails<JsonCredential> credentialDetails = credHubTemplate.write(request);
saveResults(results, "Successfully wrote credentials: ", credentialDetails);