From 8d0f64fd93dc3c7eee2a339f854e93b73686bd05 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 6 Dec 2018 22:09:13 +0100 Subject: [PATCH] Add property to disable WritableEnvironmentEndpoint. Fixes #432. (#453) --- .../META-INF/additional-spring-configuration-metadata.json | 6 ++++++ .../WritableEnvironmentEndpointAutoConfiguration.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 04e0911a..bce10121 100644 --- a/spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -41,6 +41,12 @@ "name": "spring.cloud.discovery.client.composite-indicator.enabled", "description": "Enables discovery client composite health indicator.", "type": "java.lang.Boolean" + }, + { + "defaultValue": true, + "name": "management.endpoint.env.post.enabled", + "description": "Enables writable environment endpoint.", + "type": "java.lang.Boolean" } ] } \ No newline at end of file diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java index dedfb4e2..aa2e62ce 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java @@ -10,6 +10,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.context.environment.EnvironmentManager; import org.springframework.cloud.context.environment.WritableEnvironmentEndpoint; @@ -31,6 +32,7 @@ import org.springframework.core.env.Environment; @AutoConfigureBefore(EnvironmentEndpointAutoConfiguration.class) @AutoConfigureAfter(LifecycleMvcEndpointAutoConfiguration.class) @EnableConfigurationProperties({ EnvironmentEndpointProperties.class }) +@ConditionalOnProperty(value = "management.endpoint.env.post.enabled", matchIfMissing = true) public class WritableEnvironmentEndpointAutoConfiguration { private final EnvironmentEndpointProperties properties;