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

Temporarily rename 'additional_permissions' request field back to 'access_control_entries'.

Browse Source
This commit is contained in:
Scott Frederick
2017-06-01 14:21:11 -05:00
parent 9ffed3dbbb
commit c3f8efbb92
10 changed files with 33 additions and 27 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,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<T> extends CredHubRequest {
private T value;
@JsonProperty(value="access_control_entries")
private List<AdditionalPermission> additionalPermissions;
/**

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

@@ -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"));
}
}

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("$.additional_permissions"));
assertThat(jsonValue, hasNoJsonPath("$.access_control_entries"));
}
}

7
spring-credhub-core/src/test/java/org/springframework/credhub/support/certificate/CertificateCredentialRequestUnitTests.java
View File

@@ -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);
}
}

3
spring-credhub-core/src/test/java/org/springframework/credhub/support/json/JsonCredentialRequestUnitTests.java
View File

@@ -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);
}
}

4
spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordCredentialRequestUnitTests.java
View File

@@ -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);
}
}

6
spring-credhub-core/src/test/java/org/springframework/credhub/support/rsa/RsaCredentialRequestUnitTests.java
View File

@@ -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)

6
spring-credhub-core/src/test/java/org/springframework/credhub/support/ssh/SshCredentialRequestUnitTests.java
View File

@@ -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)

4
spring-credhub-core/src/test/java/org/springframework/credhub/support/user/UserCredentialRequestUnitTests.java
View File

@@ -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);
}
}

5
spring-credhub-core/src/test/java/org/springframework/credhub/support/value/ValueCredentialRequestUnitTests.java
View File

@@ -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);
}
}