Commit Graph

1276 Commits

Author SHA1 Message Date
Spencer Gibb
b65b1002cd Updates docs branches 2020-03-06 12:49:59 -05:00
buildmaster
189355aea4 Bumping versions 2020-03-04 09:57:49 +00:00
Spencer Gibb
d59bd37a95 Merge branch '2.2.x' 2020-03-02 16:31:56 -05:00
Spencer Gibb
651f458919 Consolidates normalization of names and labels.
fixes gh-1561
2020-03-02 16:26:30 -05:00
FWinkler79
4d6cf75452 Allows overriding of configTokenProvider.
Made sure configTokenProvider default bean will be overridden by more specific versions (e.g. vault configTokenProvider, etc.)

Fixes gh-1485
Fixes gh-1537
2020-03-02 16:15:34 -05:00
Johnny Lim
d2fc0d5366 Polish doc
fixes gh-1557
2020-03-02 15:51:16 -05:00
Ryan Baxter
34ac90c4ee Merge pull request #1559 from mohammedalics/fixesgh/20302
Add check if the file extension is null before calling the to toLowerCase() - Fixes gh-20302
2020-02-27 10:10:10 -05:00
Mohammed Ammer
8ce1b45519 Add junit test for retrieving a resource without file extension - Fixes gh-20302 2020-02-24 20:23:37 +01:00
Mohammed Ammer
740153b5aa Add check if the file extension is null before calling the to toLowerCase() - Fixes gh-20302 2020-02-24 20:22:53 +01:00
Spencer Gibb
33c6be1cf5 Merge branch '2.2.x' 2020-02-05 13:47:17 -05:00
Jack Peterson
c3e4ef2261 documentation enhancement re: SSH private keys
The default ssh-keygen command creates unreadable SSH keys for spring-cloud-config. This change provides the exception that people are searching with as well as a resolution to the issue.
2020-02-05 13:46:04 -05:00
Ryan Baxter
6a5fc3ad5f Merge remote-tracking branch 'origin/2.2.x' 2020-02-03 20:17:51 -05:00
Ryan Baxter
a237eb7466 plainTextEncrypt property should be true. Fixes #1541 2020-02-03 20:17:22 -05:00
Spencer Gibb
666d20ca41 Merge branch '2.2.x' 2020-02-03 16:43:08 -05:00
Spencer Gibb
a5e73c5897 Enables post to /env 2020-02-03 16:37:04 -05:00
Spencer Gibb
5742be0e9f Merge branch '2.2.x' 2020-01-27 12:42:11 -05:00
Spencer Gibb
feb75d442d Merge branch '2.1.x' into 2.2.x 2020-01-27 12:41:28 -05:00
contextshuffling
44c4b0e401 Use LinkedHashSet for deterministic iterations 2020-01-27 12:40:34 -05:00
Marcin Grzejszczak
d1579518c7 Ensures that config token provider has no overriding bean names
without this change when adding the vault token `spring.cloud.config.server.vault.token` we have 2 config token providers on the classpath, the `VaultConfiguration#configTokenProvider` and the `EnvironmentRepositoryConfiguration$DefaultConfigTokenProvider` both with the same bean name. Starting from Boot 2.2 (AFAIR) that's unacceptable by default.

