Skip to content

Commit e4aceb6

Browse files
authored
Move health check from supported param (#1637)
1 parent 4081ad7 commit e4aceb6

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameters.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,7 @@ public class SupportedParameters {
197197
REGISTER_SERVICE_URL, REGISTER_SERVICE_URL_SERVICE_NAME,
198198
REGISTER_SERVICE_URL_SERVICE_URL, MODULE_CONFIG, MANAGED, PATH,
199199
APPS_UPLOAD_TIMEOUT, APPS_TASK_EXECUTION_TIMEOUT,
200-
APPS_START_TIMEOUT, APPS_STAGE_TIMEOUT,
201-
READINESS_HEALTH_CHECK_HTTP_ENDPOINT,
202-
READINESS_HEALTH_CHECK_INVOCATION_TIMEOUT, READINESS_HEALTH_CHECK_TYPE,
203-
READINESS_HEALTH_CHECK_INTERVAL, DELETE_SERVICE_KEY_AFTER_DEPLOYMENT);
200+
APPS_START_TIMEOUT, APPS_STAGE_TIMEOUT, DELETE_SERVICE_KEY_AFTER_DEPLOYMENT);
204201

205202
public static final Set<String> RESOURCE_PARAMETERS = Set.of(APPLY_NAMESPACE, SERVICE_CONFIG, SYSLOG_DRAIN_URL, DEFAULT_CONTAINER_NAME,
206203
DEFAULT_SERVICE_NAME, DEFAULT_XS_APP_NAME, SERVICE, SERVICE_KEYS,

multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameterTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ public class SupportedParameterTest {
3636
SupportedParameters.VCAP_SERVICES_ENV,
3737
SupportedParameters.USER_PROVIDED_ENV, SupportedParameters.NO_HOSTNAME);
3838

39+
private static final Set<String> PLANNED_FUTURE_PARAMETERS = Set.of(
40+
SupportedParameters.READINESS_HEALTH_CHECK_HTTP_ENDPOINT,
41+
SupportedParameters.READINESS_HEALTH_CHECK_INVOCATION_TIMEOUT, SupportedParameters.READINESS_HEALTH_CHECK_TYPE,
42+
SupportedParameters.READINESS_HEALTH_CHECK_INTERVAL);
43+
3944
@Test
4045
public void allFieldsShouldBeWhitelisted() throws IllegalAccessException {
4146
Set<String> supportedParameters = getSupportedParameters();
@@ -73,6 +78,7 @@ private void fillWithNonEntitySpecificSupportedParameters(Set<String> supportedP
7378
supportedParameters.addAll(GENERAL_PARAMETERS);
7479
supportedParameters.addAll(CONFIGURATION_REFERENCE_PARAMETERS);
7580
supportedParameters.addAll(NESTED_PARAMETERS);
81+
supportedParameters.addAll(PLANNED_FUTURE_PARAMETERS);
7682
}
7783

7884
private Collection<String> discoverAllParameterConstants() throws IllegalAccessException {

0 commit comments

Comments
 (0)