From e1e23bced2026c3e51311c6598c214917c1f8a99 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Thu, 25 May 2017 18:07:44 -0500 Subject: [PATCH] Only force "/c" prefix on credential names for service broker names. --- .../credhub/support/CredentialName.java | 6 +++--- .../support/ServiceInstanceCredentialName.java | 2 +- .../support/CredentialSummaryDataUnitTests.java | 12 ++++++------ .../credhub/support/JsonParsingUnitTestsBase.java | 4 ++-- .../support/SimpleCredentialNameUnitTests.java | 6 +++--- .../CertificateCredentialRequestUnitTests.java | 6 +++--- .../support/json/JsonCredentialRequestUnitTests.java | 2 +- .../password/PasswordCredentialRequestUnitTests.java | 4 ++-- .../password/PasswordParametersRequestUnitTests.java | 4 ++-- .../support/rsa/RsaCredentialRequestUnitTests.java | 6 +++--- .../support/ssh/SshCredentialRequestUnitTests.java | 6 +++--- .../support/user/UserCredentialRequestUnitTests.java | 4 ++-- .../value/ValueCredentialRequestUnitTests.java | 4 ++-- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialName.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialName.java index 537028e..5509ae7 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialName.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/CredentialName.java @@ -47,8 +47,8 @@ public class CredentialName { Assert.isTrue(split.length > 2, "name must include at least one segment separated by '/'"); - // remove the "/c/" prefix - this.segments = Arrays.copyOfRange(split, 2, split.length); + // remove the "/" prefix + this.segments = Arrays.copyOfRange(split, 1, split.length); } /** @@ -68,7 +68,7 @@ public class CredentialName { */ @JsonInclude public String getName() { - return "/c/" + StringUtils.arrayToDelimitedString(segments, "/"); + return "/" + StringUtils.arrayToDelimitedString(segments, "/"); } @Override diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/ServiceInstanceCredentialName.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/ServiceInstanceCredentialName.java index c848d21..48e5102 100644 --- a/spring-credhub-core/src/main/java/org/springframework/credhub/support/ServiceInstanceCredentialName.java +++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/ServiceInstanceCredentialName.java @@ -45,7 +45,7 @@ public class ServiceInstanceCredentialName extends CredentialName { */ ServiceInstanceCredentialName(String serviceBrokerName, String serviceOfferingName, String serviceBindingId, String credentialName) { - super(serviceBrokerName, serviceOfferingName, serviceBindingId, credentialName); + super("c", serviceBrokerName, serviceOfferingName, serviceBindingId, credentialName); } /** diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialSummaryDataUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialSummaryDataUnitTests.java index 8cef82a..114bdbe 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialSummaryDataUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/CredentialSummaryDataUnitTests.java @@ -32,15 +32,15 @@ public class CredentialSummaryDataUnitTests extends JsonParsingUnitTestsBase { String json = "{\n" + " \"credentials\": [\n" + " {\n" + - " \"name\": \"/c/deploy123/example1\",\n" + + " \"name\": \"/deploy123/example1\",\n" + " \"version_created_at\": \"" + TEST_DATE_STRING + "\"\n" + " },\n" + " {\n" + - " \"name\": \"/c/deploy123/example2\",\n" + + " \"name\": \"/deploy123/example2\",\n" + " \"version_created_at\": \"" + TEST_DATE_STRING + "\"\n" + " },\n" + " {\n" + - " \"name\": \"/c/deploy123/example3\",\n" + + " \"name\": \"/deploy123/example3\",\n" + " \"version_created_at\": \"" + TEST_DATE_STRING + "\"\n" + " }\n" + " ]\n" + @@ -53,11 +53,11 @@ public class CredentialSummaryDataUnitTests extends JsonParsingUnitTestsBase { List credentials = response.getCredentials(); assertThat(credentials.get(0).getName().getName(), - equalTo("/c/deploy123/example1")); + equalTo("/deploy123/example1")); assertThat(credentials.get(1).getName().getName(), - equalTo("/c/deploy123/example2")); + equalTo("/deploy123/example2")); assertThat(credentials.get(2).getName().getName(), - equalTo("/c/deploy123/example3")); + equalTo("/deploy123/example3")); for (CredentialSummary credential : credentials) { assertThat(credential.getVersionCreatedAt(), equalTo(testDate)); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonParsingUnitTestsBase.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonParsingUnitTestsBase.java index e8ce027..2cc74f4 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonParsingUnitTestsBase.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/JsonParsingUnitTestsBase.java @@ -31,7 +31,7 @@ public abstract class JsonParsingUnitTestsBase { protected final String CREDENTIAL_DETAIL_TEMPLATE = "{" + " \"version_created_at\": \"" + TEST_DATE_STRING + "\"," + " \"id\": \"80cbb13f-7562-4e72-92de-f3ccf69eaa59\"," + - " \"name\": \"/c/service-broker-name/service-instance-name/binding-id/credentials-json\"," + + " \"name\": \"/service-broker-name/service-instance-name/binding-id/credentials-json\"," + " %s" + "}"; @@ -76,6 +76,6 @@ public abstract class JsonParsingUnitTestsBase { assertThat(data.getVersionCreatedAt(), equalTo(testDate)); assertThat(data.getId(), equalTo("80cbb13f-7562-4e72-92de-f3ccf69eaa59")); assertThat(data.getName().getName(), equalTo( - "/c/service-broker-name/service-instance-name/binding-id/credentials-json")); + "/service-broker-name/service-instance-name/binding-id/credentials-json")); } } diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/SimpleCredentialNameUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/SimpleCredentialNameUnitTests.java index 60c8aeb..103767c 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/SimpleCredentialNameUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/SimpleCredentialNameUnitTests.java @@ -29,13 +29,13 @@ public class SimpleCredentialNameUnitTests { CredentialName credentialName = new SimpleCredentialName("myorg", "example", "credential-name"); - assertThat(credentialName.getName(), equalTo("/c/myorg/example/credential-name")); + assertThat(credentialName.getName(), equalTo("/myorg/example/credential-name")); } @Test public void simpleNameIsParsed() { - CredentialName credentialName = new CredentialName("/c/myorg/example/credential-name"); + CredentialName credentialName = new CredentialName("/myorg/example/credential-name"); - assertThat(credentialName.getName(), equalTo("/c/myorg/example/credential-name")); + assertThat(credentialName.getName(), equalTo("/myorg/example/credential-name")); } } \ No newline at end of file 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 2c62e9e..56fc4ec 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 @@ -40,7 +40,7 @@ public class CertificateCredentialRequestUnitTests extends CredentialRequestUnit assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("certificate")), hasJsonPath("$.value.certificate", equalTo("cert")), hasJsonPath("$.value.ca", equalTo("ca")), @@ -57,7 +57,7 @@ public class CertificateCredentialRequestUnitTests extends CredentialRequestUnit assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("certificate")), hasJsonPath("$.value.certificate", equalTo("cert")), hasNoJsonPath("$.value.ca"), @@ -74,7 +74,7 @@ public class CertificateCredentialRequestUnitTests extends CredentialRequestUnit assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("certificate")), hasNoJsonPath("$.value.certificate"), hasJsonPath("$.value.ca", equalTo("ca")), 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 01a16eb..50810c1 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 @@ -48,7 +48,7 @@ public class JsonCredentialRequestUnitTests extends CredentialRequestUnitTestsBa assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(false)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("json")), hasJsonPath("$.value.data", equalTo("value")), hasJsonPath("$.value.test", equalTo(true)))); 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 1327154..2d87623 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 @@ -44,7 +44,7 @@ public class PasswordCredentialRequestUnitTests extends CredentialRequestUnitTes assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("password")), hasJsonPath("$.value", equalTo("secret")))); @@ -62,7 +62,7 @@ public class PasswordCredentialRequestUnitTests extends CredentialRequestUnitTes assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("password")), hasJsonPath("$.value", equalTo("secret")))); diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordParametersRequestUnitTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordParametersRequestUnitTests.java index 47a00fd..58bddb5 100644 --- a/spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordParametersRequestUnitTests.java +++ b/spring-credhub-core/src/test/java/org/springframework/credhub/support/password/PasswordParametersRequestUnitTests.java @@ -46,7 +46,7 @@ public class PasswordParametersRequestUnitTests extends ParametersRequestUnitTes assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("password")), hasJsonPath("$.parameters.length", equalTo(20)), hasJsonPath("$.parameters.exclude_lower", equalTo(true)), @@ -68,7 +68,7 @@ public class PasswordParametersRequestUnitTests extends ParametersRequestUnitTes assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("password")), hasNoJsonPath("$.parameters.length"), hasNoJsonPath("$.parameters.exclude_lower"), 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 5ca2656..d57a321 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 @@ -40,7 +40,7 @@ public class RsaCredentialRequestUnitTests extends CredentialRequestUnitTestsBas assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("rsa")), hasJsonPath("$.value.public_key", equalTo("public-key")), hasJsonPath("$.value.private_key", equalTo("private-key")))); @@ -56,7 +56,7 @@ public class RsaCredentialRequestUnitTests extends CredentialRequestUnitTestsBas assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("rsa")), hasJsonPath("$.value.public_key", equalTo("public-key")), hasNoJsonPath("$.value.private_key"))); @@ -72,7 +72,7 @@ public class RsaCredentialRequestUnitTests extends CredentialRequestUnitTestsBas assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("rsa")), hasNoJsonPath("$.value.public_key"), hasJsonPath("$.value.private_key", equalTo("private-key")))); 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 5b3964a..a6912c3 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 @@ -40,7 +40,7 @@ public class SshCredentialRequestUnitTests extends CredentialRequestUnitTestsBas assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("ssh")), hasJsonPath("$.value.public_key", equalTo("public-key")), hasJsonPath("$.value.private_key", equalTo("private-key")))); @@ -56,7 +56,7 @@ public class SshCredentialRequestUnitTests extends CredentialRequestUnitTestsBas assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("ssh")), hasJsonPath("$.value.public_key", equalTo("public-key")), hasNoJsonPath("$.value.private_key"))); @@ -72,7 +72,7 @@ public class SshCredentialRequestUnitTests extends CredentialRequestUnitTestsBas assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("ssh")), hasNoJsonPath("$.value.public_key"), hasJsonPath("$.value.private_key", equalTo("private-key")))); 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 14683c7..fcbca07 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 @@ -44,7 +44,7 @@ public class UserCredentialRequestUnitTests extends CredentialRequestUnitTestsBa assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("user")), hasJsonPath("$.value.username", equalTo("myname")), hasJsonPath("$.value.password", equalTo("secret")))); @@ -63,7 +63,7 @@ public class UserCredentialRequestUnitTests extends CredentialRequestUnitTestsBa assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("user")), hasNoJsonPath("$.value.username"), hasJsonPath("$.value.password", equalTo("secret")))); 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 d1f2fb0..9071dc9 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 @@ -44,7 +44,7 @@ public class ValueCredentialRequestUnitTests extends CredentialRequestUnitTestsB assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("value")), hasJsonPath("$.value", equalTo("somevalue")))); @@ -62,7 +62,7 @@ public class ValueCredentialRequestUnitTests extends CredentialRequestUnitTestsB assertThat(jsonValue, allOf(hasJsonPath("$.overwrite", equalTo(true)), - hasJsonPath("$.name", equalTo("/c/example/credential")), + hasJsonPath("$.name", equalTo("/example/credential")), hasJsonPath("$.type", equalTo("value")), hasJsonPath("$.value", equalTo("somevalue"))));