spencergibb
a72b7c86ea
formatting
2023-06-21 11:12:16 -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
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
buildmaster
06d953a6eb
Bumping versions
2023-05-05 02:38:15 +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
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
Ryan Baxter
a3db3392dc
Merge branch '3.1.x'
2023-05-03 14:14:31 -04:00
Kaveh Shamsi
5a1797ac47
Loads the default configuration for application names prefixed with ( #2262 )
2023-05-03 13:33:14 -04:00
Ryan Baxter
7f9af92c4f
Reenable AwsIntegrationTest On Main ( #2227 )
2023-05-03 09:42:38 -04:00
Ryan Baxter
0a36367208
Fixing tests for 3.1.x compatibility
2023-04-20 15:28:04 -04:00
Ryan Baxter
63e70ee9d8
Fixing merge
2023-03-22 20:22:08 -04:00
Ryan Baxter
fab9ceb0e5
Merge branch '3.1.x'
2023-03-22 20:21:45 -04:00
Ryan Baxter
dd5bc2b03c
Put ExceptionHandler into a ResourceControllerAdvice to allow overriding behavior ( #2243 )
...
Fixes #2192
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com >
2023-03-22 20:05:39 -04:00
Ryan Baxter
d93052fa00
Fixing merger
2023-03-22 20:05:16 -04:00
Ryan Baxter
416747f26a
Merge branch '3.1.x'
2023-03-22 17:18:27 -04:00
Ryan Baxter
8478a5263f
Add property to reverse location order. Fixes #1910 ( #2239 )
...
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com >
2023-03-09 11:31:52 -05:00
Ryan Baxter
68f5566732
Fixing tests
2023-03-09 11:22:54 -05:00
Ryan Baxter
c40eddef88
Add property to reverse location order. Fixes #1910 ( #2239 )
...
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com >
2023-03-09 10:59:41 -05:00
Ryan Baxter
b62704e2e7
Merge branch '3.1.x'
2023-03-08 14:29:00 -05:00
Ryan Baxter
4440775661
Support brackets in yaml keys. Fixes #2197 ( #2238 )
...
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com >
2023-03-08 14:28:26 -05:00
Ryan Baxter
da14c2debe
Polish pr 2053 ( #2234 )
...
* AWS S3 environment repository can read the default property file as well a profile-specific file. Fixes gh-1611.
* Unit test to assert no default profile when querying S3 repository
* Polishing PR
---------
Co-authored-by: Daniel Aiken <dmaiken13@gmail.com >
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com >
2023-02-24 16:55:56 -05:00
buildmaster
920013a5ce
Bumping versions
2023-02-24 02:38:06 +00:00
Ryan Baxter
8b7ebf944c
Pr 2104 polish ( #2233 )
...
* Support labels in AWS SecretsManager backend
* Document label support in AWS SecretsManager
* Use AWS staged labels as config version labels
* Fix tests
---------
Co-authored-by: Dmitry Antonyuk <32649457+dantonyuk@users.noreply.github.com >
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com >
2023-02-23 10:16:01 -05:00
buildmaster
a6c45be247
Bumping versions
2023-02-16 00:26:31 +00:00
buildmaster
8d11dbdf8e
Bumping versions
2023-02-15 02:37:27 +00:00
Ryan Baxter
2d451a209b
Merge branch '3.1.x'
2023-02-14 19:29:41 -05:00
Amit Kumar
3f63b43bf3
fixed compare() GoogleSecretComparatorByVersion by making it to Integer comparator ( #2230 )
...
Co-authored-by: Amit Kumatr <amit.kumar@fyndna.com >
2023-02-14 19:26:14 -05:00
Ryan Baxter
2547015284
Polish
2023-02-14 10:27:58 -05:00