From c3f8efbb92ada01b79d63f942e6c89a60b0b46cd Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Thu, 1 Jun 2017 14:21:11 -0500 Subject: [PATCH] Temporarily rename 'additional_permissions' request field back to 'access_control_entries'. --- .../credhub/support/CredentialRequest.java | 2 ++ .../CredentialRequestUnitTestsBase.java | 21 ++++++++++++------- .../ParametersRequestUnitTestsBase.java | 2 +- ...CertificateCredentialRequestUnitTests.java | 7 ++++--- .../json/JsonCredentialRequestUnitTests.java | 3 +-- .../PasswordCredentialRequestUnitTests.java | 4 ++-- .../rsa/RsaCredentialRequestUnitTests.java | 6 +++--- .../ssh/SshCredentialRequestUnitTests.java | 6 +++--- .../user/UserCredentialRequestUnitTests.java | 4 ++-- .../ValueCredentialRequestUnitTests.java | 5 ++--- 10 files changed, 33 insertions(+), 27 deletions(-) diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java index 84e367e..4a29e19 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialRequest.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; import org.springframework.util.Assert; /** @@ -32,6 +33,7 @@ import org.springframework.util.Assert; */ public class CredentialRequest extends CredHubRequest { private T value; + @JsonProperty(value="access_control_entries") private List additionalPermissions; /** diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialRequestUnitTestsBase.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialRequestUnitTestsBase.java index e010fff..03a17a0 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialRequestUnitTestsBase.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialRequestUnitTestsBase.java @@ -29,6 +29,7 @@ import static org.junit.Assert.assertThat; import static org.springframework.credhub.support.AdditionalPermission.Operation.READ; import static org.springframework.credhub.support.AdditionalPermission.Operation.WRITE; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; +import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.isJson; public abstract class CredentialRequestUnitTestsBase { @@ -51,9 +52,9 @@ public abstract class CredentialRequestUnitTestsBase { String jsonValue = serializeToJson(requestBuilder); assertThat(jsonValue, - allOf(hasJsonPath("$.additional_permissions[0].actor", + allOf(hasJsonPath("$.access_control_entries[0].actor", equalTo("mtls-app:app-id")), - hasJsonPath("$.additional_permissions[0].operations[0]", + hasJsonPath("$.access_control_entries[0].operations[0]", equalTo("read")))); } @@ -72,16 +73,16 @@ public abstract class CredentialRequestUnitTestsBase { String jsonValue = serializeToJson(requestBuilder); assertThat(jsonValue, allOf( - hasJsonPath("$.additional_permissions[0].actor", + hasJsonPath("$.access_control_entries[0].actor", equalTo("mtls-app:app1-id")), - hasJsonPath("$.additional_permissions[0].operations[0]", equalTo("read")), - hasJsonPath("$.additional_permissions[0].operations[1]", + hasJsonPath("$.access_control_entries[0].operations[0]", equalTo("read")), + hasJsonPath("$.access_control_entries[0].operations[1]", equalTo("write")), - hasJsonPath("$.additional_permissions[1].actor", + hasJsonPath("$.access_control_entries[1].actor", equalTo("mtls-app:app2-id")), - hasJsonPath("$.additional_permissions[1].operations[0]", + hasJsonPath("$.access_control_entries[1].operations[0]", equalTo("write")), - hasJsonPath("$.additional_permissions[1].operations[1]", + hasJsonPath("$.access_control_entries[1].operations[1]", equalTo("read")))); } @@ -91,4 +92,8 @@ public abstract class CredentialRequestUnitTestsBase { assertThat(jsonValue, isJson()); return jsonValue; } + + protected void assertNoPermissions(String jsonValue) { + assertThat(jsonValue, hasNoJsonPath("$.access_control_entries")); + } } diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/ParametersRequestUnitTestsBase.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/ParametersRequestUnitTestsBase.java index 2a3c8ec..7c96a55 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/ParametersRequestUnitTestsBase.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/ParametersRequestUnitTestsBase.java @@ -49,6 +49,6 @@ public abstract class ParametersRequestUnitTestsBase { allOf(hasJsonPath("$.overwrite", equalTo(overwrite)), hasJsonPath("$.name", equalTo(name)), hasJsonPath("$.type", equalTo(type)))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertThat(jsonValue, hasNoJsonPath("$.access_control_entries")); } } diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/certificate/CertificateCredentialRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/certificate/CertificateCredentialRequestUnitTests.java index 56fc4ec..d33c48c 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/certificate/CertificateCredentialRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/certificate/CertificateCredentialRequestUnitTests.java @@ -46,7 +46,7 @@ public class CertificateCredentialRequestUnitTests extends CredentialRequestUnit hasJsonPath("$.value.ca", equalTo("ca")), hasJsonPath("$.value.private_key", equalTo("private-key")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -63,7 +63,7 @@ public class CertificateCredentialRequestUnitTests extends CredentialRequestUnit hasNoJsonPath("$.value.ca"), hasNoJsonPath("$.value.private_key"))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -80,7 +80,7 @@ public class CertificateCredentialRequestUnitTests extends CredentialRequestUnit hasJsonPath("$.value.ca", equalTo("ca")), hasJsonPath("$.value.private_key", equalTo("private-key")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test(expected = IllegalArgumentException.class) @@ -96,4 +96,5 @@ public class CertificateCredentialRequestUnitTests extends CredentialRequestUnit .overwrite(true) .value(value); } + } \ No newline at end of file diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/json/JsonCredentialRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/json/JsonCredentialRequestUnitTests.java index 50810c1..93e8ec5 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/json/JsonCredentialRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/json/JsonCredentialRequestUnitTests.java @@ -26,7 +26,6 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; -import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; public class JsonCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @@ -53,6 +52,6 @@ public class JsonCredentialRequestUnitTests extends CredentialRequestUnitTestsBa hasJsonPath("$.value.data", equalTo("value")), hasJsonPath("$.value.test", equalTo(true)))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } } \ No newline at end of file diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordCredentialRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordCredentialRequestUnitTests.java index 2d87623..4cf91ca 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordCredentialRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordCredentialRequestUnitTests.java @@ -48,7 +48,7 @@ public class PasswordCredentialRequestUnitTests extends CredentialRequestUnitTes hasJsonPath("$.type", equalTo("password")), hasJsonPath("$.value", equalTo("secret")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -66,6 +66,6 @@ public class PasswordCredentialRequestUnitTests extends CredentialRequestUnitTes hasJsonPath("$.type", equalTo("password")), hasJsonPath("$.value", equalTo("secret")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } } \ No newline at end of file diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/rsa/RsaCredentialRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/rsa/RsaCredentialRequestUnitTests.java index d57a321..f136c41 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/rsa/RsaCredentialRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/rsa/RsaCredentialRequestUnitTests.java @@ -45,7 +45,7 @@ public class RsaCredentialRequestUnitTests extends CredentialRequestUnitTestsBas hasJsonPath("$.value.public_key", equalTo("public-key")), hasJsonPath("$.value.private_key", equalTo("private-key")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -61,7 +61,7 @@ public class RsaCredentialRequestUnitTests extends CredentialRequestUnitTestsBas hasJsonPath("$.value.public_key", equalTo("public-key")), hasNoJsonPath("$.value.private_key"))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -77,7 +77,7 @@ public class RsaCredentialRequestUnitTests extends CredentialRequestUnitTestsBas hasNoJsonPath("$.value.public_key"), hasJsonPath("$.value.private_key", equalTo("private-key")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test(expected = IllegalArgumentException.class) diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/ssh/SshCredentialRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/ssh/SshCredentialRequestUnitTests.java index a6912c3..3f4a830 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/ssh/SshCredentialRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/ssh/SshCredentialRequestUnitTests.java @@ -45,7 +45,7 @@ public class SshCredentialRequestUnitTests extends CredentialRequestUnitTestsBas hasJsonPath("$.value.public_key", equalTo("public-key")), hasJsonPath("$.value.private_key", equalTo("private-key")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -61,7 +61,7 @@ public class SshCredentialRequestUnitTests extends CredentialRequestUnitTestsBas hasJsonPath("$.value.public_key", equalTo("public-key")), hasNoJsonPath("$.value.private_key"))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -77,7 +77,7 @@ public class SshCredentialRequestUnitTests extends CredentialRequestUnitTestsBas hasNoJsonPath("$.value.public_key"), hasJsonPath("$.value.private_key", equalTo("private-key")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test(expected = IllegalArgumentException.class) diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/user/UserCredentialRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/user/UserCredentialRequestUnitTests.java index fcbca07..54ed38a 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/user/UserCredentialRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/user/UserCredentialRequestUnitTests.java @@ -49,7 +49,7 @@ public class UserCredentialRequestUnitTests extends CredentialRequestUnitTestsBa hasJsonPath("$.value.username", equalTo("myname")), hasJsonPath("$.value.password", equalTo("secret")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -68,6 +68,6 @@ public class UserCredentialRequestUnitTests extends CredentialRequestUnitTestsBa hasNoJsonPath("$.value.username"), hasJsonPath("$.value.password", equalTo("secret")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } } \ No newline at end of file diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/value/ValueCredentialRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/value/ValueCredentialRequestUnitTests.java index 9071dc9..740ac36 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/value/ValueCredentialRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/value/ValueCredentialRequestUnitTests.java @@ -26,7 +26,6 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasJsonPath; -import static org.valid4j.matchers.jsonpath.JsonPathMatchers.hasNoJsonPath; public class ValueCredentialRequestUnitTests extends CredentialRequestUnitTestsBase { @@ -48,7 +47,7 @@ public class ValueCredentialRequestUnitTests extends CredentialRequestUnitTestsB hasJsonPath("$.type", equalTo("value")), hasJsonPath("$.value", equalTo("somevalue")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } @Test @@ -66,6 +65,6 @@ public class ValueCredentialRequestUnitTests extends CredentialRequestUnitTestsB hasJsonPath("$.type", equalTo("value")), hasJsonPath("$.value", equalTo("somevalue")))); - assertThat(jsonValue, hasNoJsonPath("$.additional_permissions")); + assertNoPermissions(jsonValue); } } \ No newline at end of file