SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,999 Commits 27 Branches 0 Tags
57e2ff59183b54559cdbcedf91c79ba1c9b920dc
Commit Graph

1999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
buildmaster
57e2ff5918 Bumping versions 2023-06-17 13:46:03 +00:00
Ryan Baxter
04b6ec24fd Merge branch '3.1.x' into 4.0.x 2023-06-16 16:18:07 -04:00
Ryan Baxter
640d6d3fa8 Revert changes to adding profile specific logic (#2292) 
Fixes #2279
Fixes #2289

See #2291

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-06-16 16:07:24 -04:00
Ryan Baxter
d0d11f2595 Merge branch '3.1.x' into 4.0.x 2023-06-16 15:40:27 -04:00
Ryan Baxter
12597fef31 Initialize ConfigClientProperties instead of using whats in bootstrap. (#2282) 
Fixes #2281

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-06-16 15:37:22 -04:00
Ryan Baxter
65ff87702a Merge branch '3.1.x' into 4.0.x 2023-06-16 15:35:36 -04:00
Ryan Baxter
9f3ad4f04b Implement a better equals and hashcode method ConfigServerConfigDataResource (#2278) 
Spring Boot keeps a list of ConfigDataResources and will call contains on the list to determine whether it should load the resource.  Our hashcode and equals methods were using variables in ConfigServerConfigDataResource which had no bearing on the configuration that would be loaded, so this change simplifies this to make sure two ConfigServerConnfigDataResources would be considered equal if they would end up making the same request to the config server for configuration.

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-06-16 15:34:46 -04:00
Marcin Grzejszczak
9d7d7b3f5f Including Observability appendix only for non-release train docs 2023-06-16 12:44:23 +02:00
Kaveh Shamsi
c4edc5a4f3 Removes unnecessary @RunWith annotations (#2290) 2023-06-15 10:39:40 -04:00
Ryan Baxter
25bf685a27 Fixing merge conflicts 2023-06-14 14:23:38 -04:00
Ryan Baxter
ed0c170b41 Merge branch '3.1.x' 2023-06-14 14:23:22 -04:00
Kaveh Shamsi
e9c8570803 Configures SshSessionFactory only if there is at least one git uri with ssh scheme (#2288) 2023-06-14 14:08:44 -04:00
Kaveh Shamsi
1b748ca048 Removes duplicate bean definition in ResourceControllerIntegrationTests (#2286) 2023-06-14 08:34:19 -04:00
Ryan Baxter
25366e8d3d Merge branch '3.1.x' 2023-06-13 20:36:11 -04:00
buildmaster
0febbc0a92 Bumping versions 2023-06-14 00:31:19 +00:00
Ryan Baxter
5d757d81c1 Create a bean for ResourceControllerAdvice. (#2285) 
Adding test

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-06-13 19:47:05 -04:00
Ryan Baxter
8ca88f30e5 Merge branch '3.1.x' 2023-06-12 20:05:00 -04:00
Ryan Baxter
538267a7e3 Pass binder to ConfigServerInstanceProvider (#2269) 
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-06-12 19:33:24 -04:00
Ryan Baxter
8212ac3684 Update Spring Cloud Vault to 3.0.2. 
Fixes #2283
 2023-06-12 19:30:12 -04:00
Ryan Baxter
3e101db085 Merge branch '3.1.x' 2023-06-02 12:42:10 -04:00
Ryan Baxter
755dffc0c2 Recreate ConfigClientProperties every time we load config data. Fixes #2274 (#2275) 
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-06-02 12:16:32 -04:00
buildmaster
c8a10ab58a Bumping versions 2023-05-26 16:14:27 +00:00
buildmaster
5e3ba46508 Bumping versions 2023-05-25 02:38:35 +00:00
buildmaster
2f739046b2 Bumping versions to 4.0.4-SNAPSHOT after release 2023-05-24 19:19:26 +00:00
buildmaster
5e0dca46b0 Going back to snapshots 2023-05-24 19:19:25 +00:00
buildmaster
a854ba768c Update SNAPSHOT to 4.0.3 2023-05-24 19:16:04 +00:00
Ryan Baxter
fb60da1ea8 Merge branch '3.1.x' 2023-05-22 09:43:37 -04:00
Ryan Baxter
e517dcb799 Update spring-cloud-config.adoc for JDBC dependency 
Fixes #2268
 2023-05-22 09:42:37 -04:00
Ryan Baxter
a2cb029db3 Merge branch '3.1.x' 2023-05-09 10:01:54 -04:00
Ryan Baxter
6effa362ff Document how to customize RestTemplate using config data 
Fixes #1863
 2023-05-09 10:01:22 -04:00
buildmaster
06d953a6eb Bumping versions 2023-05-05 02:38:15 +00:00
buildmaster
0d42e61be0 Bumping versions 2023-05-05 00:27:08 +00:00
Antoine
66724a978d fix: transmit data from spring cloud config server controller to getEncryptor (#2253) 
Fixes gh-2252
 2023-05-04 20:08:33 -04:00
Chen Li
0075653f80 fix issue #2245, related to #385 (#2247) 2023-05-04 16:54:11 -04:00
Ryan Baxter
8a2d72ec71 Merge branch '3.1.x' 2023-05-04 16:05:25 -04:00
Ryan Baxter
436fdf9910 Better parsing of connection factory urls. Fixes #2254 (#2263) 
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-05-04 16:04:49 -04:00
Ryan Baxter
5694964a1f Formatting 2023-05-04 15:46:40 -04:00
Ryan Baxter
d3d258cbbf Merge branch '3.1.x' 2023-05-04 15:46:21 -04:00
Ryan Baxter
6ec9c432cb Support for profile specific config data loading (#2260) 
Fixes #1922

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-05-04 15:31:48 -04:00
Ryan Baxter
39c0127671 Remove unused import 2023-05-04 11:50:57 -04:00
Ryan Baxter
10ccf7bc7b Remove other credentials from test and use system properties 2023-05-04 11:48:40 -04:00
Ryan Baxter
a90a4513e1 Set credentials via system property 2023-05-04 11:39:01 -04:00
Ryan Baxter
64095ce3db Enhance logging 2023-05-04 11:25:46 -04:00
Ryan Baxter
902606e036 Adding some test logs 2023-05-04 11:05:48 -04:00
Ryan Baxter
dd065f2ba8 Removing if statement 2023-05-04 10:39:26 -04:00
Ryan Baxter
807400ed50 Enable logging for integration tests 2023-05-04 10:19:08 -04:00
Ryan Baxter
30915b456f Adding logging in AwsS3EnvironmentRepository 2023-05-04 10:12:02 -04:00
Ryan Baxter
7fd8ce4c0d Enabling test 2023-05-04 08:45:26 -04:00
Ryan Baxter
65f848635a Merge branch '3.1.x' 2023-05-03 16:49:34 -04:00
Ryan Baxter
f59f8b5816 Include property sources without profile and include application property source (#2261) 
Fixes #1911

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
 2023-05-03 16:26:48 -04:00