Commit Graph

1195 Commits

Author SHA1 Message Date
buildmaster
987575ecd4 Update SNAPSHOT to 2.1.0.M2 2018-11-18 09:23:07 +00:00
ramaiahkk
e380b83026 #1103 java.lang.NullPointerException (#1104)
java.lang.NullPointerException while decrypting due to value is null and still looking for cipher string. #1103
2018-11-16 16:40:56 -05:00
Dave Syer
585195d995 Remove redundant synchronized keyword
If the other 2 public methods don't need it, then I reckon this one doesn't.
2018-11-16 10:54:14 +00:00
juneycha
f0ea304a87 Make 'JGitEnvironmentRepository.JGitFactory' public (#1188) 2018-11-14 19:56:27 -05:00
Ryan Baxter
cabc55469b Only override native default label if config server default label is not null. Fixes #1184 (#1185) 2018-11-12 12:22:22 -05:00
Bartosz Miller
536654bc44 Fix spelling mistake (#1182) 2018-11-09 16:58:37 -05:00
Bartosz Miller
4303e818eb Fix error in documentation (#1183)
Possible grammar error.
2018-11-09 16:58:02 -05:00
hanjin lee
b057195fa7 Fix GitCredentialsProviderFactory (#1178)
* Fix GitCredentialsProviderFactory

* Fix GitCredentialsProviderFactory

* Fix GitCredentialsProviderFactory
2018-11-07 10:31:30 -05:00
Marcin Grzejszczak
c0faa81676 Bumping jgit to 5.1.3.201810200350-r (#1179)
* Bumping jgit

* Updated tests
2018-11-07 15:38:36 +01:00
Ryan Baxter
5c609f42d9 Updating Vault documentation 2018-10-29 19:28:56 -04:00
Lukáš Vyhlídka
be4155eb12 Fix wrong synchronization on Spring Refresh Context Event (#1168) (#1170) 2018-10-25 09:56:51 -04:00
Spencer Gibb
09a7ffc452 Updates s-c-build to 2.0.5.BUILD-SNAPSHOT 2018-10-23 17:15:25 -04:00
buildmaster
c47f8a07a4 Bumping versions to 2.0.3.BUILD-SNAPSHOT after release 2018-10-23 17:45:48 +00:00
buildmaster
a2e411fbd0 Going back to snapshots 2018-10-23 17:45:47 +00:00
buildmaster
2d73a66a5a Update SNAPSHOT to 2.0.2.RELEASE 2018-10-23 17:44:11 +00:00
buildmaster
b6bae9ad44 Bumping versions to 1.4.6.BUILD-SNAPSHOT after release 2018-10-15 20:34:29 +00:00
buildmaster
f58993305f Going back to snapshots 2018-10-15 20:34:28 +00:00
buildmaster
cb96c60331 Update SNAPSHOT to Edgware.SR5 2018-10-15 20:33:02 +00:00
Ryan Baxter
2e5933aafa Log exception when error occurs cloning Git repo. Fixes #1160 2018-10-11 11:31:44 -04:00
Xiaolong Zuo
154e279f26 Fix spelling mistake. (#1164) 2018-10-11 09:51:44 -04:00
Ryan Baxter
8b122cc3f5 Adds failure analyzer for git uri error. Fixes #1060 (#1162) 2018-10-10 16:53:19 -04:00
Ryan Baxter
4ae00c9530 Documentation for #1060. 2018-10-10 11:45:07 -04:00
Marcin Grzejszczak
abbd14fd01 Updated config 2018-10-02 11:55:01 +02:00
Ryan Baxter
77f8df378d Document git refresh rate. Fixes #1147. 2018-10-01 20:14:39 -04:00
Ryan Baxter
f8ecf25c84 Clarifying asymmetric key configuration. Fixes #903 2018-10-01 14:12:43 -04:00
Marcin Grzejszczak
8a5ba79dd6 Removed lombok 2018-09-29 12:19:53 +01:00
buildmaster
89cc0dc70d Going back to snapshots 2018-09-21 19:46:48 +00:00
buildmaster
c3a093e02a Update SNAPSHOT to Greenwich.M1 2018-09-21 19:45:51 +00:00
durigon
ccd3bc2ff6 Refactor String#replaceAll (#1146)
If we repeatedly call String#replaceAll, we internally repeatedly call the regular expression pattern compilation every time as following:

```java
    public String replaceAll(String regex, String replacement) {
        return Pattern.compile(regex).matcher(this).replaceAll(replacement);
    }
```
The modifications are to keep the compiled pattern.
Therefore, compiling a relatively expensive regular expression pattern does not have to be done every time.
2018-09-19 20:39:35 -04:00
Spencer Gibb
9bdc70c8ed Merge branch '2.0.x' 2018-09-17 16:04:53 -04:00
Juan Pablo Santos Rodríguez
226358e553 Gitea and Gogs support + [Github|Gitlab|Gitee]PropertyPathNotificationExtractor refactor (#1140)
(new, clean PR from required changes on [#1120](https://github.com/spring-cloud/spring-cloud-config/pull/1120#issuecomment-419998469), also having a clean history for merge)

Following the spring-cloud#1003 PR, I went on a likewise PR to add support for [Gitea](https://gitea.io), a Gogs fork.

On that PR there's a comment asking for a small refactor regarding Github and Gitlab PropertyPathNotificationExtractors so, given the reduced scope of the change, also went for it. As spring-cloud#1003 also includes the appropiate files for Gogs support, I also threw them in. And, likewise, GiteePropertyPathNotificationExtractor's spring-cloud#1107 PR.

So this PR ended up having:
* `[Github|Gitlab|Gitee]PropertyPathNotificationExtractor` common behaviour refactored into a `BasePropertyPathNotificationExtractor` class
* spring-cloud#1003 PR (Gogs support), refactored to reuse the `BasePropertyPathNotificationExtractor` class
* spring-cloud#1107 PR (Gitee using webhook contents as PropertyPathNotification), refactored to reuse the `BasePropertyPathNotificationExtractor` class
* Gitea support, using the `BasePropertyPathNotificationExtractor` class

I've mantained author tags on files regarding those PRs, in order to respect code authorship as much as possible (if there's anything missing, I'll gladly add whatever commits necessary). Also, as Github notes that those PRs are already mergeable, their corresponding authors must've signed the corresponding ICLAs, I assume this PR should be safe to merge.


best regards,
juan pablo
2018-09-17 16:01:58 -04:00
Ryan Baxter
aee1ae1b5c Merge remote-tracking branch 'origin/2.0.x' 2018-09-17 10:32:45 -04:00
Ryan Baxter
8ecc20e119 Merge remote-tracking branch 'origin/1.4.x' into 2.0.x 2018-09-17 10:32:13 -04:00
Lukáš Vyhlídka
80f98c387a Fix branch not to be updated when refreshRate used (#1136) (#1138) 2018-09-17 09:49:08 -04:00
Larry Ogrodnek
35d176e56f #974 remove one or two escapes for supporting JSON (#982)
Hi.  This is an attempt to fix #974 (cc @ryanjbaxter )

As mentioned previously in the ticket, the original code tries to mask out escaped variables (i.e. `\${hello}`) before performing replacement, and then finally removing the escapes before returning.  

This works fine for .yaml or .properties, but not for JSON.

The jackson serialization that happens before the property resolution ends up adding an extra `\` (so that the JSON is well-formed) [EnvironmentController.labelledJsonPropertes](https://github.com/spring-cloud/spring-cloud-config/blob/master/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java#L169).

I've updated the `resolverPlaceholders` to accept one or two escapes (`\` or `\\`).

I realize this will now treat `\\` as an escape in yml or properties, which may be unintended, but seems unlikely.

An alternative might be to add a flag to this method to indicate whether or not to allow double escape, and updating the `labelledJson` method to pass the flag?

I'm open to any feedback on this approach or another.

Thanks!
2018-09-17 09:36:50 -04:00
Spencer Gibb
fdf72039af Actually remove @EventListener ;-) 2018-09-14 13:47:44 -04:00
Victor Maevskiy
eb36402b40 Fix typo in 'keytore' (#1130)
Fixed the typo from 'keytore' to 'keystore'
2018-09-12 09:48:56 -04:00
Johnny Lim
f7fa6dde60 Remove @ResponseBody when using ResponseEntity (#1125) 2018-09-04 09:55:08 -04:00
Joël
4ee026b03d Add too weak custom encryption exception (#1119)
* Add too weak custom encryption exception
2018-08-28 13:45:58 -04:00
Johnny Lim
d6688745d4 Remove redundant words in doc (#1117) 2018-08-28 09:36:42 -04:00
Spencer Gibb
410b0ccc06 Moves away from @EventListener to SmartApplicationListener 2018-08-21 11:25:19 -04:00
Charl Victor
9fffd0e6dc add more documentation around not using application as a prefix for your spring boot application name (#1106)
fixes gh-673
2018-08-13 07:52:41 -04:00
ramaiahkk
306e018691 #1103 java.lang.NullPointerException (#1104)
java.lang.NullPointerException while decrypting due to value is null and still looking for cipher string. #1103
2018-08-06 12:51:43 -04:00
Spencer Gibb
513353b8e7 Bumps to 2.1.0.BUILD-SNAPSHOT and updates for boot 2.1.0 2018-08-01 19:10:24 -04:00
Mark Paluch
0395ad06cb Omit secret backend URL encoding for Vault. (#1098)
We now construct the URL template from the base URL, API version prefix and secret backend upfront and apply templating only for the secret key. This bypasses URL encoding for the secret backend which allows for special characters such as slashes to be passed thru directly.

Fixes gh-1094.
2018-08-01 13:46:21 -04:00
buildmaster
53b22b6ec3 Bumping versions to 2.0.2.BUILD-SNAPSHOT after release 2018-07-31 18:43:22 +00:00
buildmaster
602c786639 Going back to snapshots 2018-07-31 18:43:21 +00:00
buildmaster
85029323f7 Update SNAPSHOT to 2.0.1.RELEASE 2018-07-31 18:41:51 +00:00
Ryan Baxter
c5a375761b Merge remote-tracking branch 'origin/1.4.x'
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-config-client/pom.xml
#	spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java
#	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-config-server/src/main/java/org/springframework/cloud/config/server/ssh/SshUri.java
#	spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java
#	spring-cloud-starter-config/pom.xml
2018-07-30 20:16:35 -04:00
Ryan Baxter
41130f3251 Bump versions of commons and bus in config 2018-07-30 20:10:58 -04:00