diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameters.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameters.java index f4bb010390..a9b173c3ce 100644 --- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameters.java +++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameters.java @@ -197,10 +197,7 @@ public class SupportedParameters { REGISTER_SERVICE_URL, REGISTER_SERVICE_URL_SERVICE_NAME, REGISTER_SERVICE_URL_SERVICE_URL, MODULE_CONFIG, MANAGED, PATH, APPS_UPLOAD_TIMEOUT, APPS_TASK_EXECUTION_TIMEOUT, - APPS_START_TIMEOUT, APPS_STAGE_TIMEOUT, - READINESS_HEALTH_CHECK_HTTP_ENDPOINT, - READINESS_HEALTH_CHECK_INVOCATION_TIMEOUT, READINESS_HEALTH_CHECK_TYPE, - READINESS_HEALTH_CHECK_INTERVAL, DELETE_SERVICE_KEY_AFTER_DEPLOYMENT); + APPS_START_TIMEOUT, APPS_STAGE_TIMEOUT, DELETE_SERVICE_KEY_AFTER_DEPLOYMENT); public static final Set RESOURCE_PARAMETERS = Set.of(APPLY_NAMESPACE, SERVICE_CONFIG, SYSLOG_DRAIN_URL, DEFAULT_CONTAINER_NAME, DEFAULT_SERVICE_NAME, DEFAULT_XS_APP_NAME, SERVICE, SERVICE_KEYS, diff --git a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameterTest.java b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameterTest.java index a5522aa842..6285baa1a5 100644 --- a/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameterTest.java +++ b/multiapps-controller-core/src/test/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameterTest.java @@ -36,6 +36,11 @@ public class SupportedParameterTest { SupportedParameters.VCAP_SERVICES_ENV, SupportedParameters.USER_PROVIDED_ENV, SupportedParameters.NO_HOSTNAME); + private static final Set PLANNED_FUTURE_PARAMETERS = Set.of( + SupportedParameters.READINESS_HEALTH_CHECK_HTTP_ENDPOINT, + SupportedParameters.READINESS_HEALTH_CHECK_INVOCATION_TIMEOUT, SupportedParameters.READINESS_HEALTH_CHECK_TYPE, + SupportedParameters.READINESS_HEALTH_CHECK_INTERVAL); + @Test public void allFieldsShouldBeWhitelisted() throws IllegalAccessException { Set supportedParameters = getSupportedParameters(); @@ -73,6 +78,7 @@ private void fillWithNonEntitySpecificSupportedParameters(Set supportedP supportedParameters.addAll(GENERAL_PARAMETERS); supportedParameters.addAll(CONFIGURATION_REFERENCE_PARAMETERS); supportedParameters.addAll(NESTED_PARAMETERS); + supportedParameters.addAll(PLANNED_FUTURE_PARAMETERS); } private Collection discoverAllParameterConstants() throws IllegalAccessException {