Commit Graph

656 Commits

Author SHA1 Message Date
buildmaster
bbb5f19ce2 Update SNAPSHOT to 2.2.2.RELEASE 2020-03-04 15:54:56 +00: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
Ryan Baxter
a237eb7466 plainTextEncrypt property should be true. Fixes #1541 2020-02-03 20:17:22 -05:00
Spencer Gibb
a5e73c5897 Enables post to /env 2020-02-03 16:37:04 -05:00
Spencer Gibb
feb75d442d Merge branch '2.1.x' into 2.2.x 2020-01-27 12:41:28 -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
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
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
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
buildmaster
181ebc0a4c Bumping versions 2019-12-17 09:57:44 +00:00
Spencer Gibb
91f77fbcc2 Updates for 2.2.x 2019-12-16 14:23:57 -05:00
Spencer Gibb
ea9fb809a1 Merge branch '2.1.x' 2019-12-16 14:23:24 -05:00
Spencer Gibb
933566df40 Updates for 2.1.x 2019-12-16 14:22:50 -05:00
Iskra Delta
0d100a7080 Supports dotted keys in properties-to-yaml conversion.
Fixes gh-1510
2019-12-16 13:32:57 -05:00
Scott Frederick
04fb5618d6 Add Resource API support to AWS S3 EnvironmentRepository (#1517)
* Clean up AWS s3 EnvironmentRepository

* Don't require a profile prefix for the default profile - either 'application.[properties|yml|json]' or 'application-default.[properties|yml|json]' will match.
* Support a comma-delimited list of profiles and load each specified profile.

* Add Resource API support to the AwsS3EnvironmentRepository.

Fixes #1506
2019-12-16 12:58:24 -05:00
Spencer Gibb
02d59362e6 Forces environment controller to be backwards compatible.
Does this by adding produces application/json on backwards compatible
controller methods. Otherwise, old clients would get the new format.

fixes gh-1520
2019-12-11 18:25:57 -05:00
Tim Ysewyn
0eedcb886e Merge branch '2.1.x' 2019-12-11 14:22:29 +00:00
Tim Ysewyn
b2508eb97c Added support for trusted certificates 2019-12-11 15:04:05 +01:00
buildmaster
46eecc9523 Bumping versions 2019-12-10 09:57:36 +00:00
buildmaster
baabff6a60 Bumping versions 2019-11-27 09:57:42 +00:00
buildmaster
98ac14febe Bumping versions 2019-11-26 10:03:14 +00:00
buildmaster
5ba08d7818 Bumping versions to 2.2.1.BUILD-SNAPSHOT after release 2019-11-26 09:48:46 +00:00
buildmaster
efc2af138e Going back to snapshots 2019-11-26 09:48:45 +00:00
buildmaster
b5bd468c33 Update SNAPSHOT to 2.2.0.RELEASE 2019-11-26 09:46:55 +00:00
Ryan Baxter
6742a827be Merge remote-tracking branch 'origin/2.1.x' 2019-11-22 10:09:23 -05:00
Ryan Baxter
c7ab0f3524 Return HTTP Client of configuration if there is an exact match on the git url and not a placeholder (#1507)
* Return HTTP Client of configuration if there is an exact match on the git url and not a placeholder

* Removing resource class circleci config
2019-11-22 10:01:17 -05:00
Ryan Baxter
e38f5e854d Added comments about what the logic is doing 2019-11-22 09:59:58 -05:00
Nicolas Homble
3d635f1488 Feature/gh 1283 exception (#1458)
* wrap errors in NativeEnvironmentRepository
2019-11-18 10:26:43 -05:00
buildmaster
69e742b594 Bumping versions to 2.1.6.BUILD-SNAPSHOT after release 2019-11-18 14:46:15 +00:00
buildmaster
6a328954ac Going back to snapshots 2019-11-18 14:46:15 +00:00
buildmaster
c6778672d6 Update SNAPSHOT to 2.1.5.RELEASE 2019-11-18 14:45:16 +00:00
Ryan Baxter
964a800564 Return HTTP Client of configuration if there is an exact match on the git url and not a placeholder 2019-11-12 12:35:06 -05:00
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