Skip to content

Parse service-key credential references in dynamic parameters #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stiv03 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Parse service-key credential references in dynamic parameters #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/util/DynamicParameterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ public final class DynamicParameterUtil {
public static final String PATTERN_FOR_DYNAMIC_PARAMETERS = "'{'ds/{0}/{1}'}'";
public static final String REGEX_PATTERN_FOR_DYNAMIC_PARAMETERS = "^\\{ds[A-Za-z0-9_\\-\\.\\/]+\\}$";

private static final String SERVICE_KEY_REFERENCE_PREFIX = "service-keys.";
private static final String CREDENTIALS_SEPARATOR = ".credentials.";

private DynamicParameterUtil() {
}

Expand All @@ -16,4 +19,16 @@ public static String getParameterName(String dynamicParameter) {
return dynamicParameter.substring(dynamicParameter.lastIndexOf("/") + 1, dynamicParameter.lastIndexOf("}"));
}

public static boolean isServiceKeyCredentialReference(String parameterName) {
return parameterName.startsWith(SERVICE_KEY_REFERENCE_PREFIX) && parameterName.contains(CREDENTIALS_SEPARATOR);
}

public static String getServiceKeyName(String parameterName) {
return parameterName.substring(SERVICE_KEY_REFERENCE_PREFIX.length(), parameterName.indexOf(CREDENTIALS_SEPARATOR));
}

public static String getCredentialFieldPath(String parameterName) {
return parameterName.substring(parameterName.indexOf(CREDENTIALS_SEPARATOR) + CREDENTIALS_SEPARATOR.length());
}

}
38 changes: 38 additions & 0 deletions ...iapps-mta/src/test/java/org/cloudfoundry/multiapps/mta/util/DynamicParameterUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.cloudfoundry.multiapps.mta.util;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.stream.Stream;
Expand Down Expand Up @@ -34,4 +35,41 @@ void testMatchDynamicParameter(String dynamicParameter, String relationshipName,
assertTrue(dynamicParameter.matches(DynamicParameterUtil.REGEX_PATTERN_FOR_DYNAMIC_PARAMETERS));
}

static Stream<Arguments> getServiceKeyCredentialParameters() {
// dynamicParameter, relationshipName, serviceKeyName, credentialFieldPath
return Stream.of(
Arguments.of("{ds/ztis-config/service-keys.my-key.credentials.issuer}", "ztis-config", "my-key", "issuer"),
Arguments.of("{ds/ztis-config/service-keys.my-key.credentials.endpoints.url}", "ztis-config", "my-key", "endpoints.url"));
}

@ParameterizedTest
@MethodSource(value = "getServiceKeyCredentialParameters")
void testIsServiceKeyCredentialReference(String dynamicParameter, String relationshipName, String serviceKeyName,
String credentialFieldPath) {
String parameterName = DynamicParameterUtil.getParameterName(dynamicParameter);
assertTrue(DynamicParameterUtil.isServiceKeyCredentialReference(parameterName));
}

@ParameterizedTest
@MethodSource(value = "getParameters")
void testServiceGuidIsNotServiceKeyCredentialReference(String dynamicParameter, String relationshipName, String parameterName) {
assertFalse(DynamicParameterUtil.isServiceKeyCredentialReference(parameterName));
}

@ParameterizedTest
@MethodSource(value = "getServiceKeyCredentialParameters")
void testParseOfServiceKeyName(String dynamicParameter, String relationshipName, String serviceKeyName,
String credentialFieldPath) {
String parameterName = DynamicParameterUtil.getParameterName(dynamicParameter);
assertEquals(serviceKeyName, DynamicParameterUtil.getServiceKeyName(parameterName));
}

@ParameterizedTest
@MethodSource(value = "getServiceKeyCredentialParameters")
void testParseOfCredentialFieldPath(String dynamicParameter, String relationshipName, String serviceKeyName,
String credentialFieldPath) {
String parameterName = DynamicParameterUtil.getParameterName(dynamicParameter);
assertEquals(credentialFieldPath, DynamicParameterUtil.getCredentialFieldPath(parameterName));
}

}
Loading