Commit Graph

626 Commits

Author SHA1 Message Date
Olga Maciaszek-Sharma
265243b59d Fix after review. 2022-10-20 16:20:16 +02:00
Olga Maciaszek-Sharma
afc1e55919 Fix indentation. Document AOT and native support. 2022-10-20 15:46:43 +02:00
buildmaster
8aef8cff90 Going back to snapshots 2022-10-06 01:21:37 +00:00
buildmaster
dbaea3dc2e Update SNAPSHOT to 4.0.0-M5 2022-10-06 01:19:42 +00:00
Ryan Baxter
d9b8562348 Merge branch '3.1.x' 2022-09-27 19:38:50 -04:00
Ryan Baxter
11e213c71c Clarify where to set encrypt.key. Fixes #2164 2022-09-27 19:38:25 -04:00
buildmaster
0e7479ccf0 Going back to snapshots 2022-09-06 20:13:10 +00:00
buildmaster
298e4337ec Update SNAPSHOT to 3.1.4 2022-09-06 20:11:05 +00:00
buildmaster
996a7c2090 Bumping versions 2022-09-04 00:29:04 +00:00
buildmaster
d7b7955ab1 Bumping versions 2022-09-03 00:30:46 +00:00
buildmaster
5b3624134b Bumping versions to 3.1.5-SNAPSHOT after release 2022-09-02 23:37:01 +00:00
buildmaster
2c5c998e32 Going back to snapshots 2022-09-02 23:37:00 +00:00
buildmaster
eb91900671 Update SNAPSHOT to 3.1.4 2022-09-02 23:34:59 +00:00
buildmaster
905926fb88 Going back to snapshots 2022-07-29 19:35:34 +00:00
buildmaster
bf38e70ff6 Update SNAPSHOT to 4.0.0-M4 2022-07-29 19:32:53 +00:00
Ryan Baxter
c567f3c4b1 Merge branch '3.1.x' 2022-07-15 17:18:45 -04:00
Kaveh Shamsi
b202ce0234 Replaces Jsch with Apache MINA in config-server (#2122) 2022-07-15 16:51:03 -04:00
Ryan Baxter
660c5ae72f Merge branch '3.1.x' 2022-07-14 15:37:21 -04:00
Marcin Grzejszczak
7c117c0425 First pass on observation (#2081)
* First pass on observation

* Polished tests

* Moved tests to observation registry tests

* Polish

* Adds required Aspect.class to ObservationConfiguration

* Moved away from AOP

* Updated the code to use the ObservationConvention mechanism

* Updated code

* Prepared observation tests

* Polish

* Aligned against latest milestones

Co-authored-by: spencergibb <sgibb@pivotal.io>
2022-07-12 11:24:05 +02:00
buildmaster
58e0b077fb Bumping versions 2022-07-08 02:52:19 +00:00
buildmaster
f9a811cc74 Bumping versions 2022-06-30 00:30:05 +00:00
Ryan Baxter
399c9ec6b4 Moves to aws sdk v2. (#2111)
* Moves to aws sdk v2.  Fixes #2038 and #2106
2022-06-16 15:02:01 -04:00
buildmaster
ec4c448c10 Going back to snapshots 2022-06-15 12:48:40 +00:00
buildmaster
da3ac1640a Update SNAPSHOT to 4.0.0-M3 2022-06-15 12:45:50 +00:00
spencergibb
4ac04a6e64 Bumps to next snapshot version 2022-05-27 12:48:19 -04:00
buildmaster
77252fa878 Update SNAPSHOT to 3.1.3 2022-05-27 12:45:12 -04:00
Spencer Gibb
fbeee0b07b don't upload docs to maven central 2022-05-26 12:08:09 -04:00
buildmaster
9d319c26ac Bumping versions to 3.1.3-SNAPSHOT after release 2022-04-27 10:43:51 +00:00
buildmaster
fd6ca6c668 Going back to snapshots 2022-04-27 10:43:51 +00:00
buildmaster
48be8bc3c5 Update SNAPSHOT to 3.1.2 2022-04-27 10:40:46 +00:00
Olga Maciaszek-Sharma
d9c8452fe7 Revert "Update SNAPSHOT to 3.1.2"
This reverts commit 6535ef2f58.
2022-04-27 11:06:13 +02:00
Olga Maciaszek-Sharma
287d0c80b5 Revert "Going back to snapshots"
This reverts commit 69b0747082.
2022-04-27 11:06:09 +02:00
Olga Maciaszek-Sharma
df7dea96a1 Revert "Bumping versions to 3.1.3-SNAPSHOT after release"
This reverts commit 3528115046.
2022-04-27 11:06:05 +02:00
Olga Maciaszek-Sharma
e663618080 Revert "Bumping versions"
This reverts commit 0cc9713fc3.
2022-04-27 11:06:02 +02:00
buildmaster
0cc9713fc3 Bumping versions 2022-04-27 00:29:44 +00:00
buildmaster
3528115046 Bumping versions to 3.1.3-SNAPSHOT after release 2022-04-26 15:53:30 +00:00
buildmaster
69b0747082 Going back to snapshots 2022-04-26 15:53:30 +00:00
buildmaster
6535ef2f58 Update SNAPSHOT to 3.1.2 2022-04-26 15:50:33 +00:00
Benjamin Einaudi
cd08473884 [spring-cloud-config] Allow to use other scheme proxy when only one proxy is configured (#2049)
Allow to specify 'http' proxy for both protocols and viceversa

Close #2048
2022-04-07 15:32:19 -04:00
buildmaster
1cd03a05fb Going back to snapshots 2022-03-31 21:49:34 +00:00
buildmaster
213e35622a Update SNAPSHOT to 4.0.0-M2 2022-03-31 21:46:51 +00:00
buildmaster
488b5181a4 Bumping versions 2022-03-08 02:41:11 +00:00
Benjamin Einaudi
0021fd14bd [config-server] Allow specification of down health status (#2056)
Allow developer to set the property 'spring.cloud.config.server.health.down-health-status' to a custom value
2022-03-07 17:10:06 -05:00
marnee01
7f83b1f547 Add support for multiple-url-strategy configuration for clients. (#1946)
* Add support for multiple-url-strategy configuration for clients.

Add support for new property spring.cloud.config.multiple-uri-strategy.
The value must be one of: always, connection_timeout_only. The default
value is connection_timeout_only. This default setting maintains existing
behavior.

If a client has multiple URLs in the spring.cloud.config.uri property,
and if multiple-uri-strategy is set to "always", then if the client gets
any error from config server whatsoever or gets no response, the client
will try the next URL in the list.

The existing and default behavior is that the other URLs in the list will be
tried only if and when the client receives no response from config server.

This is mainly to allow for a client failing over to secondary URLs when
it receives a 404 due to config server being unable to reach its git server
(and config server does not have the requested configs in its local git cache).
With the default behavior, the client receives a 404 and never tries the
next URL in the list(which might point to a different git server that is
currently up). Another benefit is that it allows for a client failing over
to a secondary config server if the first one returns a 503 (OUT_OF_SERVICE).

Fixes gh-1845.

* Fix code style after committing change for gh-1845.

* Fix support for multiple-url-strategy configuration for clients.

Fix issue with the new multiple URI strategy behavior.
Even when strategy was ALWAYS, the client would not try
the next URL when it received server-side errors. Fixed
this by adding HttpServerErrorException to catch clause
in ConfigServicePropertySourceLocator.

Also, fix code style issues and add unit tests.
Fix existing fail-fast unit tests that were not correct.
(They were not mocking out raw status code method on
the response. The error thrown back was actually due to
RestTemplate.handleResponse being unable to to map raw
status code 0 to an HttpStatus.)

* Fix support for multiple-url-strategy configuration for clients.

Merge with dev and undo unintentional changes that were
done automatically. This is part of the pull request
fixing gh-1845.

* Fix support for multiple-url-strategy configuration for clients.

Update ConfigServerConfigDataLoader to try multiple URLs
even for server-side errors when strategy is ALWAYS. This was
missed in previous commit. This is part of the pull request
fixing gh-1845.

* Add ConfigServerConfigDataLoaderTests.

When ConfigServerConfigDataLoader was originally introduced
for the new Spring Boot 2.4 way to import configuration data
(https://github.com/spring-cloud/spring-cloud-config/pull/1656/files),
no unit test was added. I needed to add tests to cover changes
made for the new MultipleUriStrategy (gh-1845). I copied
tests from ConfigServicePropertySourceLocatorTests and modified
as needed for the new class. (There were 2-3 test cases from
ConfigServicePropertySourceLocatorTests that I did not
copy over because it wasn't clear to me expected behavior
or how to set up test case).

This is part of the pull request fixing gh-1845.

* Update the default for multiple-uri-strategy to ALWAYS.

(Per code review.) This is part of the pull request fixing
gh-1845.

* Update documentation for the new multiple-uri-strategy property.

Also, add documentation comparing behavior of multiple URLs
under spring.cloud.config.uri versus multiple URLs under
spring.config.import.

This is part of the pull request fixing gh-1845.

Co-authored-by: UPINCMA <marnee.derider@pearson.com>
2022-03-07 17:07:41 -05:00
Benjamin Einaudi
4ae403148e [spring-cloud-config] Allow to use other scheme proxy when only one proxy is configured (#2049)
Allow to specify 'http' proxy for both protocols and viceversa

Close #2048
2022-02-22 15:42:10 -05:00
buildmaster
5e60c254d2 Bumping versions to 3.1.2-SNAPSHOT after release 2022-02-17 16:46:14 +00:00
buildmaster
3ecceb1276 Going back to snapshots 2022-02-17 16:46:14 +00:00
buildmaster
b40c219c57 Update SNAPSHOT to 3.1.1 2022-02-17 16:43:03 +00:00
buildmaster
a3b9fdfb7c Going back to snapshots 2022-01-27 21:43:57 +00:00
buildmaster
4505c189c3 Update SNAPSHOT to 4.0.0-M1 2022-01-27 21:41:23 +00:00