with this change we're changing the bean name so that we don't override the other bean name.
2020-01-27 12:38:22 -05:00
buildmaster
58c4080c7e Bumping versions 2020-01-21 19:11:50 +00:00
Spencer Gibb
3842f3f1f0 Temporarily comment out spring boot maven plugin 2020-01-21 14:04:42 -05:00
Spencer Gibb
911cb51838 Updates to 3.0.0.BUILD-SNAPSHOT
again...
2020-01-21 13:33:27 -05:00
buildmaster
748d2a5891 Bumping versions 2020-01-21 13:47:45 +00:00
buildmaster
cce7d70b6b Bumping versions 2020-01-21 09:59:30 +00:00
buildmaster
2dde8d4f42 Bumping versions 2020-01-20 13:22:57 +00:00
buildmaster
1e1bd08daf Bumping versions 2020-01-19 09:57:33 +00:00
Spencer Gibb
82e60cae27 Updates to 3.0.0.BUILD-SNAPSHOT 2020-01-17 17:21:56 -05:00
Spencer Gibb
a389b4b43b Replaces deprecations 2020-01-17 17:13:11 -05:00
buildmaster
09aad0d92a Bumping versions 2020-01-14 09:58:28 +00:00
Yi EungJun
75f3bbcff1 Fix perf issue of KeyStoreTextEncryptorLocator (#1496)
CipherEnvironmentEncryptor.decrypt() gets a TextEncryptor for each
environment property by KeyStoreTextEncryptorLocator.locate() which
calls KeyStoreKeyFactory.getKeyPair() to create an instance of
RsaSecretEncrptor.

Unfortunately KeyStoreKeyFactory.getKeyPair() seems extremely slow for
jks files whose format is PKCS12. So we need not to repeat calling the
method if possible.

Reuse an intance of RsaSecretEncrptor to avoid the performance problem.
2020-01-13 18:13:26 -05:00
Spencer Gibb
4c7b8dfc7e Merge branch '2.1.x' 2020-01-13 15:32:55 -05:00
Alberto C. Ríos
01be10e76c Sharing default application config in CredHub (#1477)
Always including application as default so that it can be shared accross all applications to be consistent with other repository implementations.

Sharing secrets to the application from default profile.

Updated the docs to reflect the changes
2020-01-13 15:32:38 -05:00
Henryk Konsek
231da25d79 AbstractScmAccessor should apply logic from setBasedir. (#1471) 2020-01-13 15:16:00 -05:00
Henryk Konsek
3729648e5a AbstractScmAccessor should apply logic from setBasedir. (#1471) 2020-01-13 15:13:55 -05:00
Spencer Gibb
707c496e4f Merge branch '2.1.x' 2020-01-10 13:32:33 -05:00
Ryan Baxter
9d67aa0e45 Use a more robust filter when dealing with multiple keys (#1534)
* Use a more robust filter when dealing with multiple keys.  Fixes #1533

* Simplifying tests

* Creating a variable for the Pattern to avoid creating it everytime
2020-01-10 13:31:51 -05:00
Spencer Gibb
2576c6cf4c Makes sure origin tracked values are ordered.
Moves from regular HashMap to LinkedHashMap to preserve ordering from the config server.

fixes gh-1535
2020-01-07 14:14:18 -05:00
Marcin Grzejszczak
60b8547271 Suggest full property to set for the demo to work with Vault
The description shows what you need to do starting from Vault 0.10.0, now the fresh installation of Vault gives you version 1.3.1. Adding the full property name for those that have nothing to do with vault can come in handy.

Also I think we should change the default to be `kvVersion=2`.
2020-01-04 17:52:53 +01:00
buildmaster
1fe7634903 Bumping versions 2019-12-21 09:58:52 +00:00
buildmaster
8a9af959d2 Bumping versions to 2.2.2.BUILD-SNAPSHOT after release 2019-12-20 12:24:08 +00:00
buildmaster
644a437e36 Going back to snapshots 2019-12-20 12:24:07 +00:00
buildmaster
12d710b466 Update SNAPSHOT to 2.2.1.RELEASE 2019-12-20 12:21:59 +00:00
Scott Frederick
1a34bbe959 Refactor Spring Vault authentication into decomposed classes. (#1527) 2019-12-19 12:35:36 -05:00
Scott Frederick
814d0b1e39 Add support for additional Vault authentication methods. (#1526)
* Add support for additional Vault authentication methods.

* Fix Vault client config test setup so it doesn't rely on local state.

Fixes gh-1475
2019-12-19 11:20:46 -05:00
Jay Bryant
bfe4658f4b Documenting changes that resulted from issue 1506 (#1525)
Scott Frederick asked me to document the changes he made while implementing the changes needed for issue 1506 (https://github.com/spring-cloud/spring-cloud-config/issues/1506). This PR adds the details that Scott explained to me. Thanks, Scott. :)
2019-12-18 16:44:19 -05:00
Jay Bryant
6315c9d944 Documenting changes that resulted from issue 1475 (#1524)
* Documenting changes that resulted from issue 1475

Scott Frederick asked me to document the changes he made while implementing the changes needed for issue 1475 (https://github.com/spring-cloud/spring-cloud-config/issues/1475). This PR adds the details that Scott explained to me. Thanks, Scott. :)

* Accounting for Scott Frederick's feedback

Scott had a clarification in one spot and some more detail in another spot. I made the corresponding changes. Thanks, Scott. :)
2019-12-18 16:41:40 -05:00
Spencer Gibb
b38ecfc897 ignores .flattened-pom.xml 2019-12-17 17:48:32 -05:00
Spencer Gibb
baebe3fb51 removes .flattened-pom.xml 2019-12-17 17:47:59 -05:00
Scott Frederick
5e33794332 Migrate VaultEnvironmentRepository from RestTemplate to Spring Vault. (#1522)
Migrates the Spring Cloud Config Server support for Vault from using a RestTemplate directly to using Spring Vault and VaultTemplate. These changes should provide exactly the same features with backward-compatible properties-based auto-configuration and Java configuration, while allowing for more features in the future via Spring Vault's extensive support for Vault integration.

The old RestTemplate implementation remains as deprecated. The implementation is chosen based on the existence of VaultTemplate.

Fixes gh-1474
2019-12-17 17:40:31 -05:00
Spencer Gibb
f0bc1af547 Makes locateCollection() retryable 2019-12-17 17:21:55 -05:00