Commit Graph

1195 Commits

Author SHA1 Message Date
buildmaster
cfe60db520 Going back to snapshots 2019-11-08 21:31:41 +00:00
buildmaster
ad21e45646 Update SNAPSHOT to 2.2.0.RC2 2019-11-08 21:30:45 +00:00
buildmaster
3fd52e22bd Bumping versions 2019-11-07 13:47:44 +00:00
Marcin Grzejszczak
f851c5111b Added maven flatten plugin 2019-11-07 14:36:43 +01:00
Ryan Baxter
8025d7d17e Merge branch 'sstiglitz-rebase-for-publish' 2019-11-06 11:45:44 -05:00
Ryan Baxter
91a6301bde Merge branch 'rebase-for-publish' of https://github.com/sstiglitz/spring-cloud-config into sstiglitz-rebase-for-publish 2019-11-06 11:45:26 -05:00
buildmaster
c0dd3aa538 Going back to snapshots 2019-10-24 20:30:08 +00:00
buildmaster
363fa337fd Update SNAPSHOT to 2.2.0.RC1 2019-10-24 20:29:25 +00:00
Spencer Gibb
8341a2064b Removes resource_class: large from circle 2019-10-21 12:18:08 -04:00
Spencer Gibb
efd939638e Removes reference to deprecated class in test 2019-10-21 12:16:43 -04:00
Spencer Gibb
6d53c980db Reduce need for bean method proxying & disable when not needed
Fixes gh-1492
2019-10-21 12:14:15 -04:00
Spencer Gibb
087cb334db Updates PropertyValueDescirptor with toString().
toString returns value.toString() if not null.

This allows decryption to occur properly.

