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

1473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
buildmaster
b362b58e2f Update SNAPSHOT to 3.0.2 2021-01-27 20:39:53 +00:00
Ryan Baxter
63ebfd5824 Use org security policy 2021-01-21 13:52:34 -05:00
buildmaster
dfcd3b17c0 Bumping versions 2021-01-12 09:59:54 +00:00
Alexey Zhokhov
4ba93e7ea8 Server-side resolve Vault secrets inside application's property sources (#1678) 
* Added ability to access vault secrets from application config properties.

Co-authored-by: Spencer Gibb <sgibb@pivotal.io>
 2021-01-11 17:42:47 -05:00
chainHo
05d5d2e61e remove redundanct default search location (#1716) 
compare two arrays, use `Arrays.equals` , otherwise the default will add into locations twice.
 2021-01-11 17:33:39 -05:00
Kamalakar Ponaka
5b18e0ea7a CF Auth issue with Instance certificate issue expiry for 2.2.x (#1713) 
* Update PcfClientAuthenticationProvider.java

Removing CF Cert Cache. https://github.com/spring-cloud/spring-cloud-config/issues/1693

* fix for 2.2.x

Co-authored-by: Kamalakar <kamalakar.ponaka@gmail.com>

Fixes gh-1693
 2021-01-11 17:20:17 -05:00
Mauro
13b9030e0f Update AWS CodeCommit repo pattern (#1719) 
Update AWS CodeCommit repo pattern so it's more clear that it needs the protocol (https) and that the path for repository includes /v1/repos/".
 2021-01-11 17:15:09 -05:00
spencergibb
1493cb0133 Merge branch '2.2.x' 2021-01-11 17:10:21 -05:00
nhtzr
44c104df2a Add index regen if config server has force-pull (#1593) 
* Add index regen if config server has force-pull

jGit may fail with 'JGitInternalException: Short read of block.'
Due to a truncated git index, which may happen due to external
reasons.
The index can be regenerated easily by deleting it and resetting
git working directory. For a pull force, resetting to HEAD is
more convenient since the info that may have been lost in the
index is the diff in a dirty copy that we are discarding in
any way.

This commits adds automates those steps when git-status fails
and the force-pull flag is set.

Please see:
- https://github.com/spinnaker/spinnaker/issues/5153
- https://bugs.eclipse.org/bugs/show_bug.cgi?id=531807
- https://www.devguerrilla.com/notes/2015/07/fuse-for-the-idle-fellow-short-read-of-block-errors-when-starting-a-container/

* Add tests

Co-authored-by: Ezequiel Rosas <ezequiel.rosas@digitalonus.com>
 2021-01-11 17:08:01 -05:00
spencergibb
e1974c7c80 Merge branch 'fix-awss3-endpoint-config-bug' 2021-01-11 17:05:25 -05:00
dibaggioj
d09d5d5e73 Fix s3client issue when using s3 endpoint 
Client is immutable when created with the builder

Fixes gh-1597
 2021-01-11 17:05:00 -05:00
Gaurav Handa
1d472978d5 Use default label if cloneOnStart is true (#1610) 
* Fixed 1609.

Added code to checkout the repository to the defautlLabel when cloneOnStart is true.

* Fix for 1609. Added null check for git object.

* Added test case for 1609

Added test case to ensure that clone + listBranch + checkout command is called when defaultLabel is specified and cloneOnStart flag is true.

* Fixed the checkstyle issues

* Fixed the test cases and added check that the checkout should only work if default lable is not same as default branch set in bit bucket

* updated comments
 2021-01-11 16:47:27 -05:00
David Choi
df5566e6b0 Add support for multiple application config in aws s3 repository. (#1726) 
* Updated so that multiple application configs can be retrieved with comma separators from the AWS S3 Repository.

* Added space after comma.

* Add test code for AWS S3 Repository multi-application configuration.
 2021-01-11 16:43:54 -05:00
dependabot-preview[bot]
4302c6f09f Bump spring-credhub-core from 2.0.0.RELEASE to 2.1.1.RELEASE (#1658) 
Bumps [spring-credhub-core](https://github.com/spring-projects/spring-credhub) from 2.0.0.RELEASE to 2.1.1.RELEASE.
- [Release notes](https://github.com/spring-projects/spring-credhub/releases)
- [Commits](https://github.com/spring-projects/spring-credhub/compare/v2.0.0.RELEASE...2.1.1.RELEASE)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Spencer Gibb <sgibb@pivotal.io>
 2021-01-11 16:42:33 -05:00
dependabot-preview[bot]
be0598966a Bump embedded-redis from 0.7.2 to 0.7.3 (#1661) 
Bumps [embedded-redis](https://github.com/ozimov/embedded-redis) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/ozimov/embedded-redis/releases)
- [Commits](https://github.com/ozimov/embedded-redis/compare/0.7.2...0.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 16:33:01 -05:00
dependabot-preview[bot]
6e40353bc8 Bump maven-jar-plugin from 3.1.2 to 3.2.0 (#1668) 
Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.1.2 to 3.2.0.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.1.2...maven-jar-plugin-3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 16:32:00 -05:00
dependabot-preview[bot]
649a011bba Bump svnkit from 1.8.12 to 1.10.1 (#1671) 
Bumps svnkit from 1.8.12 to 1.10.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 16:31:35 -05:00
dependabot-preview[bot]
78fbb59a64 Bump jsch from 0.1.54 to 0.1.55 (#1675) 
Bumps jsch from 0.1.54 to 0.1.55.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 16:30:20 -05:00
dependabot-preview[bot]
1458b27aa4 Bump google-auth-library-oauth2-http from 0.15.0 to 0.22.0 (#1724) 
Bumps google-auth-library-oauth2-http from 0.15.0 to 0.22.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 16:27:46 -05:00
dependabot-preview[bot]
0bc206ecb7 Bump aws-java-sdk.version from 1.11.52 to 1.11.903 (#1754) 
Bumps `aws-java-sdk.version` from 1.11.52 to 1.11.903.

Updates `aws-java-sdk-core` from 1.11.52 to 1.11.903
- [Release notes](https://github.com/aws/aws-sdk-java/releases)
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.52...1.11.903)

Updates `aws-java-sdk-s3` from 1.11.52 to 1.11.903
- [Release notes](https://github.com/aws/aws-sdk-java/releases)
- [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.52...1.11.903)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Spencer Gibb <sgibb@pivotal.io>
 2021-01-11 16:26:55 -05:00
dependabot-preview[bot]
59516413ae Bump bcpkix-jdk15on from 1.64 to 1.67 (#1755) 
Bumps [bcpkix-jdk15on](https://github.com/bcgit/bc-java) from 1.64 to 1.67.
- [Release notes](https://github.com/bcgit/bc-java/releases)
- [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 16:25:25 -05:00
dependabot-preview[bot]
f07a8c9554 Bump google-api-services-iam (#1757) 
Bumps google-api-services-iam from v1-rev20191010-1.30.3 to v1-rev20201112-1.30.10.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 16:25:03 -05:00
spencergibb
6266789fd7 Merge branch '2.2.x' 2021-01-11 15:32:06 -05:00
choubani amir
c7dc612890 Update spring-cloud-config.adoc 
Spelling error.

Fixes gh-1779
 2021-01-11 15:31:00 -05:00
spencergibb
fead9777eb Don't deploy client-tls-tests module. 2021-01-08 13:21:33 -05:00
buildmaster
dca097fde1 Bumping versions to 3.0.2-SNAPSHOT after release 2021-01-08 18:18:11 +00:00
buildmaster
e192b7a9bc Going back to snapshots 2021-01-08 18:18:11 +00:00
buildmaster
de32eb3d4d Update SNAPSHOT to 3.0.1 2021-01-08 18:15:27 +00:00
spencergibb
a95f1300ad Ensures spring.cloud.config.name takes precedence. 
spring.cloud.config.name should only default to spring.application.name, not be overridden by it.

Fixes gh-1784
 2021-01-08 12:54:46 -05:00
spencergibb
3d38f7af0d Fixes multi-document file name clashes. 
Multi-document yaml or properties files need unique names, otherwise lower precedence property sources will overwrite higher precedence ones. This adds a check to see if the original property source name contains 'document #'. If it does, that is used as the propety source name.

Fixes gh-1778
 2020-12-23 12:52:00 -05:00
spencergibb
ccb32d23fc Only use spring.cloud.config.profiles if not 'default'. 
In ConfigData, the Profiles object takes care of resolving the default profile. So only prefer spring.cloud.config.profiles if it has been set to something other than 'default'.

Fixes gh-1777
 2020-12-23 12:49:42 -05:00
spencergibb
f840725c12 Support Retry in spring.config.import=configserver: 
Fixes gh-1775
 2020-12-22 17:40:32 -05:00
spencergibb
cb2981d7a0 Updates to spring-vault 2.3.0 
Fixes gh-1776
 2020-12-22 16:24:31 -05:00
buildmaster
8a939d9cf3 Bumping versions 2020-12-22 17:58:54 +00:00
buildmaster
6506bb47c5 Bumping versions 2020-12-22 09:58:12 +00:00
buildmaster
6f9b74f2c7 Bumping versions to 3.0.1-SNAPSHOT after release 2020-12-21 19:14:54 +00:00
buildmaster
dbea03703c Going back to snapshots 2020-12-21 19:14:54 +00:00
buildmaster
73ebf56384 Update SNAPSHOT to 3.0.0 2020-12-21 19:11:45 +00:00
Spencer Gibb
499739f308 Uses BindHandler if registered in bootstrap. (#1773) 
* Uses BindHandler if registered in bootstrap.

This allows spring-cloud-context to register a TextEncryptorBindHandler and handle `{cipher}` prefixed properties prior to sending for remote data.

* Adds test that a BindHandler in bootstrap context is used.

* Makes KeyProperties a bean that is conditional on missing.
 2020-12-20 11:39:11 -05:00
spencergibb
f5e5753dd5 Prefer client profiles over spring.profiles.active 
If spring.clout.config.profile is set use it otherwise use profiles set by spring boot.

Fixes gh-1764
 2020-12-14 21:32:53 -05:00
spencergibb
a2087e05fb Updates for boot 2.4.1 property source name. 
Fixes gh-1771
 2020-12-14 17:17:10 -05:00
buildmaster
ef35a43deb Bumping versions 2020-12-14 09:58:58 +00:00
buildmaster
a55c14f3b2 Going back to snapshots 2020-12-11 21:57:53 +00:00
buildmaster
14d821229f Update SNAPSHOT to 3.0.0-RC1 2020-12-11 21:56:33 +00:00
Dave Syer
8b48ed36c6 Ensure config server works with Spring Boot 2.4 
Since 2.4 the names of property sources have changed, so we have to
change the `clean()` method in `NativeEnvironmentRepository` in order
not to simply omit all the sources.
 2020-12-11 12:03:00 +00:00
Dave Syer
d89199d98a Avoid triggering self-invocation warning inadvertently 2020-12-02 13:14:03 +00:00
Dave Syer
6d8d9c4682 Make use of @RefreshScope conditional in config server 
Fixes gh-1763
 2020-12-02 11:44:05 +00:00
buildmaster
162b39febb Going back to snapshots 2020-12-01 22:38:36 +00:00
buildmaster
b082673cc9 Update SNAPSHOT to 3.0.0-M6 2020-12-01 22:37:20 +00:00
buildmaster
8c5a01abf7 Bumping versions 2020-11-19 09:59:09 +00:00