829 Commits

Author SHA1 Message Date
buildmaster
7cde2e751a Bumping versions to 3.0.8-SNAPSHOT after release 2022-06-29 22:06:59 +00:00
buildmaster
d52c8572af Going back to snapshots 2022-06-29 22:06:58 +00:00
buildmaster
27b7570361 Update SNAPSHOT to 3.0.7 2022-06-29 22:04:50 +00:00
buildmaster
08973e65dc Bumping versions to 3.0.7-SNAPSHOT after release 2021-12-15 16:51:44 +00:00
buildmaster
12349fef16 Going back to snapshots 2021-12-15 16:51:43 +00:00
buildmaster
778368eeb1 Update SNAPSHOT to 3.0.6 2021-12-15 16:49:37 +00:00
Adrian
2a9119cf6d management.endpoints.web.base-path=/admin
According to https://docs.spring.io/spring-boot/docs/2.4.x/reference/html/production-ready-features.html#production-ready-customizing-management-server-context-path it seems to me that "management.endpoints.web.base-path=/admin" is the best choice.
2021-12-10 11:51:52 -05:00
spencergibb
2aa37701f7 formatting 2021-12-10 11:46:06 -05:00
jixu.hjx
238ab0cbaa Fixed #1499, append slash to search-locations ending when it is missed. 2021-12-10 11:41:27 -05:00
spencergibb
1f2a6eca17 formatting 2021-11-15 12:51:20 -05:00
Vitalii Ananev
4636ddb3b5 Fix spring.config.import for environment type native (#1990)
* fix for 'spring.config.import' from subdirectory of 'spring.cloud.config.server' search-locations
2021-11-09 11:39:51 -05:00
knv srinivas
ee35eac3fa Ordered Support for S3,Credhub, Redis profiles. Fixes gm-1980 (#1982)
Co-authored-by: knv <srinivaskatta@freo.money>
2021-10-20 11:25:31 -04:00
Ryan Baxter
998a4cadf2 Use HTTPS when proxy settings are set (#1986)
* Use HTTPS when proxy settings are set

Fixes #1965

* Adding test
2021-10-20 11:12:42 -04:00
Ryan Baxter
41e50e345d Move ConfigServerBootstrapApplicationListener to EnvironmentPostProcessor (#1984)
* Move ConfigServerBootstrapApplicationListener to EnvironmentPostProcessor

Fixes #1983

* Reverted classname and interface changes to avoid breaking anyone
2021-10-19 12:18:19 -04:00
buildmaster
dea6e10c61 Bumping versions to 3.0.6-SNAPSHOT after release 2021-09-21 14:30:23 +00:00
buildmaster
e6aa33a1da Going back to snapshots 2021-09-21 14:30:23 +00:00
buildmaster
a16e447407 Update SNAPSHOT to 3.0.5 2021-09-21 14:27:28 +00:00
Chintan Radia
6e405f0421 Allow PropertyResultSetExtractor to be customizable (#1962)
Fixes gh-1952
2021-09-14 11:06:58 -04:00
Avner Sternheim
5be1c55a47 fix bug according to #1947 - when working with PatternMatchingJGitEnvironmentRepository. The GitCredentialsProviderFactory instance in the PatternMatchingJGitEnvironmentRepository remains the original GitCredentialsProviderFactory and not the one set by the build method in MultipleJGitEnvironmentRepositoryFactory. (#1951)
Co-authored-by: avner.sternheim <avner.sternheim@imperva.com>
2021-08-18 15:39:42 -04:00
Ryan Baxter
b7732ca4c5 Make GitCredentialsProviderFactory a bean. Fixes #1896 (#1926) 2021-07-08 11:28:41 -04:00
Ryan Baxter
c6a07ed234 Support new delimiters in spring.config.location (#1904) 2021-06-10 13:50:44 -04:00
buildmaster
54bd71bfe0 Going back to snapshots 2021-05-27 21:08:06 +00:00
buildmaster
3db7020028 Update SNAPSHOT to 3.0.4 2021-05-27 21:04:51 +00:00
buildmaster
abe57b6663 Bumping versions to 3.0.5-SNAPSHOT after release 2021-05-27 07:55:08 +00:00
buildmaster
2486acc011 Going back to snapshots 2021-05-27 07:55:07 +00:00
buildmaster
0b67bd3495 Update SNAPSHOT to 3.0.4 2021-05-27 07:52:15 +00:00
spencergibb
e9fa34032b Adds support for retry in profile specific properties.
in application-<profile>.{properties|yaml}

spring.config.import=configserver:http://configserver.example.com?fail-fast=true&max-attempts=10&max-interval=1500&multiplier=1.2&initial-interval=1100"

This required that the RetryTemplate be created as late as possible and it is no longer put in the bootstrap context. A RetryTemplateFactory was created so the LoaderInterceptor and the ConfigServerInstanceProvider can create a RetryTemplate. ConfigServerConfigDataLocationResolver creates RetryProperties from the url parameters if they are provided.

ConfigServerConfigDataLoader now creates a ConfigClientFailFastException and registers it in the application context rather and returns an empty ConfigData rather than throwing and exception. Then in ConfigClientAutoConfiguration an ApplicationStartedEvent is listened for and if the fail fast exception is there, throws it halting execution. This all allows logging in ConfigData to show.

Fixes gh-1797
2021-05-26 11:31:03 -04:00
spencergibb
be708efc18 Use boot config data api to determine resource and location.
Previously the resource name and location needed to be parsed. This change updates NativeEnvironmentRepository to pass a ConfigDataEnvironmentUpdateListener to ConfigDataEnvironmentPostProcessor.applyTo() and match PropertySources to location and resource. PassthruEnvironmentRepository is updated to attach the original PropertySource to use later in the clean() method to retrieve the location and resource avoiding parsing.

Fixes gh-1875
2021-05-05 14:12:06 -04:00
Ryan Baxter
901043a47e Merge branch '2.2.x' 2021-04-09 14:02:09 -04:00
Ryan Baxter
4e1c3bb45e Using order of locations when serving resources (#1858) 2021-04-09 13:16:48 -04:00
spencergibb
3056d5f842 Fixes profile ordering of remote vs local.
Previously a local profiles specific file would have more priority than a remote profile specific file. Using a new ConfigData Option, this is now fixed.

Fixes gh-1795
2021-04-08 17:39:32 -04:00
spencergibb
46675f74c4 Merge branch '2.2.x' 2021-03-30 13:37:37 -04:00
spencergibb
7c89268775 Updates GitUriFailureAnalyzer with broader action.
Previously it only suggested a composite if using bootstrap and native. Now it will suggest it if using bootstrap regardless of env repo type.

Fixes gh-1852
2021-03-30 13:37:16 -04:00
spencergibb
50d2f9d334 formatting 2021-03-29 18:07:17 -04:00
spencergibb
9b9b6838b6 Merge branch '2.2.x' 2021-03-29 18:06:37 -04:00
spencergibb
e7a69671b3 Adds support for token auth via username property.
Fixes gh-1602
2021-03-29 18:05:38 -04:00
spencergibb
2ddc7cb73b Formatting 2021-03-29 17:08:39 -04:00
spencergibb
b884f2088c Fixes merge mistakes 2021-03-29 17:08:11 -04:00
spencergibb
81585fe09e Merge branch '2.2.x' 2021-03-29 17:02:35 -04:00
spencergibb
962abe7462 Makes actuator optional for config server.
Fixes gh-1742
2021-03-29 16:57:33 -04:00
spencergibb
e7be2b8c5a Register env repo properties as beans.
The `CompositeEnvironmentBeanFactoryPostProcessor` binds the required properties for a EnvironmentRepositoryFactory, but does not register it as a bean. This is now done with a supplier to the bound instance.

Fixes gh-1720
2021-03-29 16:25:41 -04:00
Ryan Baxter
09465e678f Use optional in classpath search location (#1844)
* Use optional in search locations
2021-03-25 13:33:48 -04:00
buildmaster
fdbce34628 Bumping versions to 3.0.4-SNAPSHOT after release 2021-03-17 21:35:17 +00:00
buildmaster
0fe3c496f4 Going back to snapshots 2021-03-17 21:35:17 +00:00
buildmaster
1210effa44 Update SNAPSHOT to 3.0.3 2021-03-17 21:32:52 +00:00
Ryan Baxter
fb451f9661 Adding logging when we fail to get the Environment
Fixes #1808
2021-03-16 13:48:07 -04:00
Alftheo Potgieter
dcf35c6745 restore useDefaultLabel parameter in ResourceController (#1822)
Co-authored-by: Alf Potgieter <AlfP@discovery.co.za>
2021-03-10 18:22:22 -05:00
spencergibb
2ea5e11c9a Fail if no configserver config import.
Adds ConfigServerConfigDataMissingEnvironmentPostProcessor that checks if there is a spring.config.import=configserver: statement. If not, an exception is thrown and a FailureAnalyzer provides hints to fix the issue.

Fixes gh-1813
2021-03-10 16:59:29 -05:00
Tristeza
6ebf7c1e8e Remove if else (#1821)
* remove unnecessary if else
2021-03-03 09:51:55 -05:00
Pierre Bozon
fee69f872b fix NPE in NativeEnvironmentRepository (#1809)
Since the fix of this issue : https://github.com/spring-cloud/spring-cloud-config/issues/1771, I experience a NullpointerException at the launch of my service.
Indeed, the "location" var is null in my case.

Note : since the new Config file processing in Spring Boot 2.4, I'm using the Legacy Processing (spring.config.use-legacy-processing: true), migrating in the new process is way too breaking for my project.
2021-02-26 08:41:56 -05:00