Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@
** xref:server/aot-and-native-image-support.adoc[]
* xref:client.adoc[]
* xref:observability.adoc[]
* xref:configprops.adoc[]
Empty file.
6 changes: 3 additions & 3 deletions docs/modules/ROOT/partials/_configprops.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
|===
|Name | Default | Description

|spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is generated, so the source for these needs to be fixed or they will eventually come back

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@spencergibb

I also have a PR addressing this issue. Could you please take a look?
https://github.com/spring-cloud/spring-cloud-commons/pull/1770/changes

|spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that `PropertySourceBootstrapProperties#isOverrideSystemProperties()` can be used. Set to false to prevent users from changing the default accidentally. Default true.
|spring.cloud.config.charset | `+++UTF-8+++` | The charset to read the resource from the config server.
|spring.cloud.config.discovery.enabled | `+++false+++` | Flag to indicate that config server discovery is enabled (config server URL will be looked up via discovery).
|spring.cloud.config.discovery.service-id | `+++configserver+++` | Service id to locate config server.
Expand All @@ -11,9 +11,9 @@
|spring.cloud.config.initialize-on-context-refresh | `+++false+++` | Flag to initialize bootstrap configuration on context refresh event. Default false.
|spring.cloud.config.label | | The label name to use to pull remote configuration properties. The default is set on the server (generally "main" for a git based server).
|spring.cloud.config.media-type | | The Accept header media type to send to config server.
|spring.cloud.config.multiple-uri-strategy | `+++always+++` | The strategy to use when call to server fails and there are multiple URLs configured on the uri property (default {@link MultipleUriStrategy#ALWAYS}).
|spring.cloud.config.multiple-uri-strategy | `+++always+++` | The strategy to use when call to server fails and there are multiple URLs configured on the uri property (default `MultipleUriStrategy#ALWAYS`).
|spring.cloud.config.name | | Name of application used to fetch remote properties.
|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. This will only have an effect when using config first bootstrap.
|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when `PropertySourceBootstrapProperties#setAllowOverride(boolean)` is true, external properties should take the lowest priority and should not override any existing property sources (including local config files). Default false. This will only have an effect when using config first bootstrap.
|spring.cloud.config.override-system-properties | `+++true+++` | Flag to indicate that the external properties should override system properties. Default true.
|spring.cloud.config.password | | The password to use (HTTP Basic) when contacting the remote server.
|spring.cloud.config.profile | `+++default+++` | The default profile to use when fetching remote configuration (comma-separated). Default is "default".
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"properties": [
{
"defaultValue": "always",
"name": "spring.cloud.config.multiple-uri-strategy",
"description": "The strategy to use when call to server fails and there are multiple URLs configured on the uri property (default `MultipleUriStrategy#ALWAYS`).",
"type": "org.springframework.cloud.config.client.ConfigClientProperties$MultipleUriStrategy"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import org.springframework.vault.support.VaultResponse;

/**
* VaultEnvironmentEncryptor that can decrypt property values prefixed with {@code {vault}}
* marker.
* VaultEnvironmentEncryptor that can decrypt property values prefixed with
* {@code {vault}} marker.
*
* @author Alexey Zhokhov
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ private String getFilePath(ServletWebRequest request, String name, String profil
}

/**
* This method is synchronized because the underlying {@link EnvironmentRepository} may not
* be threadsafe (JGit for example). Calling this method could result in an update to
* the files on disk.
* This method is synchronized because the underlying {@link EnvironmentRepository}
* may not be threadsafe (JGit for example). Calling this method could result in an
* update to the files on disk.
*/
synchronized String retrieve(ServletWebRequest request, String name, String profile, String label, String path,
boolean resolvePlaceholders, String acceptedCharset) throws IOException {
Expand Down
Loading