Fixes gh-1490
2019-10-21 11:49:58 -04:00
buildmaster
07361c1e8b Going back to snapshots 2019-10-03 19:12:41 +00:00
buildmaster
34ea47e51f Update SNAPSHOT to 2.2.0.M3 2019-10-03 19:12:00 +00:00
Olga Maciaszek-Sharma
76dabad7dc Merge branch '2.1.x'
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-config-client/pom.xml
#	spring-cloud-config-dependencies/pom.xml
#	spring-cloud-config-monitor/pom.xml
#	spring-cloud-config-sample/pom.xml
#	spring-cloud-config-server/pom.xml
#	spring-cloud-starter-config/pom.xml
2019-09-18 12:05:02 +02:00
Olga Maciaszek-Sharma
0d58786924 Remove spring.provides. 2019-09-18 12:03:29 +02:00
buildmaster
7e0290e973 Bumping versions 2019-09-17 09:58:07 +00:00
Jakub Klebek
ef14f4abc5 Add error body with info when none of labels found (#1461) 2019-09-16 10:57:56 -04:00
buildmaster
922590e084 Bumping versions to 2.1.5.BUILD-SNAPSHOT after release 2019-09-09 18:47:47 +00:00
buildmaster
9a32729298 Going back to snapshots 2019-09-09 18:47:46 +00:00
buildmaster
5ab09cd105 Update SNAPSHOT to 2.1.4.RELEASE 2019-09-09 18:46:50 +00:00
Ryan Baxter
6d64def1ae Merge remote-tracking branch 'origin/2.1.x' 2019-09-03 17:19:14 -04:00
Ryan Baxter
3ec68bd60e Add documentation about warning when using keytool with JDK 11. Fixes #1380 2019-09-03 17:18:44 -04:00
Clay McCoy
f30ede42c3 Add AWS S3 Environment Repository (#1425)
* Add AWS S3 Environment Repository

This adds s3 as an Environment Repository.
This is based on code linked here:
https://github.com/spring-cloud/spring-cloud-config/issues/654
though it has been significantly reworked and tested.
It has been tested against vanilla buckets, versioned buckets, encrypted buckets with both AES-256 and AWS-KMS.

There are several things that I am not sure I have done 100% correctly. I'm happy to take feedback and fix. Here is a list of specific things that are known unknowns for me.
* Is there anything else that I need to do to make this implementation available in addition to what I added in EnvironmentRespositoryConfiguration?
* I added the AWS s3 java dependency for obvious reasons. There was already an AWS core dependency so I just used the same version. It is a very old version thought (2016). It seems to get the job done, but there is some stuff for STS credentials that I might use in the newer AWS SDK. I'm unsure what the process for testing the other code that requires AWS would be and updating.
* The AWS S3 client is constructed using the Default AWS provider chain. This should handle most cases implicitly (including assume role), though a newer AWS SDK might be preferable.
* This currently works against typical <app>-<profile>.properties and <app>-<profile>.yml files that are in a single AWS account and in a specified bucket. Label is optionally used as another suffix on the file name (<app>-<profile>-<label>.yml). This seems like a straight forward mapping of config server concepts to S3, but I am happy to hear other ideas. I noticed that the Git impl allows multiple repos and a kind of routing layer. This is a possibility later if needed, but this seems like a good place to start.
* I think the yaml and properties are parsed into a map correctly, but have a look at the unit tests to ensure.
* I'm trying to handle exceptional cases like other implementations when there are problems getting the config.
* In the factory I pass in ConfigServerProperties and make use of several of its attributes.
* I added the new test to AdhocTestSuite.
* I've tried serveral things, but I don't have the dependencies resolving correctly in IntelliJ Idea. I can compile and run tests with mvn on the command line, but it would be great to be able to do those things in IJ. I think that it gets confused with the parent pom in spring-cloud-build.

* Simpler YAML handling

Use YamlPropertiesFactoryBean for YAML.
Add configurable s3 endpoint.

* handle JSON config content in S3

* Label should denote a directory in S3

* Checkstyle changes, and make S3 JSON look more deliberate

Noted that JSON is using a YAML parser on purpose.

* added documentation for AWS S3 backend

* Allow overriding of AwsS3EnvironmentRepository

* put awss3 config properties at a consistent path

* Minor addition to get the new AwsS3 beans picked up during app init.
2019-08-26 14:35:55 -04:00
Ryan Baxter
cb8d7bc12f Cherry picking commit add8f26 2019-08-22 13:24:49 -04:00
Ryan Baxter
add8f26187 Remove @ConditionalOnMissingBean for native configuration. Fixes #1440 (#1453) 2019-08-22 11:15:12 -04:00
buildmaster
106cc5f44d Going back to snapshots 2019-08-14 14:44:54 +00:00
buildmaster
5eb798587a Update SNAPSHOT to 2.2.0.M2 2019-08-14 14:44:03 +00:00
Spencer Gibb
7f547f8ec1 Adds support for property origin tracking in config server/client
Adds a new format if requested using v2 Accept header, otherwise the
format is backwards compatible so older clients will work with new
servers.

fixes gh-866
2019-08-02 15:00:47 -04:00
Spencer Gibb
cbcdcde9c2 Merge branch '2.1.x' 2019-08-02 13:18:26 -04:00
Tim Ysewyn
25689a8b96 Support context refresh of config server. (#1433)
Whenever the `spring.cloud.config.server.overrides` property was changed
(either through the env actuator endpoint or remote bootstrap
configuration) this was not reflected when retrieving the application's
configuration.

fixes gh-1295
2019-08-02 13:17:46 -04:00
Marcin Grzejszczak
e92ea047c2 Added symbolic link of index.adoc 2019-07-29 14:29:33 +02:00
Marcin Grzejszczak
1e3a7c05cd Added symbolic link of index.adoc 2019-07-29 14:29:27 +02:00
Sean Stiglitz
f8894e089f Add documentation for Authorization headers. (#1424)
Mention that spring.cloud.config.headers can be used as an alternative.
2019-07-25 10:40:01 -04:00
Clay McCoy
355645d6f4 Minor documentation fix (#1426) 2019-07-25 10:38:15 -04:00
buildmaster
cc862d686a Bumping versions 2019-07-23 09:59:18 +00:00
Ryan Baxter
ff8cd73604 Merge remote-tracking branch 'origin/2.1.x' 2019-07-18 12:06:21 -04:00
Ryan Baxter
b33ddb9bce Fix logic when placeholder is at the end of the URL. (#1429) 2019-07-18 12:04:16 -04:00
buildmaster
62b0c771d4 Going back to snapshots 2019-07-03 17:53:58 +00:00
buildmaster
0e229c91b4 Update SNAPSHOT to 2.2.0.M1 2019-07-03 17:53:09 +00:00
Igor Grishin
f24f023951 Replace string concatenation (#1410)
* fix svnKitEnvironmentRepository param order

* Replace string concutination

Replace string concutination when used StringBuilder in EnvironmentController
2019-06-24 11:48:21 -04:00
Spencer Gibb
dfa31c918a Bumps 2.1.4.BUILD-SNAPSHOT and build to 2.1.7 2019-06-21 12:09:06 -04:00
buildmaster
ef9163a02a Bumping versions to 2.1.5.BUILD-SNAPSHOT after release 2019-06-20 16:41:39 +00:00
buildmaster
5d66e0fb09 Going back to snapshots 2019-06-20 16:41:39 +00:00
buildmaster
9443efc799 Update SNAPSHOT to 2.1.3.RELEASE 2019-06-20 16:40:17 +00:00
Stefan Pfeiffer
8e4cc16e75 Allow file:// URLs for file monitoring in git profile (#1385)
* Allow file:// URLs for file monitoring in git profile

Fixes #1374

* Add tests for fix #1374
2019-06-13 07:57:46 -04:00
Igor Grishin
191aa69395 fix svnKitEnvironmentRepository param order (#1405) 2019-06-13 07:55:25 -04:00
Ryan Baxter
79cd1100d1 Merge remote-tracking branch 'origin/2.1.x' 2019-06-13 06:56:54 -04:00
Chase Diem
0abf2abdc7 Add connect time out setting for config client (#1403) (#1406) 2019-06-13 06:39:28 -04:00
buildmaster
33d5294b5a Bumping versions to 2.1.4.BUILD-SNAPSHOT after release 2019-06-11 18:52:29 +00:00