Skip to content

Commit

Permalink
Add info on spring.config.import to docs.
Browse files Browse the repository at this point in the history
Original pull request: gh-578.
  • Loading branch information
OlgaMaciaszek committed Mar 3, 2021
1 parent 79eb7c2 commit b2363b2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ If the application imports the `spring-boot-starter-actuator` project, the statu
The vault health indicator can be enabled or disabled through the property `management.health.vault.enabled` (default to `true`).

NOTE: With Spring Cloud Vault 3.0 and Spring Boot 2.4, the bootstrap context initialization (`bootstrap.yml`, `bootstrap.properties`) of property sources was deprecated.
Instead, Spring Cloud Vault favors Spring Boot's Config Data API which allows importing configuration from Vault.
Instead, Spring Cloud Vault favors Spring Boot's Config Data API which allows importing configuration from Vault. With Spring Boot Config Data approach, you need to set the `spring.config.import` property in order to bind to Vault. You can read more about it in the <<vault.configdata.locations, Config Data Locations section>>.
You can enable the bootstrap context either by setting the configuration property `spring.cloud.bootstrap.enabled=true` or by including the dependency `org.springframework.cloud:spring-cloud-starter-bootstrap`.

=== Authentication
Expand All @@ -295,6 +295,8 @@ Static token authentication is fine if you want quickly get started with Vault,
Any disclosure to unintended parties allows Vault use with the associated token roles.




== Building

=== Build requirements for Vault
Expand Down
4 changes: 3 additions & 1 deletion docs/src/main/asciidoc/quickstart.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ If the application imports the `spring-boot-starter-actuator` project, the statu
The vault health indicator can be enabled or disabled through the property `management.health.vault.enabled` (default to `true`).

NOTE: With Spring Cloud Vault 3.0 and Spring Boot 2.4, the bootstrap context initialization (`bootstrap.yml`, `bootstrap.properties`) of property sources was deprecated.
Instead, Spring Cloud Vault favors Spring Boot's Config Data API which allows importing configuration from Vault.
Instead, Spring Cloud Vault favors Spring Boot's Config Data API which allows importing configuration from Vault. With Spring Boot Config Data approach, you need to set the `spring.config.import` property in order to bind to Vault. You can read more about it in the <<vault.configdata.locations, Config Data Locations section>>.
You can enable the bootstrap context either by setting the configuration property `spring.cloud.bootstrap.enabled=true` or by including the dependency `org.springframework.cloud:spring-cloud-starter-bootstrap`.

=== Authentication
Expand All @@ -253,3 +253,5 @@ WARNING: Consider carefully your security requirements.
Static token authentication is fine if you want quickly get started with Vault, but a static token is not protected any further.
Any disclosure to unintended parties allows Vault use with the associated token roles.



0 comments on commit b2363b2

Please sign in to comment.